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

metadata/net.avs234.txt

@@ -14,7 +14,7 @@ are also supported and files are chosen via directories.
 Repo Type:git-svn
 Repo:https://andless.googlecode.com/svn/trunk
 
-# Needs Manifest hack for buildjni to work with ndk-r8c; system libraries in jni/Android/lib
+# Wordlist error on r8e despite Manifest being in unix format; system libraries in jni/Android/lib
 Build Version:1.3.5,16,96,target=android-17,scanignore=build/net.avs234,buildjni=yes
 
 Auto Update Mode:None

metadata/net.dahanne.android.regalandroid.txt

@@ -17,8 +17,9 @@ of this (although it hasn't been updated since Oct 2011).
 Repo Type:git
 Repo:git://github.com/anthonydahanne/ReGalAndroid.git
 
-Build Version:1.1.2,5,!missing net.dahanne artifacts on maven central c628cc7cf0d,\
+Build Version:1.1.2,5,9ec774b,maven=yes,bindir=regalandroid/target,\
-maven=yes,subdir=regalandroid,bindir=regalandroid/target
+patch=g2.patch,prebuild=sed -i 's/1.0.0/2.0.0/g' g2-java-client/pom.xml && \
+sed -i 's/1.0.0/2.0.0/g' jiwigo-ws-api-converter/pom.xml
 
 Update Check Mode:Market
 Current Version:1.1.2

metadata/net.dahanne.android.regalandroid/g2.patch

@@ -0,0 +1,52 @@
+diff --git a/g2-java-client/pom.xml b/g2-java-client/pom.xml
+index c59e312..f9b79f6 100644
+--- a/g2-java-client/pom.xml
++++ b/g2-java-client/pom.xml
+@@ -92,6 +92,14 @@
+ 
+ 	<build>
+ 		<plugins>
++      			<plugin>
++        			<groupId>org.apache.maven.plugins</groupId>
++        			<artifactId>maven-surefire-plugin</artifactId>
++        			<version>2.14.1</version>
++        			<configuration>
++          				<skipTests>true</skipTests>
++        			</configuration>
++      			</plugin>
+ 			<plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-source-plugin</artifactId>
+@@ -132,4 +140,4 @@
+ 	</build>
+ 
+ 
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/g3-java-client/pom.xml b/g3-java-client/pom.xml
+index 6654b6a..b040738 100644
+--- a/g3-java-client/pom.xml
++++ b/g3-java-client/pom.xml
+@@ -100,6 +100,14 @@
+ 
+ 	<build>
+ 		<plugins>
++      			<plugin>
++        			<groupId>org.apache.maven.plugins</groupId>
++        			<artifactId>maven-surefire-plugin</artifactId>
++        			<version>2.14.1</version>
++        			<configuration>
++          				<skipTests>true</skipTests>
++        			</configuration>
++      			</plugin>
+ 			<plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-source-plugin</artifactId>
+@@ -140,4 +148,4 @@
+ 	</build>
+ 
+ 	<version>2.0.0</version>
+-</project>
+\ No newline at end of file
++</project>