[pkg-java] r12344 - in trunk/libwoodstox-java/debian: . patches

Torsten Werner twerner at alioth.debian.org
Sat May 8 10:17:00 UTC 2010 

Author: twerner
Date: 2010-05-08 10:17:00 +0000 (Sat, 08 May 2010)
New Revision: 12344

Added:
   trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch
Modified:
   trunk/libwoodstox-java/debian/changelog
   trunk/libwoodstox-java/debian/control
   trunk/libwoodstox-java/debian/patches/00list
   trunk/libwoodstox-java/debian/rules
Log:
* Team upload
* Merge changes from Ubuntu.
* Enable test suite
  * debian/patches/20-testsuite-enable.dpatch: use system junit libs, stop
    on test failure, disable tests relying on non-packages external libs
  * debian/control: build-depend on junit
  * debian/rules: Enable test suite, add junit and ant-trax to classpath
* debian/control: add misc:Depends to dependencies
* debian/rules: Use default-jdk in all cases
* debian/control: Cleanups to align with Java policy (set section to java,
  only use default-jdk, drop java-virtual-machine)
* remove java specific dependencies and icedtea-java7-jre NBS (LP: #203636) 

Modified: trunk/libwoodstox-java/debian/changelog
===================================================================
--- trunk/libwoodstox-java/debian/changelog	2010-05-08 09:45:28 UTC (rev 12343)
+++ trunk/libwoodstox-java/debian/changelog	2010-05-08 10:17:00 UTC (rev 12344)
@@ -1,10 +1,41 @@
-libwoodstox-java (1:3.9.2.dfsg-2) UNRELEASED; urgency=low
+libwoodstox-java (1:3.9.2.dfsg-2) unstable; urgency=low
 
+  * Team upload
+
+  [ Vincent Fourmond ]
   * Daniel Leidert updated debian/watch, thanks !
   * Updated again debian/watch to point to the new download page
 
- -- Vincent Fourmond <fourmond at debian.org>  Fri, 26 Jun 2009 00:51:59 +0200
+  [ Torsten Werner ]
+  * Merge changes from Ubuntu.
 
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 12:14:29 +0200
+
+libwoodstox-java (1:3.9.2.dfsg-1ubuntu3) lucid; urgency=low
+
+  * Enable test suite
+    * debian/patches/20-testsuite-enable.dpatch: use system junit libs, stop
+      on test failure, disable tests relying on non-packages external libs
+    * debian/control: build-depend on junit
+    * debian/rules: Enable test suite, add junit and ant-trax to classpath
+  * debian/control: add misc:Depends to dependencies
+  * debian/rules: Use default-jdk in all cases
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Fri, 18 Dec 2009 16:37:00 +0100
+
+libwoodstox-java (1:3.9.2.dfsg-1ubuntu2) lucid; urgency=low
+
+  * debian/control: Cleanups to align with Java policy (set section to java,
+    only use default-jdk, drop java-virtual-machine)
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Wed, 16 Dec 2009 16:24:15 +0100
+
+libwoodstox-java (1:3.9.2.dfsg-1ubuntu1) intrepid; urgency=low
+
+  * remove java specific dependencies and icedtea-java7-jre NBS (LP: #203636) 
+
+ -- Didier Roche <didrocks at ubuntu-fr.org>  Sat, 30 Aug 2008 10:36:00 +0200
+
 libwoodstox-java (1:3.9.2.dfsg-1) unstable; urgency=low
 
   * Now using ant.mk for the build

Modified: trunk/libwoodstox-java/debian/control
===================================================================
--- trunk/libwoodstox-java/debian/control	2010-05-08 09:45:28 UTC (rev 12343)
+++ trunk/libwoodstox-java/debian/control	2010-05-08 10:17:00 UTC (rev 12344)
@@ -1,21 +1,18 @@
 Source: libwoodstox-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
-Build-Depends-Indep: ant, ant-optional, 
-  openjdk-6-jdk | icedtea-java7-jdk | sun-java6-jdk 
+Build-Depends-Indep: ant, ant-optional, default-jdk, junit
 Build-Depends: cdbs, debhelper (>= 5), dpatch
 Standards-Version: 3.7.3
 Homepage: http://woodstox.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/packages/trunk/libwoodstox-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/packages/trunk/libwoodstox-java/
 
-
 Package: libwoodstox-java
 Architecture: all
-Depends: openjdk-6-jre | icedtea-java7-jre | sun-java6-jre 
-Suggests: java-virtual-machine
+Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
 Description: a high-performance XML processor
  Woodstox is a high-performance validating namespace-aware
  StAX-compliant (JSR-173) Open Source XML-processor written in

Modified: trunk/libwoodstox-java/debian/patches/00list
===================================================================
--- trunk/libwoodstox-java/debian/patches/00list	2010-05-08 09:45:28 UTC (rev 12343)
+++ trunk/libwoodstox-java/debian/patches/00list	2010-05-08 10:17:00 UTC (rev 12344)
@@ -1 +1,2 @@
-10-disable-unused
\ No newline at end of file
+10-disable-unused
+20-testsuite-enable

Added: trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch	                        (rev 0)
+++ trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch	2010-05-08 10:17:00 UTC (rev 12344)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testsuite-enable.dpatch by Thierry Carrez <thierry.carrez at ubuntu.com>
+##
+## DP: Enable test suite, make it block the build in case of failure
+## DP: Disable tests relying on non-packages external libs
+
+ at DPATCH@
+diff -urNad libwoodstox-java-3.9.2.dfsg~/build.xml libwoodstox-java-3.9.2.dfsg/build.xml
+--- libwoodstox-java-3.9.2.dfsg~/build.xml	2009-12-18 16:18:18.529774667 +0100
++++ libwoodstox-java-3.9.2.dfsg/build.xml	2009-12-18 16:18:41.899793876 +0100
+@@ -577,10 +577,12 @@
+             debug="true"
+         >
+             <include name="**/*.java" />
++            <exclude name="**/TestRelaxNG.java" />
++            <exclude name="**/TestW3CSchema.java" />
+             <classpath refid="compile-classpath" />
+             <classpath>
+                 <pathelement path="${BuildClassesDir}"/>  
+-                <path refid="junit-libs"/>
++                <!--path refid="junit-libs"/-->
+             </classpath>
+         </javac>
+     </target>
+@@ -589,7 +591,7 @@
+     <target name="test" depends="test.compile">
+        <!-- showoutput 'yes' to allow outputting debug msgs... -->
+         <junit fork="yes" forkmode="once" maxmemory="128M"
+-         printsummary="yes" haltonfailure="no" showoutput="yes">
++         printsummary="yes" haltonfailure="yes" showoutput="yes">
+             <batchtest fork="yes" todir="${TestXmlResultsDir}">
+                 <fileset dir="${TestClassesDir}">
+                     <!-- Need to exclude inner classes... -->
+@@ -602,7 +604,7 @@
+             <classpath>
+                 <pathelement path="${BuildClassesDir}" />
+                 <pathelement location="${TestClassesDir}" /> 
+-                <path refid="junit-libs"/>
++                <!--path refid="junit-libs"/-->
+             </classpath>     
+         </junit>
+ 

Modified: trunk/libwoodstox-java/debian/rules
===================================================================
--- trunk/libwoodstox-java/debian/rules	2010-05-08 09:45:28 UTC (rev 12343)
+++ trunk/libwoodstox-java/debian/rules	2010-05-08 10:17:00 UTC (rev 12344)
@@ -4,14 +4,15 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-icedtea
+JAVA_HOME            := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_ANT_COMPILER     := modern
-DEB_JARS             := ant-nodeps
+DEB_JARS             := ant-nodeps junit ant-junit ant-trax
 DEB_ANT_BUILD_TARGET := jar.wstx.lgpl
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_CHECK_TARGET := test
 
 clean::
 	-rm -Rf build doc test dist

More information about the pkg-java-commits mailing list