various changes to Osmand

metadata/net.osmand.plus.txt

@@ -9,10 +9,6 @@ Name:OsmAnd~
 Auto Name:OsmAnd~
 Summary:Maps & navigation; online and off
 Description:
-Osmand~ is the generic name for builds of Osmand not done by the developers.
-Each apk is labelled according to the CPU architecture which it is designed
-to run on. 
-
 Osmand~'s features can be extended by enabling the plugins 
 via the settings, which include online
 maps from many sources, tracking, OSM editing and accessibility enhancements.
@@ -21,11 +17,16 @@ and raster types can be stored on the phone memory card for offline usage, and
 navigation by default uses offline methods. 
 Map data packages for many territories can be downloaded from
 within the app and there is a desktop program available on the website as well
-for creating your own. Donations by way of PayPal or BidforFix are accepted.
+for creating your own.
+
+Osmand~ is the generic name for builds of Osmand not done by the developers.
 
 Status: We have technical difficulties building the latest versions.
 .
 
+#Each apk is labelled according to the CPU architecture which it is designed
+#to run on. 
+
 Repo Type:srclib
 Repo:android
 
@@ -54,11 +55,12 @@ sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate
 cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
 zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
 cp -r ../DataExtractionOSM/build/lib/ libs/
+
 # Name srclibs in such a way as to replicate OsmAnd build tree
 # Could try making https://github.com/osmandapp/OsmAnd-external-qtbase a srclib too
 # Don't really understand what the other build.xmls do: they don't appear to put jars in classpath
 # Jars haven't been verified
-Build Version:1.4-MIPS,1450,!r1.4,forcevercode=yes,\
+Build Version:1.4-MIPS,141,!r1.4,forcevercode=yes,\
 rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\
 srclibs=tools@9b4c9da995;core@r1.1.4,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
@@ -70,7 +72,7 @@ res/values/no_translate.xml && sed -i '/keys/d' ant.properties,build=\
 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \
 ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
 ant build -f ../OsmAnd-java/build.xml,buildjni=no
-Build Version:1.4-x86,1451,!r1.4,forcevercode=yes,\
+Build Version:1.4-x86,142,!r1.4,forcevercode=yes,\
 rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\
 srclibs=tools@9b4c9da995;core@r1.1.4,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
@@ -83,7 +85,7 @@ ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \
 ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
 ant build -f ../OsmAnd-java/build.xml,buildjni=no
 
-Build Version:1.4-ARM,1452,!permission denied in build/srclib/core/android-configure.sh at r1.4,forcevercode=yes,\
+Build Version:1.4-ARM,143,!permission denied in build/srclib/core/android-configure.sh at r1.4,forcevercode=yes,\
 rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\
 srclibs=tools@9b4c9da995;core@r1.1.4,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
@@ -96,12 +98,13 @@ ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \
 ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
 ant build -f ../OsmAnd-java/build.xml,buildjni=no
 
-# GA maybe in next version
+# In next version: GA maybe, Qt, will need to source "resources" srclib 
-# will need to source "resources" srclib for next version
+# and no android-configure.sh script in v1.5/core
 # see https://github.com/osmandapp/OsmAnd-manifest/blob/master/current_release.xml 
-# use custom VC scheme: multiply VC by 10; it never matches published apk anyway
 Auto Update Mode:None
-Update Check Mode:Market
+Update Check Mode:None
-Current Version:1.4.1
+# New version in new branch
-Current Version Code:143
+Current Version:1.5
+# Version code system is unfathomable
+Current Version Code:145