From eebd61f7601ad9dfcd50af1896faf365f3ff4ad6 Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 26 Jun 2013 15:39:32 +0100 Subject: [PATCH 1/5] fix metadata name that doesn't match package name for org.kwaak3 --- metadata/{org.kwaak3.ext.txt => org.kwaak3.txt} | 0 metadata/{org.kwaak3.ext => org.kwaak3}/common.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename metadata/{org.kwaak3.ext.txt => org.kwaak3.txt} (100%) rename metadata/{org.kwaak3.ext => org.kwaak3}/common.patch (100%) diff --git a/metadata/org.kwaak3.ext.txt b/metadata/org.kwaak3.txt similarity index 100% rename from metadata/org.kwaak3.ext.txt rename to metadata/org.kwaak3.txt diff --git a/metadata/org.kwaak3.ext/common.patch b/metadata/org.kwaak3/common.patch similarity index 100% rename from metadata/org.kwaak3.ext/common.patch rename to metadata/org.kwaak3/common.patch From bed82b52085cf6646e0a04e699fd63ff768f4187 Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 26 Jun 2013 15:54:51 +0100 Subject: [PATCH 2/5] fix latest de.danoeh.antennapod --- metadata/de.danoeh.antennapod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/de.danoeh.antennapod.txt b/metadata/de.danoeh.antennapod.txt index 60f7e14a8e..f1e51fb220 100644 --- a/metadata/de.danoeh.antennapod.txt +++ b/metadata/de.danoeh.antennapod.txt @@ -72,7 +72,7 @@ prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/d Build Version:0.9.7.1,28,!bad bug (at 0.9.7.1),submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java ,bindir=target Build Version:0.9.7.2,29,0.9.7.2,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java ,bindir=target Build Version:0.9.7.3,30,0.9.7.3,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '32 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml,bindir=target -Build Version:0.9.7.4,31,0.9.7.4,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '32 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml,bindir=target +Build Version:0.9.7.4,31,0.9.7.4,submodules=yes,maven=yes,init=ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java && sed -i '97s/true/false/g' pom.xml,bindir=target Auto Update Mode:Version %v Update Check Mode:Tags From 63b1b0c1db53e1f9ef64afcd31c274ae1e31f096 Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 26 Jun 2013 15:55:43 +0100 Subject: [PATCH 3/5] don't use square brackets in a description --- metadata/jp.ksksue.app.terminal.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/jp.ksksue.app.terminal.txt b/metadata/jp.ksksue.app.terminal.txt index 82d7aa54b5..bba3ee6483 100644 --- a/metadata/jp.ksksue.app.terminal.txt +++ b/metadata/jp.ksksue.app.terminal.txt @@ -27,7 +27,7 @@ this application. Connection Examples: * Android — Arduino UNO -* Android — [USB-Serial Adapter] — Microcomputer +* Android — USB-Serial Adapter — Microcomputer * USB-Serial adapter * Sparkfun — FTDI Basic Breakout . From 41519e5874bfa2003d1c0b60ce2c2fcf039006af Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 26 Jun 2013 16:52:16 +0100 Subject: [PATCH 4/5] update com.google.zxing.client.android to 4.4 --- metadata/com.google.zxing.client.android.txt | 15 ++++++++------- metadata/de.ub0r.android.clipboardbeam.txt | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/metadata/com.google.zxing.client.android.txt b/metadata/com.google.zxing.client.android.txt index b7e88e6223..201dce7f1c 100644 --- a/metadata/com.google.zxing.client.android.txt +++ b/metadata/com.google.zxing.client.android.txt @@ -1,5 +1,3 @@ -#Promotes Shopper and BCScanner+ -AntiFeatures:NonFreeAdd Category:Multimedia License:Apache2 Web Site:http://code.google.com/p/zxing/wiki @@ -9,6 +7,9 @@ Issue Tracker:http://code.google.com/p/zxing/issues/list Auto Name:Barcode Scanner Summary:Barcode scanner Description: +Read the information stored in barcodes or create QR-codes for sharing +addresses or text between devices. + All web and product searches go to a Google domain (depending on the choice of origin country), though a custom search button can be created in the settings e.g. https://duckduckgo.com/?q=%s. @@ -28,17 +29,17 @@ Supports: * Aztec ('beta' quality) * PDF 417 ('alpha' quality) (See the website for explanations of the permissions) - -Anti-feature: Add-ons. It suggests the Google Shopper app to look up product -barcodes and asks you to download Barcode Scanner + from the settings—both of -which are non-free apps. . Repo Type:git-svn Repo:http://zxing.googlecode.com/svn;trunk=trunk;tags=tags Build Version:4.3.1,87,2433,subdir=android,prebuild=cd ../core && ant build export && cd ../android -Build Version:4.3.2,88,!patch first? 2.2,subdir=android,build=$$MVN3$$ package -f ../core/pom.xml +Build Version:4.4,91,2831,subdir=android,prebuild=\ +sed -i '477s/shopperMarketListener/null/g;s/R.string.msg_install_google_shopper/\ +"Google Shopper is non-free software"/g' \ +src/com/google/zxing/client/android/result/ResultHandler.java,\ +build=$$MVN3$$ package -f ../core/pom.xml Auto Update Mode:None Update Check Mode:RepoManifest diff --git a/metadata/de.ub0r.android.clipboardbeam.txt b/metadata/de.ub0r.android.clipboardbeam.txt index 991c8aa406..febc1eaa91 100644 --- a/metadata/de.ub0r.android.clipboardbeam.txt +++ b/metadata/de.ub0r.android.clipboardbeam.txt @@ -10,6 +10,9 @@ Description: If you have two devices with NFC and Beam (latter is standard with Android 4.1), you can share the contents of the device clipboard just by touching the devices together. + +If you don't have NFC you can make QR codes with +[[com.google.zxing.client.android]] and [[se.johanhil.clipboard]]. . Repo Type:git From 16a0dc7ee566d363ec3009b4e630b169956794e5 Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 26 Jun 2013 17:48:30 +0100 Subject: [PATCH 5/5] activate 3 builds of net.osmand.plus and use custom vercod scheme --- metadata/net.osmand.plus.txt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 1e0ed88ac3..f280eaad89 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -13,8 +13,8 @@ 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. -All plugins are already present and include online +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. Map data of both vector and raster types can be stored on the phone memory card for offline usage, and @@ -22,9 +22,6 @@ 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. - -Status: We don't have the latest version of this app because it is difficult -to build. Developer builds are available via the website. . Repo Type:srclib @@ -58,7 +55,7 @@ cp -r ../DataExtractionOSM/build/lib/ libs/ # 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,143,!WIP at r1.4,\ +Build Version:1.4-MIPS,1450,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,8 +67,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,144,!WIP at r1.4,\ +Build Version:1.4-x86,1451,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,8 +79,7 @@ res/values/no_translate.xml && sed -i '/keys/d' ant.properties,build=\ 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,145,!WIP at r1.4,\ +Build Version:1.4-ARM,1452,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 && \ @@ -97,8 +92,10 @@ 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 # will need to source "resources" srclib for next version # 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 Current Version:1.4.1