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

Conflicts:
	build/extlib/.gitignore
This commit is contained in:
Ciaran Gultnieks 2013-03-11 08:37:58 +00:00
commit 28150033c7
10 changed files with 35 additions and 25 deletions

View file

@ -65,3 +65,4 @@ KoushWidgets/
HoloColorPicker/ HoloColorPicker/
ChartLib/ ChartLib/
MeterLib/ MeterLib/
SunriseSunset/

View file

@ -14,11 +14,12 @@ read by a wide variety of programs,
including OpenOffice and LibreOffice. including OpenOffice and LibreOffice.
Anti-feature: Tracking. Phones home periodically. Anti-feature: Tracking. Phones home periodically.
Status: v1.3.2 was the latest fully FOSS version; we are working on
bringing the new versions, by removing the non-free libraries.
. .
#Status: v1.3.2 was the latest fully FOSS version; we are working on
#bringing the new versions, by removing the non-free libraries.
#todo: build commons and odf2html libraries
Repo Type:git Repo Type:git
Repo:https://github.com/TomTasche/OpenDocument.droid.git Repo:https://github.com/TomTasche/OpenDocument.droid.git
@ -36,18 +37,19 @@ echo "android.library.reference.3=$$BillingLibrary$$" >> project.properties && \
echo "android.library.reference.4=$$MobAdMob$$" >> project.properties && \ echo "android.library.reference.4=$$MobAdMob$$" >> project.properties && \
cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \ cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \
rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests
Build Version:2.0.6.1,33,!build problems 5cf92e6,srclibs=\ #careful deleting lines in submodule source: they don't reappear
BillingLibrary@3ecc7cad9c;MobAdMob@2d5736;FilePicker@d12f209e8;aFileChooser@c3197bb151;\ Build Version:2.0.7,34,771437a702,init=\
SlidingMenu@71d057d493;AppMsg@34ab9675f8,prebuild=\ git config -f .gitmodules --remove-section submodule.test && \
sed -i 's@\(android.library.reference.1=\).*@\1$$aFileChooser$$@' project.properties && \ git rm --cached test && rm -rf test && \
sed -i 's@\(android.library.reference.2=\).*@\1$$FilePicker$$@' project.properties && \ sed -i 's/git@github.com:/https:\/\/github.com\//g' .gitmodules && \
sed -i 's@\(android.library.reference.3=\).*@\1$$SlidingMenu$$@' project.properties && \ sed -i 's/git@github.com:/https:\/\/github.com\//g' .git/config && git submodule update --init,\
sed -i 's@\(android.library.reference.4=\).*@\1$$AppMsg$$@' project.properties && \ srclibs=MobAdMob@2d5736,update=.;aFileChooser/aFileChooser;ActionBarSherlock/library;\
echo "android.library.reference.5=$$BillingLibrary$$" >> project.properties && \ AndroidBillingLibrary/AndroidBillingLibrary;Android-AppMsg/library,prebuild=\
echo "android.library.reference.6=$$MobAdMob$$" >> project.properties && \ sed -i '42d' filepicker-android/src/io/filepicker/AuthActivity.java && \
cp $$aFileChooser$$/libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \ echo "source.dir=src;$$MobAdMob$$/src" >> project.properties && \
cp $$aFileChooser$$/libs/android-support-v4.jar $$FilePicker$$/libs/ && \ rm -rf libs/GoogleAdMobAdsSdk*.jar OpenDocument.apk libs/android-support-v4.jar && \
rm -rf libs/GoogleAdMobAdsSdk-6.1.0.jar libs/androidbillinglibrary_22092012.jar tests cp aFileChooser/aFileChooser/libs/android-support-v4.jar filepicker-android/libs/ && \
cp aFileChooser/aFileChooser/libs/android-support-v4.jar ActionBarSherlock/library/libs/
Auto Update Mode:None Auto Update Mode:None
#Device-variable #Device-variable

View file

@ -1,13 +1,14 @@
Category:System Category:System
License:GPLv3 License:GPLv3
Web Site:http://candrews.integralblue.com/2011/04/my-first-android-app-callerid/ Web Site:http://www.integralblue.com/callerid-for-android
Source Code:https://gitorious.org/callerid-for-android Source Code:https://gitorious.org/callerid-for-android
Issue Tracker: Issue Tracker:
Summary:Caller identification Summary:Caller identification
Description: Description:
Uses a web service to provide information about an incoming caller based on Uses a web service to provide information about an incoming caller based on
their number. It works in certain European countries and the U.S: see the their number. It works in certain European countries, the U.S., Canada and
Australia: see the
website for more information. The web service is also FOSS. website for more information. The web service is also FOSS.
. .

View file

@ -8,6 +8,8 @@ Summary:Banking application for Swedish banks
Description: Description:
Checks your account balance at any of the major Swedish banks and can Checks your account balance at any of the major Swedish banks and can
display notifications on changes. Includes a widget. display notifications on changes. Includes a widget.
[https://github.com/liato/android-bankdroid/raw/master/CHANGES.txt Changelog]
. .
Repo Type:git Repo Type:git
@ -30,6 +32,7 @@ Build Version:1.8.9,134,d0742fc779d6d87b8e5d27359cff149d658983a4,target=android-
Build Version:1.9.0,137,50ebd2e433d,target=android-11,encoding=utf-8,forcevercode=yes Build Version:1.9.0,137,50ebd2e433d,target=android-11,encoding=utf-8,forcevercode=yes
Build Version:1.9.1,140,6dd58b516 Build Version:1.9.1,140,6dd58b516
Build Version:1.9.2,142,!no source Build Version:1.9.2,142,!no source
Build Version:1.9.5.1,148,1f52896b4
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market

View file

@ -13,7 +13,7 @@ Repo Type:git
Repo:https://github.com/ProgVal/AndQuote.git Repo:https://github.com/ProgVal/AndQuote.git
Build Version:0.2,2,v0.2 Build Version:0.2,2,v0.2
Build Version:0.3.3,6,8db47e47f0728db8fa1ea34bf4cc00c9ab6fe787,submodules=yes Build Version:0.3.3,6,8db47e47f072,submodules=yes,update=.;libs/msgpack
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags

View file

@ -14,6 +14,7 @@ Repo Type:git
Repo:https://github.com/billthefarmer/tuner Repo:https://github.com/billthefarmer/tuner
Build Version:Version 1.0,1,v1.0 Build Version:Version 1.0,1,v1.0
Build Version:1.01,101,v1.01
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags

View file

@ -58,12 +58,12 @@ Build Version:1.7.2-Froyo,107020,33ffc7e5b,buildjni=yes,forceversion=yes,forceve
mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \; mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
Build Version:1.7.2-Honeycomb,107021,0520159677,buildjni=yes,forceversion=yes,prebuild=\ Build Version:1.7.2-Honeycomb,107021,0520159677,buildjni=yes,forceversion=yes,prebuild=\
mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \; mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
Build Version:1.7.3-Donut,107040,2c6253dd,forceversion=yes,prebuild=\ Build Version:1.7.3-Donut,107040,2c6253dd,forceversion=yes,buildjni=yes,prebuild=\
mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;,buildjni=yes mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
Build Version:1.7.3-Froyo,107041,934bf7f5,forceversion=yes,prebuild=\ Build Version:1.7.3-Froyo,107041,934bf7f5,forceversion=yes,buildjni=yes,prebuild=\
mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;,buildjni=yes mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
Build Version:1.7.3-Honeycomb,107042,c4a3c7a9a,forceversion=yes,prebuild=\ Build Version:1.7.3-Honeycomb,107042,c4a3c7a9a,forceversion=yes,buildjni=yes,prebuild=\
mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;,buildjni=yes mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
Auto Update Mode:None Auto Update Mode:None
#Cross reference tags and website #Cross reference tags and website

View file

@ -20,6 +20,7 @@ Repo Type:git
Repo:https://github.com/nathanpc/Build.prop-Editor.git Repo:https://github.com/nathanpc/Build.prop-Editor.git
Build Version:2.0.0,3,581902,target=android-14 Build Version:2.0.0,3,581902,target=android-14
Build Version:2.0.1,4,b3dd61f8,init=rm -rf bin gen
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market

View file

@ -27,6 +27,7 @@ Build Version:1.5.1,33,db50b87307,prebuild=rm -rf tests
Build Version:1.6.0,34,5fa677d646,prebuild=rm -rf tests Build Version:1.6.0,34,5fa677d646,prebuild=rm -rf tests
Build Version:1.6.5,35,e3d51bb02f,prebuild=rm -rf tests Build Version:1.6.5,35,e3d51bb02f,prebuild=rm -rf tests
Build Version:1.6.6,36,f937fd21cc,prebuild=rm -rf tests Build Version:1.6.6,36,f937fd21cc,prebuild=rm -rf tests
Build Version:1.6.8,38,r38,prebuild=rm -rf tests
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags

View file

@ -37,5 +37,5 @@ echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties,buildjn
Update Check Mode:None Update Check Mode:None
#Need to fill this with proper value #Need to fill this with proper value
Current Version:2013.03.07.0416 Current Version:2013.03.07.0416
Current Version Code:362629775 Current Version Code:1362629775