[pkg-java] r15174 - in trunk/libjrosetta-java/debian: . patches

Sylvestre Ledru sylvestre at alioth.debian.org
Mon Oct 10 22:10:53 UTC 2011


Author: sylvestre
Date: 2011-10-10 22:10:53 +0000 (Mon, 10 Oct 2011)
New Revision: 15174

Added:
   trunk/libjrosetta-java/debian/patches/
   trunk/libjrosetta-java/debian/patches/disable_jackrabit.diff
   trunk/libjrosetta-java/debian/patches/series
Modified:
   trunk/libjrosetta-java/debian/changelog
   trunk/libjrosetta-java/debian/control
   trunk/libjrosetta-java/debian/orig-tar.sh
   trunk/libjrosetta-java/debian/rules
   trunk/libjrosetta-java/debian/watch
Log:
  * New upstream release
  * Update Standards-Version: 3.9.2
  * Update of the watch file + repack script
  * Fix FTBFS (Closes: #643534)
  * Switch to maven (upstream)


Modified: trunk/libjrosetta-java/debian/changelog
===================================================================
--- trunk/libjrosetta-java/debian/changelog	2011-10-10 08:00:31 UTC (rev 15173)
+++ trunk/libjrosetta-java/debian/changelog	2011-10-10 22:10:53 UTC (rev 15174)
@@ -1,3 +1,13 @@
+libjrosetta-java (1.0.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Update Standards-Version: 3.9.2
+  * Update of the watch file + repack script
+  * Fix FTBFS (Closes: #643534)
+  * Switch to maven (upstream)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 10 Oct 2011 23:52:06 +0200
+
 libjrosetta-java (1.0.2+gpl-4) unstable; urgency=low
 
   * Switch to debhelper level 7.

Modified: trunk/libjrosetta-java/debian/control
===================================================================
--- trunk/libjrosetta-java/debian/control	2011-10-10 08:00:31 UTC (rev 15173)
+++ trunk/libjrosetta-java/debian/control	2011-10-10 22:10:53 UTC (rev 15174)
@@ -5,8 +5,9 @@
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: ant, ant-optional, default-jdk
-Standards-Version: 3.9.1
+Build-Depends-Indep: ant, ant-optional, default-jdk, maven-debian-helper,
+ libslf4j-java, libjdom1-java, libmaven-assembly-plugin-java
+Standards-Version: 3.9.2
 Homepage: http://dev.artenum.com/projects/JRosetta/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjrosetta-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjrosetta-java/

Modified: trunk/libjrosetta-java/debian/orig-tar.sh
===================================================================
--- trunk/libjrosetta-java/debian/orig-tar.sh	2011-10-10 08:00:31 UTC (rev 15173)
+++ trunk/libjrosetta-java/debian/orig-tar.sh	2011-10-10 22:10:53 UTC (rev 15174)
@@ -3,14 +3,15 @@
 set -e
 
 # called by uscan with '--upstream-version' <version> <file>
-VERSION=$(echo $2|tr "+" "-")
-DIR=jrosetta-$VERSION
-TAR=../libjrosetta-java_$2.orig.tar.gz
+#VERSION=$(echo $2|tr "+" "-")
+DIR=jrosetta-$2
+TAR=../libjrosetta-java_$2.orig.tar.bz2
 
 # clean up the upstream tarball
 unzip $3
-rm -rf __MACOSX
-tar -c -z -f $TAR $DIR
+# test fail in a vm
+rm -rf __MACOSX $DIR/modules/jrosetta-engine/src/main/java/com/artenum/rosetta/test/TestConsoleHistoryPerformance.java
+tar -c -j -f $TAR $DIR
 rm -rf $DIR $3
 
 # move to directory 'tarballs'

Added: trunk/libjrosetta-java/debian/patches/disable_jackrabit.diff
===================================================================
--- trunk/libjrosetta-java/debian/patches/disable_jackrabit.diff	                        (rev 0)
+++ trunk/libjrosetta-java/debian/patches/disable_jackrabit.diff	2011-10-10 22:10:53 UTC (rev 15174)
@@ -0,0 +1,18 @@
+Index: jrosetta-1.0.4/pom.xml
+===================================================================
+--- jrosetta-1.0.4.orig/pom.xml	2011-10-10 21:31:52.000000000 +0200
++++ jrosetta-1.0.4/pom.xml	2011-10-10 21:31:58.000000000 +0200
+@@ -102,13 +102,6 @@
+ 
+ 	<!-- Build -->
+ 	<build>
+-		<extensions>
+-			<extension>
+-				<groupId>org.apache.maven.wagon</groupId>
+-				<artifactId>wagon-webdav-jackrabbit</artifactId>
+-				<version>1.0-beta-7</version>
+-			</extension>
+-		</extensions>
+ 		<plugins>
+ 			<!-- Force the use of a given version of Java -->
+ 			<plugin>

Added: trunk/libjrosetta-java/debian/patches/series
===================================================================
--- trunk/libjrosetta-java/debian/patches/series	                        (rev 0)
+++ trunk/libjrosetta-java/debian/patches/series	2011-10-10 22:10:53 UTC (rev 15174)
@@ -0,0 +1,2 @@
+disable_jackrabit.diff
+

Modified: trunk/libjrosetta-java/debian/rules
===================================================================
--- trunk/libjrosetta-java/debian/rules	2011-10-10 08:00:31 UTC (rev 15173)
+++ trunk/libjrosetta-java/debian/rules	2011-10-10 22:10:53 UTC (rev 15174)
@@ -1,20 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-JAVA_HOME                  := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME                  := /usr/lib/jvm/default-java
 DEB_JARS                   := ant-nodeps 
-DEB_ANT_BUILD_TARGET       := make
-DEB_ANT_CLEAN_TARGET       := clean-API clean
 BUILDDIR                   := dist
 DEB_INSTALL_CHANGELOGS_ALL := CHANGE.txt
+DEB_MAVEN_ARGS             := -e
 
 install/libjrosetta-java::
-	install -m 644 -D $(BUILDDIR)/jrosetta-engine.jar debian/libjrosetta-java/usr/share/java/jrosetta-engine-$(DEB_UPSTREAM_VERSION).jar
-	ln -s jrosetta-engine-$(DEB_UPSTREAM_VERSION).jar debian/libjrosetta-java/usr/share/java/jrosetta-engine.jar
-	install -m 644 -D $(BUILDDIR)/jrosetta-API.jar debian/libjrosetta-java/usr/share/java/jrosetta-API-$(DEB_UPSTREAM_VERSION).jar
-	ln -s jrosetta-API-$(DEB_UPSTREAM_VERSION).jar debian/libjrosetta-java/usr/share/java/jrosetta-API.jar
+	ln -s jrosetta-api.jar debian/libjrosetta-java/usr/share/java/jrosetta-API.jar
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename	

Modified: trunk/libjrosetta-java/debian/watch
===================================================================
--- trunk/libjrosetta-java/debian/watch	2011-10-10 08:00:31 UTC (rev 15173)
+++ trunk/libjrosetta-java/debian/watch	2011-10-10 22:10:53 UTC (rev 15174)
@@ -2,6 +2,5 @@
 # uversionmangle is used to convert 1-0-1 to 1.0.1
 # downloadurlmangle is used to add the action download at the end of the URL
 # filenamemangle is used to download a more explict filename (would be src instead...). This option is not mandatory
-opts="uversionmangle=s/-/./g;s/$/+gpl/,downloadurlmangle=s/src-gpl/src-gpl?action=download/,filenamemangle=s/.*download\/JRosetta-(.*)\/data\/.*/jrosetta-$1.zip/" \
-http://dev.artenum.com/projects/JRosetta/download .*/JRosetta-(.*)/data/src-gpl \
+http://dev.artenum.com/projects/JRosetta/download .*jrosetta-(.*)-sources.jar \
   debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list