Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Totschnig 2013-11-10 18:07:30 +01:00
commit 284568d3d3
7 changed files with 52 additions and 24 deletions

View file

@ -62,6 +62,9 @@ Build:1.14.0.0,39
sed -i '106,140d' AndroidManifest.xml && \
rm -rf libs/libGoogleAnalytics.jar src/com/asksven/betterbatterystats/localeplugin
Build:1.15.0.0_B1,40
disable=beta
Auto Update Mode:None
Update Check Mode:Tags
Current Version:1.15.0.0_B1

View file

@ -31,6 +31,19 @@ Build:3.0,7
disable=proprietary blob (youtube api)
commit=unknown - see disabled
Build:3.2,9
commit=v3.2-foss
target=android-18
srclibs=ViewPagerIndicator@2.4.1
prebuild=rm -rf tests eclipse && \
echo "android.library.reference.1=$$ViewPagerIndicator$$" >> project.properties && \
cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs/
Maintainer Notes:
There's a separate FOSS branch, which doesn't include the proprietary YouTube
API blob. ([https://github.com/btmura/rbb/issues/286 related issue])
.
Auto Update Mode:None
Update Check Mode:Tags
Current Version:3.2

View file

@ -7,31 +7,33 @@ Issue Tracker:https://github.com/dnet/adsdroid/issues
Auto Name:ADSdroid
Summary:Get technical datasheets
Description:
Unofficial Android app for alldatasheet.com, allowing fast access to thousands of pdfs
for specifications about electronic items
Unofficial Android app for alldatasheet.com, allowing fast access to thousands
of PDFs for specifications about electronic items
.
Repo Type:git
Repo:https://github.com/dnet/adsdroid.git
#There is a tag for v1.1 but no source
Build:1.0,1
commit=v1.0
target=android-10
prebuild=mkdir libs/ && \
wget http://jsoup.org/packages/jsoup-1.6.3.jar -P libs/
extlibs=jsoup/jsoup-1.6.3.jar
Build:1.2,2
commit=v1.2
target=android-16
prebuild=mkdir libs/ && \
wget http://jsoup.org/packages/jsoup-1.6.3.jar -P libs/
extlibs=jsoup/jsoup-1.6.3.jar
Build:1.3,3
commit=v1.3
target=android-10
extlibs=jsoup/jsoup-1.6.3.jar
Build:1.4,5
commit=v1.4
target=android-16
extlibs=jsoup/jsoup-1.6.3.jar
Auto Update Mode:None
Update Check Mode:Tags
Current Version:1.4

View file

@ -31,8 +31,14 @@ Build:3.3,46
Build:3.8,51
commit=3477
Build:4.0,53
commit=3577
Maintainer Notes:
Tags unreliable - don't use.
.
Auto Update Mode:None
# There are tags higher up the tree but currently one version late
Update Check Mode:RepoManifest
Current Version:4.0
Current Version Code:53

View file

@ -48,6 +48,6 @@ Build:0.7.7,6
Auto Update Mode:Version v%v
Update Check Mode:Tags
Current Version:0.7.6
Current Version Code:5
Current Version:0.7.7
Current Version Code:6

View file

@ -103,19 +103,20 @@ Build:0.9.5-armv7,953
commit=v0.9.5
subdir=android
submodules=yes
forceversion=yes
forcevercode=yes
rm=dx9sdk;pspautotests;android/custom_rules.xml
srclibs=NoAnalytics@d38ae535b5
scandelete=ffmpeg
prebuild=\
echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
rm libs/libGoogleAnalytics* && \
echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
build=\
declare -rx NDK=$$NDK$$ && cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
./android-build.sh && cd ../android && NDK=$$NDK$$ ./ab.sh
forceversion=yes
forcevercode=yes
rm=dx9sdk;pspautotests;android/custom_rules.xml
srclibs=NoAnalytics@d38ae535b5
prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
rm libs/libGoogleAnalytics* && \
echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
scandelete=ffmpeg
build=declare -rx NDK=$$NDK$$ && \
cd ../ffmpeg && \
sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
./android-build.sh && \
cd ../android && \
NDK=$$NDK$$ ./ab.sh
buildjni=no
# +0: - (upstream)
@ -124,6 +125,7 @@ Build:0.9.5-armv7,953
# +3: armv7 (CV)
Auto Update Mode:None
Update Check Mode:Tags
Vercode Operation:%c*10 + 3
Current Version:0.9.5
Current Version Code:95
Current Version Code:953

View file

@ -277,6 +277,7 @@ com.FireFart.Permissions2_3.apk com.FireFart.Permissions2 2012-08-23
com.FireFart.Permissions_2.apk com.FireFart.Permissions 2011-03-02
com.MarcosDiez.shareviahttp_11.apk com.MarcosDiez.shareviahttp 2012-09-11
com.abcdjdj.rootverifier_3.apk com.abcdjdj.rootverifier 2013-08-09
com.abcdjdj.rootverifier_4.apk com.abcdjdj.rootverifier 2013-11-10
com.achep.widget.jellyclock_2.apk com.achep.widget.jellyclock 2013-02-25
com.achep.widget.jellyclock_6.apk com.achep.widget.jellyclock 2013-03-19
com.adam.aslfms_30.apk com.adam.aslfms 2012-09-20
@ -2460,6 +2461,7 @@ org.odk.collect.android_1023.apk org.odk.collect.android 2013-01-02
org.openbmap_1.apk org.openbmap 2013-08-25
org.openbmap_2.apk org.openbmap 2013-09-06
org.openbmap_5.apk org.openbmap 2013-10-14
org.openbmap_6.apk org.openbmap 2013-11-10
org.opengpx_192.apk org.opengpx 2013-01-30
org.opengpx_236.apk org.opengpx 2012-07-13
org.openintents.about_8.apk org.openintents.about 2012-11-01