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

Conflicts:
	metadata/com.mareksebera.simpledilbert.txt

metadata/aws.apps.usbDeviceEnumerator.txt

@@ -17,4 +17,6 @@ Build Version:0.0.5,5,v0.0.5
 
 Auto Update Mode:None
 Update Check Mode:Market
+Current Version:0.0.5
+Current Version Code:5
 

metadata/com.google.zxing.client.android.txt

@@ -40,8 +40,10 @@ sed -i '477s/shopperMarketListener/null/g;s/R.string.msg_install_google_shopper/
 "Google Shopper is non-free software"/g' \
 src/com/google/zxing/client/android/result/ResultHandler.java,\
 build=$$MVN3$$ package -f ../core/pom.xml
+Build Version:4.4.1,92,!not published elsewhere
 
 Auto Update Mode:None
+# see downloads page or gplay; tags are bit strange
 Update Check Mode:RepoManifest
 Current Version:4.4.1
 Current Version Code:92

metadata/com.mareksebera.simpledilbert.txt

@@ -24,7 +24,7 @@ prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
 sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
 sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
 sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties
-Build Version:2.8,21,v2.8,extlib=android/android-support-v4.jar,\
+Build Version:3.0,23,!build problems at v3.0,extlib=android/android-support-v4.jar,\
 srclibs=ActionBarSherlock@4.3.1;ImageLoader@v1.8.5;PhotoView@05b1c2aae5985,\
 prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
 sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \

metadata/com.notriddle.budget.txt

@@ -23,6 +23,7 @@ Repo:https://github.com/notriddle/budget-envelopes.git
 Build Version:1.0,10,1.0
 Build Version:1.2,12,1.2
 Build Version:1.3,13,1.3
+Build Version:1.4,14,1.4
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/dk.jens.backup.txt

@@ -4,16 +4,21 @@ Web Site:
 Source Code:https://github.com/jensstein/oandbackup
 Issue Tracker:https://github.com/jensstein/oandbackup/issues
 
-Auto Name:openbackup
+Auto Name:oandbackup
 Summary:Backup manager
 Description:
 Make backups of selected apps on your device and restore from those backups.
 oandandbackup makes you able to save app data to a user-accessible location. 
 Both backup / restore of single apps and of multiple apps are supported.
 
+Requires a working busybox and rsync installation at the moment (often pre-installed on custom roms).
+
+NB: Please notice a change in the name of the backup folder between versions 0.1.13 and 0.1.13.1.
+Renaming the folder from "oabackups" to "oandbackups" upon updating will solve potential problems.
+
 (As this app is still in an early phase, please don't rely on it solely unless you know what you are doing.)
 
-Requires root: Yes. Copies files from /data/data and related folders.
+Requires root: Yes. Copies files from /data/data, /data/app and /system/app.
 .
 
 Requires Root:Yes
@@ -21,7 +26,7 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/jensstein/oandbackup.git
 
-Build Version:0.1.13,3,0.1.13,target=android-17
+Build Version:0.1.13.1,4,0.1.13.1,target=android-17
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/net.rocrail.androc.txt

@@ -63,6 +63,7 @@ Build Version:399,399,399,target=android-14
 Build Version:401,401,402,target=android-14
 Build Version:407,407,407,target=android-14
 Build Version:409,409,409,target=android-14
+Build Version:414,414,414,target=android-14
 
 Auto Update Mode:None
 Update Check Mode:Market

metadata/org.videolan.vlc.txt

@@ -18,7 +18,8 @@ to your device and you may need to choose another.
 Video and audio player that supports a wide range of formats,
 for both local and remote playback.
 
-Status: BETA.
+Status: We are having technical problems building the latest versions, 
+which we hope to resolve soon. BETA.
 .
 
 #Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile