Merge branch 'master' of gitorious.org:f-droid/fdroiddata

2013-04-25 13:54:21 +01:00 · 2013-04-25 13:54:21 +01:00 · eafa551433
parent 9661da55f4 80108f0d22
commit eafa551433
23 changed files with 37 additions and 33 deletions
--- a/metadata/com.bottleworks.dailymoney.txt
+++ b/metadata/com.bottleworks.dailymoney.txt
@ -1,5 +1,5 @@
 Category:Office
-License:GPLv2
+License:GPL
 Web Site:https://code.google.com/p/daily-money/
 Source Code:https://github.com/dennischen/daily-money
 Issue Tracker:https://code.google.com/p/daily-money/issues/list
--- a/metadata/com.drodin.tuxrider.txt
+++ b/metadata/com.drodin.tuxrider.txt
@ -1,5 +1,5 @@
 Category:Games
-License:GPLv2+
+License:GPL
 Web Site:http://tuxrider.drodin.com/
 Source Code:https://github.com/drodin/TuxRider
 Issue Tracker:https://github.com/drodin/TuxRider/issues
--- a/metadata/com.google.android.marvin.talkback.txt
+++ b/metadata/com.google.android.marvin.talkback.txt
@ -29,7 +29,7 @@ the [http://eyes-free.blogspot.com Eyes-Free blog] for more on Android accessibi
 Repo Type:srclib
 Repo:EyesFree

-Build Version:3.1.1_r68,68,!build server rejection r787,novcheck=yes,subdir=accessibilityServices/talkback,\
+Build Version:3.1.1_r68,68,r787,novcheck=yes,subdir=accessibilityServices/talkback,\
 update=.;../../libraries/utils;../../libraries/compatutils,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1../../libraries/utils@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1../../libraries/compatutils@' project.properties && \
--- a/metadata/com.google.marvin.shell.txt
+++ b/metadata/com.google.marvin.shell.txt
@ -22,14 +22,14 @@ the [http://eyes-free.blogspot.com Eyes-Free blog] for more on Android accessibi
 Repo Type:srclib
 Repo:EyesFree

-#Not sure if this is the right revision
-Build Version:3.0.4,33,!build server rejection r787,subdir=apps/shell,\
+Build Version:3.0.4,33,r787,subdir=apps/shell,\
 update=.;../../libraries/utils;../../libraries/compatutils,target=android-15,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1../../libraries/utils@' project.properties && \
 echo "android.library.reference.2=../../libraries/compatutils" >> project.properties && \
 cd ../../ && rm -rf accessibilityServices archived braille devtools documentation eSpeakEngine \
 ideal ime ocr samplecode thirdparty tts
-Build Version:3.1.0,35,!no source at time of inspection
+Build Version:3.1.0,35,!no source since 01/2013
+Build Version:3.2.0,36,!no source since 01/2013

 Auto Update Mode:None
 Update Check Mode:Market
--- a/metadata/com.matburt.mobileorg.txt
+++ b/metadata/com.matburt.mobileorg.txt
@ -1,5 +1,5 @@
 Category:Office
-License:GPLv2
+License:GPL
 Web Site:https://github.com/matburt/mobileorg-android/wiki
 Source Code:https://github.com/matburt/mobileorg-android
 Issue Tracker:https://github.com/matburt/mobileorg-android/issues
--- a/metadata/info.guardianproject.browser.txt
+++ b/metadata/info.guardianproject.browser.txt
@ -1,5 +1,5 @@
 Category:Internet
-License:GPLv2
+License:GPL
 Web Site:https://guardianproject.info/apps/orweb/
 Source Code:https://github.com/guardianproject/orweb
 Issue Tracker:https://github.com/guardianproject/orweb/issues
--- a/metadata/jp.co.kayo.android.localplayer.txt
+++ b/metadata/jp.co.kayo.android.localplayer.txt
@ -1,5 +1,5 @@
 Category:Multimedia
-License:GPLv2+
+License:GPLv3
 Web Site:http://justplayer-dev.blogspot.jp/
 Source Code:https://bitbucket.org/yokmama/just-player/src
 Issue Tracker:https://bitbucket.org/yokmama/just-player/issues
--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@ -1,15 +1,15 @@
 Category:Internet
-License:GPLv2
+License:GPL
 Web Site:http://andfhem.klass.li/
 Source Code:https://github.com/klassm/andFHEM
 Issue Tracker:https://github.com/klassm/andFHEM/issues

 Summary:Home Automation client
 Description:
-An android client for the FHEM software for home automation.
+A client for the FHEM software for home automation.

-Note: Newer versions of this application are available elsewhere, but these
-contain proprietary software.
+Admob and Amazon Billing nonfree libraries were removed in 2.2.8,
+which is what the Premium version offers.
 .

 Repo Type:git
@ -17,13 +17,18 @@ Repo:https://github.com/klassm/andFHEM.git

 Build Version:1.5.0,51,b7dbf11a18ca66f20e2489d2904773689b2bc24a,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 Build Version:1.5.8,58,19ebe524d48630db88c28d44872e5cbc84c885d6,init=rm ant.properties,srclibs=ActionBarSherlock@436230d,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
-Build Version:1.7.0,70,!Includes proprietary software (ref 0de6e6f)
-Build Version:1.8.5,85,!Includes proprietary software
-Build Version:1.8.7,87,!Includes proprietary software
-Build Version:1.8.8,88,!Includes proprietary software
+Build Version:2.2.8,128,f3a50cc11,subdir=app,\
+srclibs=MobAdMob@2d5736;ActionBarSherlock@4.2.0,prebuild=\
+rm -rf src/li/klass/fhem/billing/amazon libs/amazon*.jar libs/GoogleAd*.jar \
+../ActionBarSherlock ../tests ../build-utils && \
+sed -i  '28d;s/AMAZON(AmazonBillingProvider.INSTANCE)\, //g' \
+src/li/klass/fhem/billing/BillingService.java && \
+sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+echo "android.library.reference.2=$$MobAdMob$$" >> project.properties && \
+sed -i '184\,190d' AndroidManifest.xml

 Auto Update Mode:None
-Update Check Mode:Market
+Update Check Mode:RepoManifest
 Current Version:2.2.8
 Current Version Code:128

--- a/metadata/me.shkschneider.dropbearserver2.txt
+++ b/metadata/me.shkschneider.dropbearserver2.txt
@ -1,5 +1,5 @@
 Category:System
-License:GPLv2
+License:GPL
 Web Site:https://github.com/shkschneider/android_DropBearServer2
 Source Code:https://github.com/shkschneider/android_DropBearServer2
 Issue Tracker:https://github.com/shkschneider/android_DropBearServer2/issues
--- a/metadata/net.codechunk.speedofsound.txt
+++ b/metadata/net.codechunk.speedofsound.txt
@ -1,5 +1,5 @@
 Category:Multimedia
-License:GPLv2
+License:GPL
 Web Site:https://github.com/jpeddicord/speedofsound
 Source Code:https://github.com/jpeddicord/speedofsound
 Issue Tracker:https://github.com/jpeddicord/speedofsound/issues
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@ -1,5 +1,5 @@
 Category:System
-License:GPLv2+
+License:GPLv3
 Web Site:http://f-droid.org
 Source Code:http://gitorious.org/f-droid/fdroidclient
 Issue Tracker:http://f-droid.org/repository/issues
--- a/metadata/org.fox.ttrss.txt
+++ b/metadata/org.fox.ttrss.txt
@ -1,5 +1,5 @@
 Category:Internet
-License:GPLv2
+License:GPL
 Web Site:http://tt-rss.org/redmine/projects/tt-rss-android/wiki
 Source Code:https://github.com/gothfox/Tiny-Tiny-RSS-for-Honeycomb
 Issue Tracker:http://tt-rss.org/redmine/projects/tt-rss/issues
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@ -1,5 +1,4 @@
 Category:Phone & SMS
-#GPLv2+ without ZRTP
 License:GPLv3
 Web Site:http://www.linphone.org
 Source Code:http://www.linphone.org/eng/download/git.html
--- a/metadata/org.scid.android.txt
+++ b/metadata/org.scid.android.txt
@ -1,5 +1,5 @@
 Category:Games
-License:GPLv2
+License:GPL
 Web Site:https://code.google.com/p/scidonthego/
 Source Code:https://code.google.com/p/scidonthego/source/checkout
 Issue Tracker:https://code.google.com/p/scidonthego/issues/list
--- a/metadata/org.wikipedia.txt
+++ b/metadata/org.wikipedia.txt
@ -1,5 +1,5 @@
 Category:Internet
-License:GPLv3
+License:GPL
 Web Site:http://meta.wikimedia.org/wiki/Mobile_Projects
 Source Code:https://github.com/wikimedia/WikipediaMobile
 Issue Tracker:https://bugzilla.wikimedia.org/
--- a/metadata/org.wikipedia.wlm.txt
+++ b/metadata/org.wikipedia.wlm.txt
@ -1,6 +1,6 @@
 Disabled:Service suspended
 Category:Internet
-License:GPLv2
+License:GPL
 Web Site:http://meta.wikimedia.org/wiki/Mobile_Projects
 Source Code:https://github.com/wikimedia/WLMMobile
 Issue Tracker:https://bugzilla.wikimedia.org/
--- a/metadata/org.wiktionary.txt
+++ b/metadata/org.wiktionary.txt
@ -1,5 +1,5 @@
 Category:Internet
-License:GPLv3
+License:GPL
 Web Site:https://github.com/wikimedia/WiktionaryMobile
 Source Code:https://github.com/wikimedia/WiktionaryMobile
 Issue Tracker:https://github.com/wikimedia/WiktionaryMobile/issues
--- a/metadata/org.wordpress.android.txt
+++ b/metadata/org.wordpress.android.txt
@ -1,6 +1,6 @@
 Category:Internet
 # much Apache libs; assets/license.html says GPLv2: no headers or COPYING
-License:GPLv3
+License:GPL
 Web Site:http://android.wordpress.org/
 Source Code:https://android.trac.wordpress.org/browser
 Issue Tracker:http://android.trac.wordpress.org/
--- a/metadata/org.xbmc.android.remote.txt
+++ b/metadata/org.xbmc.android.remote.txt
@ -1,5 +1,5 @@
 Category:Multimedia
-License:GPLv2
+License:GPL
 Web Site:http://code.google.com/p/android-xbmcremote/
 Source Code:https://github.com/freezy/android-xbmcremote.git
 Issue Tracker:http://code.google.com/p/android-xbmcremote/issues/list
--- a/metadata/org.yaxim.androidclient.txt
+++ b/metadata/org.yaxim.androidclient.txt
@ -1,6 +1,6 @@
 Category:Internet
 #Not compatible with ABS and asmack
-License:GPLv2
+License:GPL
 Web Site:http://yaxim.org
 Source Code:https://github.com/ge0rg/yaxim
 Issue Tracker:https://github.com/pfleidi/yaxim/issues
--- a/metadata/ru.orangesoftware.financisto.txt
+++ b/metadata/ru.orangesoftware.financisto.txt
@ -1,7 +1,7 @@
 #Stats sent by default
 AntiFeatures:Tracking
 Category:Office
-License:GPLv2
+License:GPL
 Web Site:http://financisto.com/
 Source Code:http://bazaar.launchpad.net/~financisto-dev/financisto/trunk/files
 Issue Tracker:https://bugs.launchpad.net/financisto
--- a/metadata/tkj.android.homecontrol.mythmote.txt
+++ b/metadata/tkj.android.homecontrol.mythmote.txt
@ -1,5 +1,5 @@
 Category:Multimedia
-License:GPLv2
+License:GPL
 Web Site:http://code.google.com/p/mythmote/
 Source Code:http://code.google.com/p/mythmote/source/checkout
 Issue Tracker:http://code.google.com/p/mythmote/issues/list
--- a/metadata/uk.org.cardboardbox.wonderdroid.txt
+++ b/metadata/uk.org.cardboardbox.wonderdroid.txt
@ -1,5 +1,5 @@
 Category:Games
-License:GPLv2
+License:GPL
 Web Site:http://code.google.com/p/wonderdroid
 Source Code:http://code.google.com/p/wonderdroid/source/checkout
 Issue Tracker:http://code.google.com/p/wonderdroid/issues/list