Merge remote-tracking branch 'upstream/master'

common.py

@@ -502,7 +502,7 @@ def parse_description(lines):
             if not text.endswith('\n') and len(text) > 0:
                 text += ' '
             text += line
-    return ''
+    return text
 
 
 class BuildException(Exception):

metadata/com.bwx.bequick.txt

@@ -14,9 +14,6 @@ controls.
 Repo Type:svn
 Repo:http://quick-settings.googlecode.com/svn/trunk/quick-settings/
 
-#Don't know why the market version has a slightly different version code...
-Build Version:1.9.8 p2,201012061,!Different market code
-#Don't know why the market version has a slightly different version code...
 Build Version:1.9.8 p2,201012060,184,target=android-8
 Build Version:1.9.9.2,201106160,213,target=android-8
 Build Version:1.9.9.3,201107260,220,target=android-8

metadata/com.episode6.android.appalarm.lite.txt

@@ -0,0 +1,20 @@
+Category:System
+License:GPLv2
+Web Site:http://episode6.wordpress.com/2010/03/27/appalarm/
+Source Code:https://github.com/ghackett/AppAlarm
+Issue Tracker:https://github.com/ghackett/AppAlarm/issues
+
+Summary:App Alarm
+Description:
+Turn any app into an Alarm Clock.
+Schedule any app for anytime.
+.
+
+Repo Type:git
+Repo:https://github.com/ghackett/AppAlarm
+
+Build Version:1.2.6,30,af9d89993212c67bfc510ed082381afc7abcd95a
+
+Market Version:1.2.6
+Market Version Code:30
+

metadata/com.prey.txt

@@ -0,0 +1,31 @@
+Disabled:C2DM API key required
+#NonFreeDep because it requires the Market app to be installed, for C2DM
+AntiFeatures:NonFreeNet,NonFreeDep
+Category:System
+License:GPLv3
+Web Site:http://preyproject.com
+Source Code:https://github.com/prey/prey-android-client/
+Issue Tracker:https://github.com/prey/prey-android-client/issues
+
+Summary:Anti-theft software
+Description:
+Track down your lost or stolen phone or tablet.
+Prey lets you keep track of all your devices easily on one place. Supports:
+- GPS + Wifi geo-location.
+- SIM change detection.
+- SMS or Push (On Demand) activation (2.2+).
+- Lock phone/tablet for privacy (2.2+).
+- Uninstall protection (2.2+).
+- Loud alarm sound.
+- Alert messages to user.
+.
+
+Repo Type:git
+Repo:https://github.com/prey/prey-android-client
+
+# TODO: c2dm (aka "push API") seems to require an API key from Google, see http://code.google.com/android/c2dm/index.html
+Build Version:0.5,34,8934cda82af81580a26cf4de233da15feaab1dfd,prebuild=echo "ask-for-password=true\nprey-minor-version=0\nprey-versionon=0.5\nprey-subdomain=control\nprey-domain=preyproject.com\n#c2dm\nc2dm-mail=\nc2dm-action=\nc2dm-message-sync=" > res/raw/config
+
+Market Version:0.5
+Market Version Code:33
+

metadata/net.avs234.txt

@@ -11,9 +11,12 @@ any formats natively supported by Android. CUE sheets and playlists
 are also supported.
 .
 
-Repo Type:svn
+Repo Type:git-svn
 Repo:http://andless.googlecode.com/svn/trunk/
 
+#Can't build this without modifying the NDK - http://code.google.com/p/andless/wiki/Building
+#Binary of this version in the repo
+#Build Version:1.3.3,10,91,buildjni=yes
 Market Version:1.3.3
 Market Version Code:10
 

metadata/org.adaway.txt

@@ -19,7 +19,8 @@ Build Version:1.12,13,ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9,subdir=org_adaway
 Build Version:1.15,16,4128e59da2eac5c2904c7c7568d298ca51e79540,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
 Build Version:1.18,19,0b9985398b9eef7baf6aadd0dbb12002bc199d2e,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
 Build Version:1.19,20,ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
+Build Version:1.20,21,695e3801e4081026c8f7213a2345fc451d5eb89c,subdir=org_adaway/,buildjni=yes,patch=defprop.patch
 
-Market Version:1.19
-Market Version Code:20
+Market Version:1.20
+Market Version Code:21
 

metadata/org.coolreader.txt

@@ -51,7 +51,8 @@ Build Version:3.0.54-5,275,cr3.0.54-5,subdir=android,rm=android/build.properties
 Build Version:3.0.54-9,279,cr3.0.54-9,subdir=android,rm=android/build.properties,buildjni=yes
 Build Version:3.0.54-33,303,cr3.0.54-33,subdir=android,rm=android/build.properties,buildjni=yes
 Build Version:3.0.54-38,308,cr3.0.54-38,subdir=android,rm=android/build.properties,buildjni=yes
+Build Version:3.0.54-47,447,cr3.0.54-47,subdir=android,rm=android/build.properties,buildjni=yes
 
-Market Version:3.0.54-38
-Market Version Code:308
+Market Version:3.0.54-47
+Market Version Code:447
 

metadata/org.openintents.flashlight.txt

@@ -0,0 +1,21 @@
+Disabled:Build problem
+Category:Office
+License:Apache2
+Web Site:http://code.google.com/p/openintents
+Source Code:http://code.google.com/p/openintents/source/browse/#svn%2Ftrunk%2Fflashlight%2FFlashlight
+Issue Tracker:http://code.google.com/p/openintents/issues
+
+Summary:A flashlight to see in the dark
+Description:
+A flashlight with color settings.
+It can use the phone's screen, or the flash of the phone's camera if there is one.
+.
+
+Repo Type:svn
+Repo:http://openintents.googlecode.com/svn/trunk/flashlight/Flashlight
+
+Build Version:1.1,10011,3971,target=android-15
+
+Market Version:1.1
+Market Version Code:10011
+

metadata/org.penghuang.tools.rotationlock.txt

@@ -0,0 +1,22 @@
+Category:System
+License:GPLv2
+Web Site:https://market.android.com/details?id=org.penghuang.tools.rotationlock
+Source Code:https://github.com/phuang/RotationLock
+Issue Tracker:https://github.com/phuang/RotationLock/issues
+
+Summary:Rotation Lock
+Description:
+Turn on/off Auto-rotate screen quickly by long pressing search button.
+
+When you are lying on bed. The screen changes to landscape. Have to open system settings to disable Auto-rotate screen. Did you find it is really inconvenient? This app provides a super easy way for switching this setting.
+And it provides a state icon to indicate the current setting.
+.
+
+Repo Type:git
+Repo:https://github.com/phuang/RotationLock
+
+Build Version:1.4,5,7c5d43c2ed17a9329abf6b6af07f150e7d0cbd5b,target=android-4
+
+Market Version:1.4
+Market Version Code:5
+

metadata/org.xcsoar.txt

@@ -0,0 +1,21 @@
+Category:Navigation
+License:GPLv2
+Web Site:http://xcsoar.org/
+Source Code:http://git.xcsoar.org/cgit/master/xcsoar.git/
+Issue Tracker:http://xcsoar.org/trac/report
+
+Summary:Tactical glide computer for Para/Soaring Pilots
+Description:
+XCSoar is a tactical glide computer for soaring and para glider pilots. It
+supports navigation, airspace warnings, final glide calculations, wind
+calculation, collision avoidance and many many more features.
+.
+
+Repo Type:git
+Repo:http://git.xcsoar.org/cgit/master/xcsoar.git/
+
+Market Version:6.2.4
+Market Version Code:51
+
+#Far too difficult to build - binary in repo
+#Build Version:6.2.4,51,95a3ad045eb05cb69b11b274f27c7eae387b9c40