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

Conflicts:
	metadata/apps.droidnotify.txt

metadata/apps.droidnotify.txt

@@ -23,9 +23,15 @@ Build Version:3.1,34,!No source code
 Build Version:3.4,37,!No source code - https://code.google.com/p/droid-notify/issues/detail?id=115
 Build Version:3.7,40,!No source code
 Build Version:3.12,45,!No source code
+<<<<<<< HEAD
 Build Version:3.17,50,!No source code for libraries
 
-Update Check Mode:Market
-Current Version:3.16
-Current Version Code:49
+=======
+
+#need ambilwarna lib
+#Build Version:3.16,49,990
+>>>>>>> 9bb85fccb9b6c6d6f17346dad573201a1f566f4a
+Update Check Mode:Market
+Current Version:3.17
+Current Version Code:50
 

metadata/com.boardgamegeek.txt

@@ -15,6 +15,7 @@ Repo:http://boardgamegeek.googlecode.com/svn/trunk/
 
 Build Version:3.3,20,r416,subdir=BoardGameGeek,target=android-8
 Build Version:3.4,21,r525,subdir=BoardGameGeek,target=android-8
+Build Version:3.6,23,r701,subdir=BoardGameGeek,target=android-8
 
 Update Check Mode:Market
 Current Version:3.6

metadata/com.dozingcatsoftware.dodge.txt

@@ -15,4 +15,6 @@ Repo:http://dodge-android.googlecode.com/svn/trunk/
 Build Version:1.4.3,8,11
 
 Update Check Mode:Market
+Current Version:1.4.3
+Current Version Code:8
 

metadata/com.piwi.stickeroid.txt

@@ -15,3 +15,7 @@ Repo:http://stickeroid.googlecode.com/svn/trunk/
 Build Version:1.1,4,11
 Build Version:1.1.2,6,20
 
+Update Check Mode:Market
+Current Version:1.1.2
+Current Version Code:6
+

metadata/com.saibotd.bitbeaker.txt

@@ -16,6 +16,6 @@ Repo:https://bitbucket.org/saibotd/bitbeaker
 Build Version:2.1,11,b156ba,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 Update Check Mode:Market
-Current Version:2.1
-Current Version Code:11
+Current Version:2.2
+Current Version Code:12
 

metadata/com.seavenois.tetris.txt

@@ -16,4 +16,8 @@ Repo:http://tttris.googlecode.com/svn/trunk/
 Build Version:0.8-beta,1,32
 Build Version:0.9-beta,3,44
 
-Update Check Mode:Market
+#Not in market
+Update Check Mode:None
+Current Version:0.9-beta
+Current Version Code:3
+

metadata/com.shurik.droidzebra.txt

@@ -17,8 +17,9 @@ Repo Type:git
 Repo:https://code.google.com/p/droidzebra/
 
 Build Version:1.4,10,1e08eec,subdir=project,buildjni=yes
+Build Version:1.4.1,12,d2e47f982c30,subdir=project,buildjni=yes
 
-Update Check Mode:RepoManifest
+Update Check Mode:Market
 Current Version:1.4.1
 Current Version Code:12
 

metadata/com.zapta.apps.maniana.txt

@@ -23,6 +23,7 @@ Build Version:1.01.18,18,i5bceec4cf403,subdir=Maniana,prebuild=mv lib libs
 #it
 #Build Version:1.01.19.D01-next,90019,0a568c16e4a3,subdir=Maniana,prebuild=mv lib libs,forceversion=yes,forcevercode=yes
 Build Version:1.01.20,20,96f57cd56be8,subdir=Maniana,prebuild=mv lib libs,forceversion=yes,forcevercode=yes
+Build Version:1.01.24,24,c71fb26530bb,subdir=Maniana
 
 Update Check Mode:Market
 Current Version:1.01.24

metadata/es.cesar.quitesleep.txt

@@ -22,9 +22,7 @@ Repo:https://code.google.com/p/quitesleep/
 
 Build Version:2.0,5,fbf8f2db2b36,prebuild=rm -rf libs && mv lib libs
 Build Version:2.0.3,9,619ef22277cc,prebuild=rm -rf libs && mv lib libs
-
-#Needs ActionBarSherlock srclib setup
-#Build Version:3,13,0a3dcf9b9c25,subdir=quitesleep3,prebuild=rm -rf libs && mv lib libs
+Build Version:3,13,0a3dcf9b9c25,subdir=quitesleep3,prebuild=rm -rf libs && mv lib libs,update=.;../com_actionbarsherlock;../com_viewpagerindicator
 
 Update Check Mode:Market
 Current Version:3

metadata/in.shick.diode.txt

@@ -16,6 +16,6 @@ Repo:https://github.com/zagaberoo/diode.git
 Build Version:1.0.4,5,770905d77eac8bb960502769b591c492c70d6b86,target=android-15
 
 Update Check Mode:Market
-Current Version:1.0.4
-Current Version Code:5
+Current Version:1.0.4.1
+Current Version Code:6
 

metadata/net.osmand.plus.txt

@@ -33,12 +33,17 @@ cd ../OsmAnd/ && \
 cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
 zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
 cp -r ../DataExtractionOSM/build/lib/ libs/
-
-#Build Version:0.8.2,???,f7500e885dc07418
-
-Build Version:0.8.0,62,01ee7967c1416eaca44376dde454bf241624415f,subdir=OsmAnd,encoding=utf-8,buildjni=yes,submodules=yes
+Build Version:0.8.2,71,f7500e885dc07418,subdir=OsmAnd,encoding=utf-8,buildjni=yes,target=android-8,update=force,forceversion=yes,\
+forcevercode=yes,submodules=yes,prebuild=\
+cd ../DataExtractionOSM && \
+ant compile build && \
+cd ../OsmAnd/ && \
+sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate.xml && \
+cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
+zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
+cp -r ../DataExtractionOSM/build/lib/ libs/
 
 Update Check Mode:Market
-Current Version:0.8.1
-Current Version Code:65
+Current Version:0.8.2
+Current Version Code:71
 

metadata/org.dsandler.apps.markers.txt

@@ -20,6 +20,6 @@ Build Version:1.0.3,36,eeabdb
 Build Version:1.0.4-beta,37,6ee885f07604
 
 Update Check Mode:Market
-Current Version:1.0.4-beta
-Current Version Code:37
+Current Version:1.0.4
+Current Version Code:38
 

metadata/org.nick.wwwjdic.txt

@@ -2,6 +2,7 @@ Category:Office
 License:Apache2.0
 Web Site:https://code.google.com/p/wwwjdic/
 Source Code:https://code.google.com/p/wwwjdic/source/list
+Issue Tracker:
 
 Summary:Frontend for WWWJDIC
 Description:
@@ -11,5 +12,9 @@ Description:
 Repo Type:svn
 Repo:http://wwwjdic.googlecode.com/svn/branches/2.0/
 
+Update Check Mode:Market
+Current Version:2.2.4
+Current Version Code:2240
+
 #doesn't work,but I tried the latest branch
 #Build Version:2.2.4,2240,981,subdir=wwwjdic-app,update=.;../wwwjdic,target=android-15,srclibs=ActionBarSherlock@9598f2bb2c,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties

metadata/org.xcsoar.txt

@@ -15,8 +15,8 @@ Repo Type:git
 Repo:http://git.xcsoar.org/cgit/master/xcsoar.git/
 
 Update Check Mode:Market
-Current Version:6.4
-Current Version Code:69
+Current Version:6.4.1
+Current Version Code:70
 
 #Far too difficult to build - binary in repo
 #Build Version:6.2.4,51,95a3ad045eb05cb69b11b274f27c7eae387b9c40

metadata/ro.weednet.contactssync.txt

@@ -20,4 +20,6 @@ Repo:https://github.com/loadrunner/Facebook-Contact-Sync.git
 Build Version:1.0.0,32,b3879c973e7cac3a3319
 
 Update Check Mode:Market
+Current Version:1.0.0
+Current Version Code:32
 

metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt

@@ -14,7 +14,7 @@ Repo:https://github.com/ucam-cl-dtg/barcodebox.git
 
 Build Version:1.1.1,3,a78f80f87298bb1cba0d80bc699ba2841be66e2a
 
-Update Check Mode:RepoManifest
-Current Version:1.1.2
-Current Version Code:4
+Update Check Mode:Market
+Current Version:1.1.1
+Current Version Code:3