From 20e8ab8bf493e16ab783ee2a29dc6c25dab8122b Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 3 Dec 2011 13:23:51 +0000
Subject: [PATCH] Fixed installation on Russian LG devices (version number is
 included in native libraries names)

---
 AndroidManifest.xml                            | 2 +-
 ChangeLog                                      | 5 ++++-
 VERSION                                        | 2 +-
 jni/Android.mk                                 | 4 ++--
 src/org/amse/ys/zip/DeflatingDecompressor.java | 2 +-
 src/org/vimgadgets/linebreak/LineBreaker.java  | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e566be27c..38b11a5e9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="102041" android:versionName="1.2.4" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="102051" android:versionName="1.2.5" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="4" android:maxSdkVersion="10"/>
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
 	<uses-permission android:name="android.permission.INTERNET" />
diff --git a/ChangeLog b/ChangeLog
index faf4cf830..fc1b79555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
-===== 1.2.5 (Dec ??, 2011) =====
+===== 1.2.6 (Dec ??, 2011) =====
 * Tips subsystem has been implemented
 
+===== 1.2.5 (Dec 03, 2011) =====
+* Installation on devices with pre-installed old version has been fixed
+
 ===== 1.2.4 (Dec 03, 2011) =====
 * Android 4.* issues have been fixed
 * Soft hyphen symbol (0xAD) support
diff --git a/VERSION b/VERSION
index e8ea05db8..c813fe116 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.4
+1.2.5
diff --git a/jni/Android.mk b/jni/Android.mk
index 9fffbdb4b..3543d75cc 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE                  := DeflatingDecompressor
+LOCAL_MODULE                  := DeflatingDecompressor-v2
 LOCAL_SRC_FILES               := DeflatingDecompressor/DeflatingDecompressor.cpp
 LOCAL_LDLIBS                  := -lz
 
@@ -10,7 +10,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE                  := LineBreak
+LOCAL_MODULE                  := LineBreak-v2
 LOCAL_SRC_FILES               := LineBreak/LineBreaker.cpp LineBreak/liblinebreak-2.0/linebreak.c LineBreak/liblinebreak-2.0/linebreakdata.c LineBreak/liblinebreak-2.0/linebreakdef.c
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/src/org/amse/ys/zip/DeflatingDecompressor.java b/src/org/amse/ys/zip/DeflatingDecompressor.java
index c2b632183..4fa7591b2 100644
--- a/src/org/amse/ys/zip/DeflatingDecompressor.java
+++ b/src/org/amse/ys/zip/DeflatingDecompressor.java
@@ -4,7 +4,7 @@ import java.io.*;
 
 class DeflatingDecompressor extends Decompressor {
 	static {
-		System.loadLibrary("DeflatingDecompressor");
+		System.loadLibrary("DeflatingDecompressor-v2");
 	}
 
 	// common variables
diff --git a/src/org/vimgadgets/linebreak/LineBreaker.java b/src/org/vimgadgets/linebreak/LineBreaker.java
index a131fd996..eb0533c5a 100644
--- a/src/org/vimgadgets/linebreak/LineBreaker.java
+++ b/src/org/vimgadgets/linebreak/LineBreaker.java
@@ -2,7 +2,7 @@ package org.vimgadgets.linebreak;
 
 public final class LineBreaker {
 	static {
-		System.loadLibrary("LineBreak");
+		System.loadLibrary("LineBreak-v2");
 		init();
 	}