Merge commit 'refs/merge-requests/65' of git://gitorious.org/f-droid/fdroiddata into merge-requests/65

Conflicts:
	metadata/de.danoeh.antennapod.txt

metadata/com.gh4a.txt

@@ -0,0 +1,26 @@
+Category:Development
+License:Apache2
+Web Site:http://slapperwan.github.com/gh4a
+Source Code:https://github.com/slapperwan/gh4a
+Issue Tracker:
+
+Summary:GitHub Client
+Description:
+.
+
+Repo Type:git
+Repo:https://github.com/slapperwan/gh4a.git
+
+#ActionBarSherlock errors
+Build Version:3.1,31,0a41b4f70d7f6fd1382,srclibs=ActionBarSherlock@9598f2bb2c;ViewPagerIndicator@a2224fe6,\
+prebuild=\
+sed -i '/Pager/d' project.properties && \
+sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+echo "android.library.reference.2=$$ViewPagerIndicator$$" >> project.properties && \
+rm -rf libs/android-support-v4.jar
+
+#Plenty of Betas and out of date tags, but is on the Market
+Update Check Mode:None
+Current Version:3.1
+Current Version Code:31
+

metadata/com.write.Quill.txt

@@ -0,0 +1,19 @@
+Category:Office-pfalcon
+License:GPLv3
+Web Site:http://code.google.com/p/android-quill/
+Source Code:http://code.google.com/p/android-quill/source/checkout
+Issue Tracker:http://code.google.com/p/android-quill/issues/list
+
+Summary:Pen note-taking for Android tablets
+Description:
+.
+
+Repo Type:hg
+Repo:https://code.google.com/p/android-quill/
+
+# Doesn't build - *.cpp files missing
+#Build Version:8.4,21,4277f3a7b7fb,buildjni=yes,prebuild=rm -rf bin/
+# Doesn't build - *.cpp files missing
+#Build Version:8.5,22,bb9446b920e2,buildjni=yes,prebuild=rm -rf bin/
+#needs ambilwarna
+#Build Version:10.0,34,7a6083,buildjni=yes,target=android-15

metadata/de.danoeh.antennapod.txt

@@ -32,5 +32,3 @@ wget http://www.shredzone.org/attachments/download/223/flattr4j-core-2.4.jar -P
 wget http://ftp.heanet.ie/mirrors/www.apache.org/dist//commons/lang/binaries/commons-lang3-3.1-bin.zip && \
 unzip commons-lang3-3.1-bin.zip commons-lang3-3.1/commons-lang3-3.1.jar -d libs/ && \
 mv libs/commons-lang3-3.1/commons-lang3-3.1.jar libs/commons-lang3-3.1.jar && \
-cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java
-

metadata/net.everythingandroid.smspopup.txt

@@ -15,8 +15,13 @@ Full notifications system built in - this allows a user to disable the built in
 Repo Type:git
 Repo:https://code.google.com/p/android-smspopup/
 
-#need viewpager-indicator
-#Build Version:1.2.4,124,SMSPopup-v1.2.4-(124),init=rm -rf ../SMSPopupDonate/releases/,subdir=SMSPopup
+#N.B the tags are off by one
+Build Version:1.2.3,123,SMSPopup-v1.2.4-(124),init=rm -rf ../SMSPopupDonate/releases/,subdir=SMSPopup,\
+srclibs=ViewPagerIndicator@a2224fe6,\
+prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ViewPagerIndicator$$@' project.properties 
 
-Update Check Mode:None
+#Device variable and Tags doesn't work
+Update Check Mode:RepoManifest
+Current Version:1.2.4
+Current Version Code:124
 

metadata/net.vivekiyer.GAL.txt

@@ -0,0 +1,21 @@
+Category:Office
+License:Apache2
+Web Site:http://code.google.com/p/corporateaddressbook/
+Source Code:http://code.google.com/p/corporateaddressbook/source/checkout
+Issue Tracker:http://code.google.com/p/corporateaddressbook/issues/list
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=vivekiyer%40gmail%2ecom&item_name=Donate%20to%20CorporateAddressBook
+
+Summary:Lookup Exchange GAL for contacts
+Description:
+The Global Address List (GAL) lookup available in Android is limited in functionality. It only looks up the email address and does not provide other information that is available in the GAL. This application looks up the GAL and returns ALL data that is available on the Exchange server for the query.
+.
+
+Repo Type:git-svn
+Repo:http://corporateaddressbook.googlecode.com/svn/trunk/
+
+Build Version:1.3.0,14,138,prebuild=mv lib libs
+
+Update Check Mode:Market
+Current Version:1.3.0
+Current Version Code:14
+

metadata/org.ardroid.txt

@@ -0,0 +1,17 @@
+Disabled:No License in source
+Category:Multimedia
+Web Site:http://ardour.org
+Source Code:http://subversion.ardour.org/svn/thirdparty/ardroid
+Issue Tracker:
+
+Summary:Remote control for Ardour 
+Description:
+Transport controls for Ardour 3, a digital audio workstation
+.
+
+Repo Type:git-svn
+Repo:http://subversion.ardour.org/svn/thirdparty/ardroid
+
+Build Version:1.0,1,9120
+
+Update Check Mode:None

metadata/ro.ui.pttdroid.txt

@@ -0,0 +1,23 @@
+Category:Phone & SMS
+License:GPLv3
+Web Site:https://code.google.com/p/pttdroid/
+Source Code:https://code.google.com/p/pttdroid/source/list
+Issue Tracker:https://code.google.com/p/pttdroid/issues/list
+
+Summary:Walkie Talkie/Push to Talk
+Description:
+Broadcast and multicast for communication over the same local network (WiFi).
+Unicast for point-to-point communication. Uses Speex (http://www.speex.org/) for voice coding.
+.
+
+Repo Type:git-svn
+Repo:http://pttdroid.googlecode.com/svn/trunk/
+
+Build Version:1.1,2,52,buildjni=yes,subdir=pttdroid,prebuild=rm -rf libs/,target=android-7
+Build Version:1.2,3,62,buildjni=yes,subdir=pttdroid,prebuild=rm -rf libs/
+
+#It *is* in market, just want 1.1 to be starred
+Update Check Mode:None
+Current Version:1.1
+Current Version Code:2
+