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

Conflicts:
	metadata/org.videolan.vlc.txt
This commit is contained in:
David Black 2013-06-06 12:29:40 +01:00
commit f0286d09c1
13 changed files with 705 additions and 695 deletions

View file

@ -48,9 +48,10 @@ Build Version:2013.05.16-fdroid,20130516,market_20130516,target=Google Inc.:Goog
Build Version:2013.05.18-fdroid,20130518,!No such tag market_20130518,target=Google Inc.:Google APIs:16,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
Build Version:2013.05.22-fdroid,20130522,market_20130522,target=Google Inc.:Google APIs:16,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
Build Version:2013.05.31a-fdroid,20130532,market_20130532,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
Build Version:2013.06.05-fdroid,20130605,market_20130605,forcevercode=yes,subdir=main,forceversion=yes,prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
Auto Update Mode:Version +-fdroid market_%c
Update Check Mode:Market
Current Version:2013.05.31a
Current Version Code:20130532
Current Version:2013.06.05
Current Version Code:20130605

View file

@ -21,8 +21,8 @@ Build Version:2.15.2,134,!TileImageView.java doesn't seem to be found e665aa83bc
Auto Update Mode:None
Update Check Mode:Market
Current Version:3.0.5
Current Version Code:179
Current Version:3.1.0
Current Version Code:180
No Source Since:2.16.1

View file

@ -38,6 +38,6 @@ echo "source.dir=src;common/components" >> ant.properties
Auto Update Mode:None
Update Check Mode:Market
Current Version:1.0.8
Current Version Code:92
Current Version:1.0.9
Current Version Code:93

View file

@ -44,7 +44,7 @@ rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
Build Version:30,30,release30,target=android-17,extlibs=acra/acra-4.2.3.jar,\
buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
Build Version:33,33,release33,target=android-17,extlibs=acra/acra-4.2.3.jar,\
Build Version:33,33,!build fails with compiler crash (at release33),target=android-17,extlibs=acra/acra-4.2.3.jar,\
buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*

View file

@ -37,6 +37,6 @@ AndroidManifest.xml
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:3.7
Current Version Code:33
Current Version:3.7.1
Current Version Code:34

View file

@ -24,10 +24,12 @@ Build Version:2.5.0.1,18,f6e6384b899e14,subdir=RoundR,update=.;../StandOutRoundR
rm -rf RoundR/gen/ StandOutRoundR/gen/,rm=RoundR.apk
Build Version:2.6.0.0,19,b47ca72867093d,subdir=RoundR,update=.;../StandOutRoundR,prebuild=\
rm -rf RoundR/gen/ StandOutRoundR/gen/,rm=RoundR.apk
Build Version:2.7.0.2,22,6eb2108ae73e59,subdir=RoundR,update=.;../StandOutRoundR,prebuild=\
rm -rf RoundR/gen/ StandOutRoundR/gen/,rm=RoundR.apk
Auto Update Mode:None
# Can cross-reference with Website, Market or apk in repo
Update Check Mode:RepoManifest
Current Version:2.6.0.0
Current Version Code:19
Current Version:2.7.0.2
Current Version Code:22

View file

@ -23,9 +23,10 @@ Build Version:2.2,20,1c04460939f3dfa6123539c361c829f7774ad5ca
Build Version:2.3,21,d32cf50fdf273bf3a9df77ecbca9102a2deae745
Build Version:2.4,22,f5f8b00035ad701fec660aaa51f091a29207f0aa
Build Version:2.5,23,270a0ede351ded1928b2b5164a79b3314cef1fd3
Build Version:2.6.1,25,aa80932ee826eca8245811db4f38d52828615366
Auto Update Mode:None
Update Check Mode:Market
Current Version:2.5
Current Version Code:23
Current Version:2.6.1
Current Version Code:25

View file

@ -429,6 +429,7 @@ com.droidwave.offlinecalendar_1.apk com.droidwave.offlinecalendar 2012-09-08
com.dwalkes.android.toggleheadset2_11.apk com.dwalkes.android.toggleheadset2 2012-09-09
com.eddyspace.networkmonitor_2.apk com.eddyspace.networkmonitor 2011-01-23
com.eleybourn.bookcatalogue_124.apk com.eleybourn.bookcatalogue 2012-11-12
com.eleybourn.bookcatalogue_151.apk com.eleybourn.bookcatalogue 2013-06-05
com.eleybourn.bookcatalogue_35.apk com.eleybourn.bookcatalogue 2010-11-11
com.eleybourn.bookcatalogue_36.apk com.eleybourn.bookcatalogue 2010-11-11
com.eleybourn.bookcatalogue_47.apk com.eleybourn.bookcatalogue 2011-01-26
@ -1207,6 +1208,7 @@ info.guardianproject.otr.app.im_34.apk info.guardianproject.otr.app.im 2012-08-2
info.guardianproject.otr.app.im_35.apk info.guardianproject.otr.app.im 2012-08-24
info.guardianproject.otr.app.im_37.apk info.guardianproject.otr.app.im 2012-10-05
info.guardianproject.otr.app.im_41.apk info.guardianproject.otr.app.im 2012-12-01
info.guardianproject.otr.app.im_57.apk info.guardianproject.otr.app.im 2013-06-05
info.lamatricexiste.network_42.apk info.lamatricexiste.network 2011-07-06
info.lamatricexiste.network_43.apk info.lamatricexiste.network 2012-02-04
info.staticfree.SuperGenPass_17.apk info.staticfree.SuperGenPass 2012-08-29
@ -1887,6 +1889,7 @@ org.kreed.vanilla_910.apk org.kreed.vanilla 2012-03-23
org.kreed.vanilla_99.apk org.kreed.vanilla 2012-02-28
org.kwaak3.ext_1.apk org.kwaak3 2012-12-22
org.liberty.android.fantastischmemo_135.apk org.liberty.android.fantastischmemo 2012-02-12
org.liberty.android.fantastischmemo_182.apk org.liberty.android.fantastischmemo 2013-06-05
org.ligi.fast_18.apk org.ligi.fast 2012-09-08
org.ligi.fast_29.apk org.ligi.fast 2013-02-04
org.ligi.fast_33.apk org.ligi.fast 2013-02-22
@ -2248,6 +2251,7 @@ se.johanhil.duckduckgo_1.apk se.johanhil.duckduckgo 2011-03-10
se.peterbjorkman.android.trafikinfo_12.apk se.peterbjorkman.android.trafikinfo 2011-01-27
se.peterbjorkman.android.trafikinfo_13.apk se.peterbjorkman.android.trafikinfo 2011-02-02
se.sandos.android.delayed_18.apk se.sandos.android.delayed 2012-07-26
si.modrajagoda.didi_1.apk si.modrajagoda.didi 2013-06-05
siir.es.adbWireless_12.apk siir.es.adbWireless 2013-03-12
sk.madzik.android.logcatudp_5.apk sk.madzik.android.logcatudp 2012-08-23
sk.vx.connectbot_21.apk sk.vx.connectbot 2012-09-07

View file

@ -1,3 +1,4 @@
si.modrajagoda.didi
com.anysoftkeyboard.languagepack.spain
com.asksven.betterbatterystats
at.univie.sensorium.o3gm
@ -7,4 +8,3 @@ com.jwetherell.heart_rate_monitor
com.nilhcem.hostseditor
com.seb.SLWPmaps
com.dozingcatsoftware.cameratimer
com.anysoftkeyboard.languagepack.ukrainian

View file

@ -1,20 +1,20 @@
Public Domain 5
GPL 30
GPL 32
GNUFDL 1
Artistic Licensev2 1
GPLv3+ 51
Unknown 5
GPLv2 48
GPLv3 308
GPLv2 47
GPLv3 309
GPL/MPL 1
Apache2 190
Apache2 191
NYSLv0.9982 1
EPL 1
ISC 1
NetBSD 1
GPL/Artistic 2
AGPL 3
MIT 36
MIT 35
CCBYSA 1
WTFPL 9
GNUFDL/CCBYSA 1
@ -28,7 +28,7 @@ Zlib 1
MPL2 5
EUPL 1
NewBSD/GPLv2 1
AGPLv3 6
AGPLv3 7
LGPL 12
Custom 1
NewBSD 23

View file

@ -1,6 +1,6 @@
svn 66
none 12
git 500
git 502
bzr 10
git-svn 134
hg 63
hg 64

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
None 81
RepoManifest 184
Static 107
Market 269
Tags 144
RepoManifest 189
Static 108
Market 265
Tags 145