From 0ec8392d3c718b571cb97a9965a33a84cf78426d Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 10:19:25 +0100
Subject: [PATCH 01/16] com.better.alarm still not building

---
 metadata/com.better.alarm.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/metadata/com.better.alarm.txt b/metadata/com.better.alarm.txt
index 5f68866d4d..41d1bf2aba 100644
--- a/metadata/com.better.alarm.txt
+++ b/metadata/com.better.alarm.txt
@@ -4,6 +4,7 @@ Web Site:https://github.com/yuriykulikov/AlarmClock
 Source Code:https://github.com/yuriykulikov/AlarmClock
 Issue Tracker:https://github.com/yuriykulikov/AlarmClock/issues
 
+Auto Name:Clock
 Summary:Improved alarm clock
 Description:
 Smart alarm clock that includes many improvements over the stock alarm clock
@@ -19,6 +20,12 @@ AndroidUtils@315122eb,prebuild=mv $$AndroidUtils$$/src/com/* src/com/ && \
 mkdir -p gen/com/better/alarm && echo -e "package com.better.alarm;\n\
 public final class LogLevel { public final static boolean DBG = false; }" \
 > gen/com/better/alarm/LogLevel.java
+Build Version:2.4.14,2414,!still not working at 2.4.14,extlibs=acra/acra-4.4.0.jar,srclibs=\
+AndroidUtils@315122eb,prebuild=\
+printf 'source.dir=src;$$AndroidUtils$$/src' > ant.properties && \
+mkdir -p gen/com/better/alarm && echo -e "package com.better.alarm;\n\
+public final class LogLevel { public final static boolean DBG = false; }" \
+> gen/com/better/alarm/LogLevel.java
 
 Auto Update Mode:None
 Update Check Mode:Tags

From dcae81f7f4c6e407cc3ed8d38d88ccda61879a01 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 10:27:18 +0100
Subject: [PATCH 02/16] activate org.kwaak3.ext according to original MR

---
 metadata/org.kwaak3.ext.txt          | 4 ++--
 metadata/org.kwaak3.ext/common.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/metadata/org.kwaak3.ext.txt b/metadata/org.kwaak3.ext.txt
index 6ade3984ef..98473225fd 100644
--- a/metadata/org.kwaak3.ext.txt
+++ b/metadata/org.kwaak3.ext.txt
@@ -15,9 +15,9 @@ do not work in this version, so you need hardware keys to play.
 Repo Type:git-svn
 Repo:http://kwaak3.googlecode.com/svn/trunk/
 
-Build Version:1.0,1,!syntax error during build (at 37),subdir=kwaak/project,target=android-10,novcheck=yes,\
+Build Version:1.0,1,37,subdir=kwaak/project,target=android-10,novcheck=yes,\
 patch=common.patch,prebuild=\
-cd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && cd kwaak/project,buildjni=yes
+pushd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && popd,buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:None
diff --git a/metadata/org.kwaak3.ext/common.patch b/metadata/org.kwaak3.ext/common.patch
index cb3fd5a564..016e2f7e13 100644
--- a/metadata/org.kwaak3.ext/common.patch
+++ b/metadata/org.kwaak3.ext/common.patch
@@ -259,7 +259,7 @@ index b65a717..02b500f 100644
 --- org.kwaak3.ext.old/mkjni.sh	1970-01-01 10:00:00.000000000 +1000
 +++ org.kwaak3.ext/mkjni.sh	2012-12-13 13:16:34.319760324 +1100
 @@ -0,0 +1,88 @@
-+#!/bin/sh -e
++#!/bin/bash -e
 +
 +NDK="$ANDROID_NDK"
 +
@@ -277,14 +277,14 @@ index b65a717..02b500f 100644
 +    ANDROID_CFLAGS="$ANDROID_CFLAGS -ffunction-sections"
 +  fi
 +
-+  cd ioquake3
++  pushd ioquake3
 +
 +  # XXX: ioquake3 assumes, that NOKIA="OpenGL ES"
 +  CC="$CC --sysroot=$SYSROOT" ANDROID_NDK_DIR="$NDK" LDFLAGS="$LDFLAGS" \
 +  CFLAGS="$ANDROID_CFLAGS -fno-short-enums -fpic -fstack-protector -DANDROID -DNOKIA" \
 +  COMPILE_ARCH=$(uname -m | sed -e s/i.86/i386/) ARCH=$ARCH make -e $MODE
 +
-+  cd ..
++  popd
 +}
 +
 +# build ARM

From 1bd59e2a76d79f8da265b80afb266f761a3d64aa Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 10:33:17 +0100
Subject: [PATCH 03/16] activate com.paranoid.ParanoidWallpapers

---
 metadata/com.paranoid.ParanoidWallpapers.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/metadata/com.paranoid.ParanoidWallpapers.txt b/metadata/com.paranoid.ParanoidWallpapers.txt
index 561f22e79f..6782fa40a7 100644
--- a/metadata/com.paranoid.ParanoidWallpapers.txt
+++ b/metadata/com.paranoid.ParanoidWallpapers.txt
@@ -11,20 +11,19 @@ Pick from 9 wallpapers that come with the Paranoid Android ROM
 or choose one of seven solid-(ish) colours.
 There is no launcher icon: instead they are made available via the 
 system wallpaper picker.
-
-The source code specifies Android 4.1 so it may crash on older versions.
 .
 
 Repo Type:git
 Repo:https://github.com/ParanoidAndroid/android_packages_apps_ParanoidWallpapers
 
 # patch via https://github.com/ParanoidAndroid/android_packages_apps_ParanoidWallpapers/pull/2
-Build Version:1.0,1,!wait a bit at 487d16a795,\
+# or just use r11 support jar
+Build Version:1.0,1,487d16a795,\
 extlibs=android/android-support-v4.jar,target=android-17,prebuild=\
 sed -i '11 i android:versionCode=\"1\"\nandroid:versionName=\"1.0\"' AndroidManifest.xml && \
 sed -i '130 i \\tmSectionsPagerAdapter.notifyDataSetChanged();' \
 src/com/paranoid/ParanoidWallpapers/Wallpaper.java && \
-sed -i 's/android:minSdkVersion=\"16\"/android:minSdkVersion=\"10\"/g' AndroidManifest.xml 
+sed -i 's/android:minSdkVersion=\"16\"/android:minSdkVersion=\"11\"/g' AndroidManifest.xml 
 
 Auto Update Mode:None
 # Probably always on 1.0

From cb9f703f029027063812e369e1fe3be62d295947 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 11:59:28 +0100
Subject: [PATCH 04/16] activate com.manor.currentwidget

---
 metadata/apps.droidnotify.txt        |  1 +
 metadata/com.manor.currentwidget.txt | 54 +++++++++++++++++++++-------
 metadata/com.write.Quill.txt         |  1 +
 srclibs/Color-Picker-2.txt           |  6 ++++
 srclibs/Color-Picker.txt             |  1 +
 5 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 srclibs/Color-Picker-2.txt

diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 477a7c190d..478bf11737 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -53,6 +53,7 @@ Build Version:3.29.2,67,1109,encoding=utf-8,srclibs=FacebookSDK@c58af0b;Color-Pi
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1$$Color-Picker$$@' project.properties,target=android-17
 
+# Use Color-Picker-2 next time
 Auto Update Mode:None
 Update Check Mode:Market
 Current Version:4.0.5
diff --git a/metadata/com.manor.currentwidget.txt b/metadata/com.manor.currentwidget.txt
index a39fc9ea2e..7695ad5748 100644
--- a/metadata/com.manor.currentwidget.txt
+++ b/metadata/com.manor.currentwidget.txt
@@ -1,25 +1,55 @@
 Category:System
 License:GPLv3
 Web Site:http://code.google.com/p/currentwidget/
-Source Code:http://code.google.com/p/currentwidget/source/checkout
+Source Code:http://code.google.com/p/currentwidget/source/list
 Issue Tracker:http://code.google.com/p/currentwidget/issues/list
 Donate:http://code.google.com/p/currentwidget/
 
+Auto Name:@string/app_name
 Summary:Battery current draw widget
 Description:
+Displays how much electric current the device is using from the battery or 
+receiving from the charger. 
+It can also notify you when the device is using too much battery.
+Add widget to home screen after installation; 
+open settings & graph via launcher icon.
+Touch the displayed value to switch views.
+
+'''NOTE:''' The electric current reading doesn't work on all devices. 
+The reason is that the manufacturers (mostly Motorola and Samsung) don't support 
+this in the battery driver or in the hardware.
+
+* Two widget designs (as two widgets in the widgets list) — Classic and Text.
+* Notification — get real time alerts on high current values
+* Transparent style with customization options
+* Voltage & Battery level (%) display
+* Log battery values (see this [http://nkhosla.com/battery script] for analysis)
+* Set an arithmetic operation on the current value to adjust for different devices
+* Plot current graph
+
+[http://code.google.com/p/currentwidget/wiki/ChangeLog Changelog]
 .
 
-Repo Type:svn
-Repo:http://currentwidget.googlecode.com/svn/trunk/
+Repo Type:git-svn
+Repo:http://currentwidget.googlecode.com/svn/trunk
 
-Build Version:0.36b,31,!top-level exception 236,subdir=CurrentWidget,update=.;../CurrentWidgetLibrary,\
-srclibs=Color-Picker@5d697049fb,target=android-15,\
-prebuild=echo "android.library.reference.1=../CurrentWidgetLibrary" >> project.properties && \
-rm -rf ../CurrentWidgetLibrary/bin && mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
-echo "android.library.reference.1=$$Color-Picker$$" >> ../CurrentWidgetLibrary/project.properties
-
-Update Check Mode:Static
-Current Version:0.36b
-Current Version Code:31
+Build Version:0.36b,31,236,subdir=CurrentWidget,update=.;../CurrentWidgetLibrary,\
+srclibs=Color-Picker-2@45ee6554a1db,target=android-15,prebuild=\
+printf "android.library.reference.1=../CurrentWidgetLibrary" >> project.properties && \
+rm -rf ../CurrentWidgetLibrary/bin && \
+mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
+printf "android.library=true\nandroid.library.reference.1=$$Color-Picker$$" >> \
+../CurrentWidgetLibrary/project.properties
+Build Version:0.38a,36,276,subdir=CurrentWidget,update=.;../CurrentWidgetLibrary,\
+srclibs=Color-Picker-2@45ee6554a1db,target=android-17,prebuild=\
+printf "android.library.reference.1=../CurrentWidgetLibrary" >> project.properties && \
+mkdir -p src/ && rm -rf ../CurrentWidgetLibrary/bin && \
+mv res/drawable/icon.png ../CurrentWidgetLibrary/res/drawable/ && \
+printf "android.library=true\nandroid.library.reference.1=$$Color-Picker$$" >> \
+../CurrentWidgetLibrary/project.properties
 
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:0.38a
+Current Version Code:36
 
diff --git a/metadata/com.write.Quill.txt b/metadata/com.write.Quill.txt
index 14418f1cff..25b5adc3c0 100644
--- a/metadata/com.write.Quill.txt
+++ b/metadata/com.write.Quill.txt
@@ -46,6 +46,7 @@ srclibs=Color-Picker@5d697049fb;File-Picker@496178901f2b,prebuild=\
 sed -i 's@\(android.library.reference.1=\).*@\1$$Color-Picker$$@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1$$File-Picker$$@' project.properties && rm -rf libs/*
 
+# Use Color-Picker-2 next time
 Auto Update Mode:None
 Update Check Mode:Market
 Current Version:10.6
diff --git a/srclibs/Color-Picker-2.txt b/srclibs/Color-Picker-2.txt
new file mode 100644
index 0000000000..076a2aaaab
--- /dev/null
+++ b/srclibs/Color-Picker-2.txt
@@ -0,0 +1,6 @@
+Repo Type:git
+Repo:http://code.google.com/p/yuku-android-util
+
+Subdir:AmbilWarna
+Update Project:Yes
+
diff --git a/srclibs/Color-Picker.txt b/srclibs/Color-Picker.txt
index 4a17e884ca..183a279fa2 100644
--- a/srclibs/Color-Picker.txt
+++ b/srclibs/Color-Picker.txt
@@ -1,3 +1,4 @@
+# Don't use any more: use Color-Picker-2
 Repo Type:git
 Repo:https://github.com/brk3/android-color-picker.git
 

From 77751f62495de97bd99ada222df7adc32afb06a2 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 12:17:35 +0100
Subject: [PATCH 05/16] update CV of com.blogspot.tonyatkins.freespeech to 1.19

---
 metadata/com.blogspot.tonyatkins.freespeech.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/metadata/com.blogspot.tonyatkins.freespeech.txt b/metadata/com.blogspot.tonyatkins.freespeech.txt
index 80824c6798..e138962cbe 100644
--- a/metadata/com.blogspot.tonyatkins.freespeech.txt
+++ b/metadata/com.blogspot.tonyatkins.freespeech.txt
@@ -5,6 +5,7 @@ Web Site:
 Source Code:https://bitbucket.org/duhrer/free-speech-for-android
 Issue Tracker:
 
+Auto Name:Free Speech
 Summary:Speaking assistance
 Description:
 Free Speech is a sound board for people who have problems speaking. When you
@@ -23,7 +24,8 @@ Build Version:1.17,117,freespeech-1.17,maven=yes,bindir=target,prebuild=\
 rm -rf target && sed -i '45 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml
 
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.17
-Current Version Code:117
+# Uses tags
+Update Check Mode:RepoManifest
+Current Version:1.19
+Current Version Code:119
 

From 4f4846593923abb8fc1b86ccdf95c42f04dca064 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 12:21:46 +0100
Subject: [PATCH 06/16] update CV of org.transdroid to 1.1.15

---
 metadata/org.transdroid.search.txt | 9 +++++----
 metadata/org.transdroid.txt        | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/metadata/org.transdroid.search.txt b/metadata/org.transdroid.search.txt
index 4e097f4bfd..1c486dccb0 100644
--- a/metadata/org.transdroid.search.txt
+++ b/metadata/org.transdroid.search.txt
@@ -6,6 +6,7 @@ Source Code:http://code.google.com/p/transdroid-search/source/checkout
 Issue Tracker:http://code.google.com/p/transdroid-search/issues/list
 
 Name:Transdroid Torrent Search
+Auto Name:Torrent Search (by Transdroid)
 Summary:Plugin for Transdroid
 Description:
 Transdroid Torrent Search is a reusable Android application that merely
@@ -18,16 +19,16 @@ Anti-feature: Tracking. It checks for updates to the app.
 .
 
 Repo Type:git-svn
-Repo:http://transdroid-search.googlecode.com/svn/trunk/
+Repo:http://transdroid-search.googlecode.com/svn/trunk
 
 #Don't have android-13
 Build Version:1.7,9,22,target=android-14
 Build Version:1.9,11,28,target=android-14
 Build Version:1.10,12,29,target=android-14
 
-#Not in market: see http://transdroid.org/download
-Update Check Mode:None
+Auto Update Mode:None
+# See http://transdroid.org/download/latest for apk
+Update Check Mode:RepoManifest
 Current Version:1.10
 Current Version Code:12
 
-
diff --git a/metadata/org.transdroid.txt b/metadata/org.transdroid.txt
index 94b0b22420..0a9c676e8f 100644
--- a/metadata/org.transdroid.txt
+++ b/metadata/org.transdroid.txt
@@ -6,6 +6,7 @@ Source Code:http://code.google.com/p/transdroid/source/list
 Issue Tracker:http://code.google.com/p/transdroid/issues/list
 Donate:http://www.transdroid.org/
 
+Auto Name:Transdroid Torrent Manager
 Summary:Remote control for BitTorrent clients
 Description:
 Transdroid is an Android remote client for your torrent application running on a
@@ -30,8 +31,8 @@ Build Version:1.1.13,155,f9ce307f588f,target=android-16,subdir=android,\
 update=.;../external/JakeWharton-ActionBarSherlock/library,prebuild=cp -r ../lib/* .
 
 Auto Update Mode:None
-#not in market: see http://transdroid.org/download
-Update Check Mode:None
-Current Version:1.1.13
-Current Version Code:155
+# See http://transdroid.org/download/latest for apk
+Update Check Mode:RepoManifest
+Current Version:1.1.15
+Current Version Code:160
 

From 44007f6793778e1fd645ab9d136a42417c73db4a Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 12:43:18 +0100
Subject: [PATCH 07/16] some UCM changes, mostly for hg

---
 metadata/arity.calculator.txt                 |  4 +++-
 metadata/com.googlecode.gtalksms.txt          | 10 ++++------
 metadata/com.hexad.bluezime.hidenabler.txt    |  8 ++++++--
 metadata/com.naholyr.android.horairessncf.txt | 10 +++++++---
 metadata/com.saibotd.bitbeaker.txt            |  3 ++-
 metadata/cx.hell.android.pdfview.txt          | 10 +++++++---
 metadata/de.ub0r.android.callmeter.txt        | 20 +++----------------
 7 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/metadata/arity.calculator.txt b/metadata/arity.calculator.txt
index d6e70fa241..2a4531960e 100644
--- a/metadata/arity.calculator.txt
+++ b/metadata/arity.calculator.txt
@@ -4,6 +4,7 @@ Web Site:http://code.google.com/p/arity-calculator
 Source Code:http://code.google.com/p/arity-calculator/source/list
 Issue Tracker:http://code.google.com/p/arity-calculator/issues/list
 
+Auto Name:Arity
 Summary:Scientific calculator
 Description:
 Scientific calculator with complex numbers and graphing of user-defined functions.
@@ -14,8 +15,9 @@ Repo:https://code.google.com/p/arity-calculator/
 
 Build Version:1.27,27,ad8847de5df0,target=android-8
 
+Auto Update Mode:None
 #Not in playmarket
-Update Check Mode:None
+Update Check Mode:RepoManifest
 #Going by downloads page this isn't current version
 Current Version:1.27
 Current Version Code:27
diff --git a/metadata/com.googlecode.gtalksms.txt b/metadata/com.googlecode.gtalksms.txt
index ed1349b857..debdde9539 100644
--- a/metadata/com.googlecode.gtalksms.txt
+++ b/metadata/com.googlecode.gtalksms.txt
@@ -3,9 +3,10 @@ License:GPLv3
 Web Site:https://code.google.com/p/gtalksms/w/list
 Source Code:https://code.google.com/p/gtalksms/source/list
 Issue Tracker:https://code.google.com/p/gtalksms/issues/list
-FlattrID:130193
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=WQDV6S67WAC7A&lc=US&item_name=GTalkSMS&item_number=WEB&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
+FlattrID:130193
 
+Auto Name:@string/app_name
 Summary:Control your phone via XMPP
 Description:
 Send/receive SMS, make calls, locate your phone via GPS, activate WLAN or
@@ -14,8 +15,6 @@ keyboard. The app also notifies you about new "events" on the phone, like a
 new text message (SMS) or an incoming call. Think of it as a remote control
 for your Android phone via XMPP that informs you about recent events on
 your smartphone.
-
-Google Admob library is no longer in the source code.
 .
 
 Repo Type:git
@@ -25,12 +24,11 @@ Build Version:4.2,64,4.2,\
 update=.;external-libs/ActionBarSherlock-4.1.0.0,srclibs=MobAdMob@2d5736,prebuild=\
 rm -rf test/ libs-sources/ libs/GoogleAdMobAdsSdk-6.0.1.jar libs/libGoogleAnalytics.jar && \
 echo "android.library.reference.2=$$MobAdMob$$" >> project.properties
-
 Build Version:4.3,66,4.3,srclibs=ActionBarSherlock@4.2.0,prebuild=\
 sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
-#Device-variable: see downloads for current version
-Update Check Mode:None
+Auto Update Mode:None
+Update Check Mode:Tags
 Current Version:4.3
 Current Version Code:66
 
diff --git a/metadata/com.hexad.bluezime.hidenabler.txt b/metadata/com.hexad.bluezime.hidenabler.txt
index f1ba31502e..f7a4a8f872 100644
--- a/metadata/com.hexad.bluezime.hidenabler.txt
+++ b/metadata/com.hexad.bluezime.hidenabler.txt
@@ -5,16 +5,20 @@ Source Code:https://code.google.com/p/android-bluez-ime/source/list
 Issue Tracker:https://code.google.com/p/android-bluez-ime/issues/list
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal%40hexad%2edk&item_name=BluezIME%20Donation&no_shipping=2&no_note=1&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8
 
+Auto Name:BluezIME HID Enabler
 Summary:Addon for Bluez-ime
 Description:
+No description available
 .
 
 Repo Type:svn
-Repo:http://android-bluez-ime.googlecode.com/svn/trunk/
+Repo:http://android-bluez-ime.googlecode.com/svn/trunk
 
 Build Version:1.0,1,78,subdir=BluezIME-HIDEnabler
 
+Auto Update Mode:None
 #device Variable
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1
+
diff --git a/metadata/com.naholyr.android.horairessncf.txt b/metadata/com.naholyr.android.horairessncf.txt
index 42b114cc16..60ca0552c3 100644
--- a/metadata/com.naholyr.android.horairessncf.txt
+++ b/metadata/com.naholyr.android.horairessncf.txt
@@ -4,6 +4,7 @@ Web Site:http://code.google.com/p/horaires-ter-sncf
 Source Code:http://code.google.com/p/horaires-ter-sncf/source/checkout
 Issue Tracker:http://code.google.com/p/horaires-ter-sncf/issues/list
 
+Auto Name:Horaires TER SNCF
 Summary:Realtime info for regional trains in France
 Description:
 Search for regional train (TER) stations in France. Display schedules and delays of regional SNCF trains.
@@ -13,8 +14,11 @@ Repo Type:git-svn
 Repo:http://horaires-ter-sncf.googlecode.com/svn/trunk
 
 Build Version:3.0.1 (bugfix),301,152,prebuild=mv lib libs
+Build Version:3.0.4 (statistiques),304,!not published
 
-Update Check Mode:None
-Current Version:3.0.1
-Current Version Code:301
+Auto Update Mode:None
+# See downloads page for apks
+Update Check Mode:RepoManifest
+Current Version:3.0.4 (statistiques)
+Current Version Code:304
 
diff --git a/metadata/com.saibotd.bitbeaker.txt b/metadata/com.saibotd.bitbeaker.txt
index 0da38b31c5..0f4b54a178 100644
--- a/metadata/com.saibotd.bitbeaker.txt
+++ b/metadata/com.saibotd.bitbeaker.txt
@@ -4,6 +4,7 @@ Web Site:https://bitbucket.org/saibotd/bitbeaker
 Source Code:https://bitbucket.org/saibotd/bitbeaker/src
 Issue Tracker:https://bitbucket.org/saibotd/bitbeaker/issues
 
+Auto Name:@string/app_name
 Summary:Bitbucket.org client
 Description:
 Bitbucket.org is a site that hosts code in git and hg (mercurial) repositories. You can
@@ -22,7 +23,7 @@ Build Version:2.3.1,14,release-v2.3.1,srclibs=ActionBarSherlock@6e3f2bb5,target=
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 
 Auto Update Mode:None
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.3.1
 Current Version Code:14
 
diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt
index a5acca791f..230f6e9a75 100644
--- a/metadata/cx.hell.android.pdfview.txt
+++ b/metadata/cx.hell.android.pdfview.txt
@@ -6,6 +6,7 @@ Issue Tracker:http://code.google.com/p/apv/issues/list
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LKB59NTKW9QLS
 Bitcoin:1MLdh6uAPymWVJ4bmRde684uTcLJWwumkK
 
+Auto Name:APV PDF Viewer
 Summary:PDF viewer
 #An enhanced version for this is available in [[cx.hell.android.pdfviewpro]]; you
 #should probably install that as this one will probably be removed at some point.
@@ -37,8 +38,11 @@ prebuild=sed -i '/ndk-build/d' scripts/build-native.sh && \
 Build Version:0.4.0,40000,69670732537b,subdir=pdfview,target=android-17,buildjni=yes,\
 extlibs=android/android-support-v4.jar,prebuild=sed -i '/ndk-build/d' scripts/build-native.sh && \
 ./scripts/build-native.sh && sed -i '/proguard/d' project.properties
+Build Version:0.4.0.1,40010,!no apk for this,subdir=pdfview
 
-Update Check Mode:None
-Current Version:0.4.0
-Current Version Code:40000
+Auto Update Mode:None
+# See Downloads page (until Google stop new downloads of course)
+Update Check Mode:RepoManifest
+Current Version:0.4.0.1
+Current Version Code:40010
 
diff --git a/metadata/de.ub0r.android.callmeter.txt b/metadata/de.ub0r.android.callmeter.txt
index 60cd21cf7c..9ee23aa606 100644
--- a/metadata/de.ub0r.android.callmeter.txt
+++ b/metadata/de.ub0r.android.callmeter.txt
@@ -9,23 +9,9 @@ Description:
 This app sums up your call, text and data logs. Different billing modes and periods are taken into
 account in the summation.
 
-Call Meter 3G is translated into following languages: English, German, Chinese, Czech, Dutch,
-French, Greek, Hungarian, Italian, Norwegian, Polish, Portuguese, Russian, Slovak, Spanish,
-Swedish, Turkish. Help get it translated into even more languages at
-[http://ub0r.de/translate ub0r.de/translate].
-
 See [http://www.4.ub0r.de/android/callmeter/rulesets this page] for rulesets. Changelogs and FAQ
 are on the website wiki.
 
-Permissions of this app:
-* READ SMS OR MMS: count your messages
-* RECEIVE SMS: update logs before a recently received message got deleted
-* FULL INTERNET ACCESS: importing rules
-* READ CONTACT DATA: convert numbers to names (e.g. in number groups)
-* MODIFY/DELETE SD CARD CONTENTS: write/export rules to sd card
-* READ PHONE STATE AND IDENTITY: update logs in background
-* PREVENT DEVICE FROM SLEEPING: update logs in background
-
 The non-Free Google Admob in the source code was replaced with an open-source library that does nothing.
 
 Status: Source code repo has disappeared.
@@ -59,9 +45,9 @@ echo "android.library.reference.3=$$ub0rlib$$" >> project.properties && \
 echo "android.library.reference.4=$$MobAdMob$$" >> project.properties
 
 Auto Update Mode:None
-Update Check Mode:None
-Current Version:3.9
-Current Version Code:7390000
+Update Check Mode:Static
+Current Version:3.8.4
+Current Version Code:7384000
 
 No Source Since:3.9
 

From 6d0ca12485f7066e62e556577c4f8bbd4ebac225 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 12:59:52 +0100
Subject: [PATCH 08/16] more WIP net.nurik.roman.dashclock and UCM:RM for
 de.blau.android

---
 metadata/de.blau.android.txt           | 7 ++++---
 metadata/net.nurik.roman.dashclock.txt | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/metadata/de.blau.android.txt b/metadata/de.blau.android.txt
index aff74c2fd1..dc2263628c 100644
--- a/metadata/de.blau.android.txt
+++ b/metadata/de.blau.android.txt
@@ -4,6 +4,7 @@ Web Site:https://code.google.com/p/osmeditor4android
 Source Code:https://code.google.com/p/osmeditor4android/source/list
 Issue Tracker:https://code.google.com/p/osmeditor4android/issues/list
 
+Auto Name:@string/app_name
 Summary:OpenStreetMap editor
 Description:
 * Create and edit new Nodes and Ways
@@ -41,8 +42,8 @@ extlibs=android/android-support-v4.jar,prebuild=sed -i 's@\.1=.*@.1=$$ActionBarS
 project.properties && cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 
 Auto Update Mode:None
-#Version in res/values/appname.xml; device variable i.e see playmarket for date
-Update Check Mode:None
-Current Version:0.8.3r419
+# Version in res/values/appname.xml; device variable i.e see playmarket for date
+Update Check Mode:RepoManifest
+Current Version:None
 Current Version Code:19
 
diff --git a/metadata/net.nurik.roman.dashclock.txt b/metadata/net.nurik.roman.dashclock.txt
index 4b6d1839e6..be1eeb8a0a 100644
--- a/metadata/net.nurik.roman.dashclock.txt
+++ b/metadata/net.nurik.roman.dashclock.txt
@@ -31,10 +31,11 @@ Repo:DashClock
 Build Version:1.3.1,14,v1.3.1,subdir=main
 Build Version:1.4.2,17,v1.4.2,subdir=main
 Build Version:1.4.3,19,v1.4.3,subdir=main
-Build Version:1.5 Beta 2,21,!wait for next beta at 6ba8bd1863da,\
-forceversion=yes,forcevercode=yes,\
+Build Version:1.5 Beta 2,21,!crashes; wait for next beta at 789143f4ed52,\
+forceversion=yes,forcevercode=yes,srclibs=DragSort@0.6.1,\
 subdir=main/src/main,extlibs=android/android-support-v13.jar,target=android-17,\
-prebuild=mkdir -p src && cd ../../../ && x=$(pwd) && \
+prebuild=mkdir -p src && printf 'android.library.reference.1=$$DragSort$$' >> \
+project.properties && cd ../../../ && x=$(pwd) && \
 printf 'source.dir=%s/main/src/main/aidl;%s/main/src/main/java;\
 %s/api/src/main/java;%s/api/src/main/aidl' $x >> ant.properties
 

From 96aab819898d90e508411280e1753800f02f8121 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 12 Jun 2013 15:36:55 +0100
Subject: [PATCH 09/16] new package for Sensorium, at.univie.sensorium

---
 metadata/at.univie.sensorium.o3gm.txt | 23 +++-----------
 metadata/at.univie.sensorium.txt      | 45 +++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 metadata/at.univie.sensorium.txt

diff --git a/metadata/at.univie.sensorium.o3gm.txt b/metadata/at.univie.sensorium.o3gm.txt
index 3394934331..735004608d 100644
--- a/metadata/at.univie.sensorium.o3gm.txt
+++ b/metadata/at.univie.sensorium.o3gm.txt
@@ -1,26 +1,13 @@
-Category:Internet
-License:LGPLv3
+Category:Science & Education
+License:GPLv3
 Web Site:
 Source Code:https://github.com/fmetzger/android-sensorium
 Issue Tracker:https://github.com/fmetzger/android-sensorium/issues
 
+Name:Sensorium (old)
 Summary:Collect sensor data
 Description:
-Sensorium collects sensor values (such as 3G, GPS, battery charge) that you
-allow it to access. You can control the level of detail of the data collected
-from within the app. The app comes preconfigured so as to collect data for
-upstream's open 3G connectivity map, 
-[https://skylla.fc.univie.ac.at/~puehringer/o3gm_django Open3GMap].
-
-Sensors the app can use include:
-* Device Info 
-* Radio Cell Info Sensor 
-* Network Location
-* GPS Location
-* Battery (or power usage)
-* Wifi Scan result
-* Wifi Connection Details
-* Bluetooth Scan Result
+'''N.B Please use [[at.univie.sensorium]] instead.'''
 .
 
 Repo Type:git
@@ -29,7 +16,7 @@ Repo:https://github.com/fmetzger/android-sensorium
 Build Version:1.1.3,6,df82f475bd55bedf91d,subdir=Sensorium
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Static
 Current Version:1.1.3
 Current Version Code:6
 
diff --git a/metadata/at.univie.sensorium.txt b/metadata/at.univie.sensorium.txt
new file mode 100644
index 0000000000..bab5b933ff
--- /dev/null
+++ b/metadata/at.univie.sensorium.txt
@@ -0,0 +1,45 @@
+Category:Science & Education
+License:GPLv3
+Web Site:
+Source Code:https://github.com/fmetzger/android-sensorium
+Issue Tracker:https://github.com/fmetzger/android-sensorium/issues
+
+Auto Name:Sensorium
+Summary:Collect sensor data
+Description:
+Sensorium collects sensor values (such as 3G, GPS, battery charge) that you
+allow it to access. You can control the level of detail of the data collected
+from within the app. The app comes preconfigured so as to collect data for
+upstream's open 3G connectivity map, 
+[https://skylla.fc.univie.ac.at/~puehringer/o3gm_django Open3GMap]: 
+it sends data once an hour when a WiFi connection is available, 
+but the URLs and frequency can be chosen.
+
+Sensors the app can use include:
+* Device Info 
+* Radio Cell Info Sensor 
+* Network Location
+* GPS Location
+* Battery (or power usage)
+* Wifi Scan result
+* Wifi Connection Details
+* Bluetooth Scan Result
+
+Fused location method isn't available as it depends on the non-free Google Play
+Services library.
+.
+
+Repo Type:git
+Repo:https://github.com/fmetzger/android-sensorium
+
+Build Version:1.1.6,9,af1b83545f23,subdir=Sensorium,prebuild=\
+sed -i '/play/d' project.properties && \
+sed -i '/Fused/d' res/values/sensors.xml && \
+rm src/at/univie/sensorium/sensors/FusedLocationSensor.java 
+
+Auto Update Mode:None
+# apks are on Google Plague
+Update Check Mode:RepoManifest
+Current Version:1.1.6
+Current Version Code:9
+

From 38fb58db523e61d97142ba8f919179dd456535d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 12 Jun 2013 23:45:57 +0200
Subject: [PATCH 10/16] New app: Tinfoil Facebook (NonFreeNet)

---
 metadata/com.danvelazco.fbwrapper.txt | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 metadata/com.danvelazco.fbwrapper.txt

diff --git a/metadata/com.danvelazco.fbwrapper.txt b/metadata/com.danvelazco.fbwrapper.txt
new file mode 100644
index 0000000000..63e35b7ea1
--- /dev/null
+++ b/metadata/com.danvelazco.fbwrapper.txt
@@ -0,0 +1,27 @@
+AntiFeatures:NonFreeNet
+Category:Internet
+License:Apache2
+Web Site:
+Source Code:https://github.com/velazcod/Tinfoil-Facebook
+Issue Tracker:https://github.com/velazcod/Tinfoil-Facebook/issues
+
+Auto Name:Tinfoil for Facebook
+Summary:facebook.com sandbox client
+Description:
+An app that creates a sandbox for Facebook's mobile site in order to protect
+your privacy and to avoid the ability others to track your browsing history.
+
+The COARSE_LOCATION permission is only used if you enable "Allow Check-ins" on
+the preferences section, which is disabled by default.
+.
+
+Build Version:1.1.8,20130520,v1.1.8
+
+Repo Type:git
+Repo:https://github.com/velazcod/Tinfoil-Facebook
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:1.1.8
+Current Version Code:20130520
+

From b6dc7f613df4533e55bc7e1995419145e39a330e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 12 Jun 2013 23:50:18 +0200
Subject: [PATCH 11/16] Add NonFreeAd and explanations to fbwrapper

---
 metadata/com.danvelazco.fbwrapper.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/metadata/com.danvelazco.fbwrapper.txt b/metadata/com.danvelazco.fbwrapper.txt
index 63e35b7ea1..3ecc98823d 100644
--- a/metadata/com.danvelazco.fbwrapper.txt
+++ b/metadata/com.danvelazco.fbwrapper.txt
@@ -1,4 +1,4 @@
-AntiFeatures:NonFreeNet
+AntiFeatures:NonFreeNet,NonFreeAdd
 Category:Internet
 License:Apache2
 Web Site:
@@ -13,6 +13,11 @@ your privacy and to avoid the ability others to track your browsing history.
 
 The COARSE_LOCATION permission is only used if you enable "Allow Check-ins" on
 the preferences section, which is disabled by default.
+
+AntiFeatures:
+* Nonfreenet. The app uses Facebook.
+* NonFreeAd. In the near future, a closed source paid add-on to this app will
+  provide extra functionality.
 .
 
 Build Version:1.1.8,20130520,v1.1.8

From bfcd9e73abb33dce4fc802bd1d1d80bdb2416869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 13 Jun 2013 00:02:39 +0200
Subject: [PATCH 12/16] Update BodhiTimer to 2.7.3

---
 metadata/org.yuttadhammo.BodhiTimer.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata/org.yuttadhammo.BodhiTimer.txt b/metadata/org.yuttadhammo.BodhiTimer.txt
index b971a050b3..7f4c4093dc 100644
--- a/metadata/org.yuttadhammo.BodhiTimer.txt
+++ b/metadata/org.yuttadhammo.BodhiTimer.txt
@@ -24,6 +24,7 @@ Build Version:2.3,21,d32cf50fdf273bf3a9df77ecbca9102a2deae745
 Build Version:2.4,22,f5f8b00035ad701fec660aaa51f091a29207f0aa
 Build Version:2.5,23,270a0ede351ded1928b2b5164a79b3314cef1fd3
 Build Version:2.6.1,25,aa80932ee826eca8245811db4f38d52828615366
+Build Version:2.7.3,29,358a570f7a8b5929fe138a417f9f1fac4d4b3d42
 
 Auto Update Mode:None
 Update Check Mode:Market

From bf2fb2818bc3f6226a7c92f974c6698df25064ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 13 Jun 2013 00:05:05 +0200
Subject: [PATCH 13/16] Update RedReader to version 1.7.2

---
 metadata/org.quantumbadger.redreader.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/metadata/org.quantumbadger.redreader.txt b/metadata/org.quantumbadger.redreader.txt
index fc04bc4f4e..9ebe92fbcd 100644
--- a/metadata/org.quantumbadger.redreader.txt
+++ b/metadata/org.quantumbadger.redreader.txt
@@ -43,9 +43,10 @@ Build Version:1.6.5,28,v1.6.5,maven=yes,bindir=target,target=android-16
 Build Version:1.6.8,32,v1.6.8,maven=yes,bindir=target,target=android-17
 Build Version:1.6.9,33,v1.6.9,maven=yes,bindir=target,target=android-17
 Build Version:1.7.0,34,v1.7.0,maven=yes,bindir=target,target=android-17
+Build Version:1.7.2,36,v1.7.2,maven=yes,bindir=target,target=android-17
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.7.0
-Current Version Code:34
+Current Version:1.7.2
+Current Version Code:36
 

From 56fdf589aa6059b3f70b9d7d52c197334d31b0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 13 Jun 2013 09:58:22 +0200
Subject: [PATCH 14/16] Twidere still won't build

---
 metadata/org.mariotaku.twidere.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt
index 03e8f1c228..3691663a36 100644
--- a/metadata/org.mariotaku.twidere.txt
+++ b/metadata/org.mariotaku.twidere.txt
@@ -60,6 +60,8 @@ Build Version:0.2.6.5,59,!still fails (at 9a12aa76f31c0d96a),prebuild=rm -rf dis
 # the build issues.
 Build Version:0.2.7.5,65,!still fails (at d00b32c2c1f0c335),prebuild=rm -rf dist/ art/,patch=constants1.patch
 Build Version:0.2.7.6,66,!still fails (at 893601f9dc6adbf5),prebuild=rm -rf dist/ art/,patch=constants1.patch
+Build Version:0.2.8.3,72,!still fails (at eefd4bf2d79f21f0),prebuild=rm -rf dist/ art/,patch=constants1.patch
+
 
 Auto Update Mode:None
 # Tags are outdated again

From bbc27bcb13e4933e4e5cf2bb0e87467eb94ded3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 13 Jun 2013 11:21:03 +0200
Subject: [PATCH 15/16] New app: Episodes

---
 metadata/org.jamienicol.episodes.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 metadata/org.jamienicol.episodes.txt

diff --git a/metadata/org.jamienicol.episodes.txt b/metadata/org.jamienicol.episodes.txt
new file mode 100644
index 0000000000..42be93f315
--- /dev/null
+++ b/metadata/org.jamienicol.episodes.txt
@@ -0,0 +1,24 @@
+Category:Multimedia
+License:GPLv3+
+Web Site:
+Source Code:https://github.com/jamienicol/episodes
+Issue Tracker:https://github.com/jamienicol/episodes/issues
+
+Summary:Track TV shows you have seen
+Description:
+Keep track of which episodes you've watched of your favourite TV shows.
+.
+
+Repo Type:git
+Repo:https://github.com/jamienicol/episodes
+
+Build Version:0.1,1,v0.1,srclibs=ActionBarSherlock@4.3.1,prebuild=\
+rm -rf actionbarsherlock/ && \
+cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
+sed -i \ 's@\.1=actionbarsherlock@.1=$$ActionBarSherlock$$@' project.properties
+
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.1
+Current Version Code:1
+

From 84a57519ddb8f4b5ed6e524d17e491b3cbe89385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 13 Jun 2013 11:51:17 +0200
Subject: [PATCH 16/16] Deactivate org.jamienicol.episodes

---
 metadata/org.jamienicol.episodes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/org.jamienicol.episodes.txt b/metadata/org.jamienicol.episodes.txt
index 42be93f315..3eef3e41f4 100644
--- a/metadata/org.jamienicol.episodes.txt
+++ b/metadata/org.jamienicol.episodes.txt
@@ -12,7 +12,7 @@ Keep track of which episodes you've watched of your favourite TV shows.
 Repo Type:git
 Repo:https://github.com/jamienicol/episodes
 
-Build Version:0.1,1,v0.1,srclibs=ActionBarSherlock@4.3.1,prebuild=\
+Build Version:0.1,1,!further testing needed v0.1,srclibs=ActionBarSherlock@4.3.1,prebuild=\
 rm -rf actionbarsherlock/ && \
 cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
 sed -i \ 's@\.1=actionbarsherlock@.1=$$ActionBarSherlock$$@' project.properties