[pkg-java] r6400 - in trunk/libwoodstox-java/debian: . patches
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Sat May 3 19:16:46 UTC 2008
Author: fourmond
Date: 2008-05-03 19:16:45 +0000 (Sat, 03 May 2008)
New Revision: 6400
Modified:
trunk/libwoodstox-java/debian/changelog
trunk/libwoodstox-java/debian/install
trunk/libwoodstox-java/debian/links
trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
Log:
[libwoodstox-java] New upstream version
Modified: trunk/libwoodstox-java/debian/changelog
===================================================================
--- trunk/libwoodstox-java/debian/changelog 2008-05-03 12:58:40 UTC (rev 6399)
+++ trunk/libwoodstox-java/debian/changelog 2008-05-03 19:16:45 UTC (rev 6400)
@@ -1,4 +1,4 @@
-libwoodstox-java (4.0~svn20070930-3) UNRELEASED; urgency=low
+libwoodstox-java (1:3.9.1-1) unstable; urgency=low
[ Vincent Fourmond ]
* Switch to a team-maintained package
@@ -9,8 +9,12 @@
[ Michael Koch ]
* Updated watch file.
- -- Vincent Fourmond <fourmond at debian.org> Sat, 29 Dec 2007 16:44:36 +0100
+ [ Vincent Fourmond ]
+ * New upstream version
+ * Refreshed 10-disable-unused
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 03 May 2008 20:59:51 +0200
+
libwoodstox-java (4.0~svn20070930-2) unstable; urgency=low
* Added a watchfile and a Homepage control field
Modified: trunk/libwoodstox-java/debian/install
===================================================================
--- trunk/libwoodstox-java/debian/install 2008-05-03 12:58:40 UTC (rev 6399)
+++ trunk/libwoodstox-java/debian/install 2008-05-03 19:16:45 UTC (rev 6400)
@@ -1 +1 @@
-build/wstx-lgpl-4.0pr1.jar usr/share/java
\ No newline at end of file
+build/wstx-lgpl-3.9.1.jar usr/share/java
\ No newline at end of file
Modified: trunk/libwoodstox-java/debian/links
===================================================================
--- trunk/libwoodstox-java/debian/links 2008-05-03 12:58:40 UTC (rev 6399)
+++ trunk/libwoodstox-java/debian/links 2008-05-03 19:16:45 UTC (rev 6400)
@@ -1 +1 @@
-usr/share/java/wstx-lgpl-4.0pr1.jar usr/share/java/wstx-lgpl.jar
\ No newline at end of file
+usr/share/java/wstx-lgpl-3.9.1.jar usr/share/java/wstx-lgpl.jar
\ No newline at end of file
Modified: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch 2008-05-03 12:58:40 UTC (rev 6399)
+++ trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch 2008-05-03 19:16:45 UTC (rev 6400)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad libwoodstox-java-4.0~svn20070930~/build.xml libwoodstox-java-4.0~svn20070930/build.xml
---- libwoodstox-java-4.0~svn20070930~/build.xml 2007-09-17 07:30:53.000000000 +0200
-+++ libwoodstox-java-4.0~svn20070930/build.xml 2007-09-30 21:31:01.000000000 +0200
+diff -urNad libwoodstox-java-3.9.1~/build.xml libwoodstox-java-3.9.1/build.xml
+--- libwoodstox-java-3.9.1~/build.xml 2008-03-16 06:33:27.000000000 +0100
++++ libwoodstox-java-3.9.1/build.xml 2008-05-03 21:05:45.000000000 +0200
@@ -20,11 +20,11 @@
<property name="RelNotesDir" location="${basedir}/release-notes" />
@@ -22,7 +22,7 @@
<!-- Documentation -->
<property name="DocDir" location="${basedir}/doc" />
-@@ -56,10 +56,10 @@
+@@ -56,16 +56,16 @@
<!-- jars needed for compilation -->
<path id="compile-classpath">
@@ -32,10 +32,21 @@
+<!-- <fileset dir="${LibDir}" includes="sax2.jar" /> -->
<!-- these are needed for optional MSV-based validators -->
- <fileset dir="${LibDir}/msv" includes="*.jar" />
+- </path>
+- <path id="junit-libs">
+- <fileset dir="${LibDir}">
+- <include name="junit/junit*.jar" />
+- </fileset>
+<!-- <fileset dir="${LibDir}/msv" includes="*.jar" /> -->
</path>
- <path id="junit-libs">
- <fileset dir="${LibDir}">
++<!-- <path id="junit-libs"> -->
++<!-- <fileset dir="${LibDir}"> -->
++<!-- <include name="junit/junit*.jar" /> -->
++<!-- </fileset> -->
++<!-- </path> -->
+
+ <!-- Source files to include in source packages (tar, zip) -->
+ <patternset id="wstx-dist-src-files">
@@ -96,6 +96,7 @@
<!-- Core Woodstox class files common to all license flavours: -->
<patternset id="wstx-dist-class-files">
@@ -48,14 +59,14 @@
<!-- Enabling support for Emma (http://emma.sourceforge.net) code
- coverage library
-->
-- <property name="emma.dir" value="${LibDir}" />
+- <property name="emma.dir" value="${LibDir}/coverage" />
- <property name="emma.coverage.dir" value="${BuildDir}/coverage" />
- <path id="emma.lib">
- <pathelement location="${emma.dir}/emma.jar" />
- <pathelement location="${emma.dir}/emma_ant.jar" />
- </path>
- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-+<!-- <property name="emma.dir" value="${LibDir}" /> -->
++<!-- <property name="emma.dir" value="${LibDir}/coverage" /> -->
+<!-- <property name="emma.coverage.dir" value="${BuildDir}/coverage" /> -->
+<!-- <path id="emma.lib"> -->
+<!-- <pathelement location="${emma.dir}/emma.jar" /> -->
@@ -64,13 +75,12 @@
+<!-- <taskdef resource="emma_ant.properties" classpathref="emma.lib" /> -->
-- <!-- And/or support for Cobertura code coverage tool -->
+ <!-- And/or support for Cobertura code coverage tool -->
- <property name="cobertura.coverage.dir" value="${BuildDir}/coverage" />
- <path id="cobertura.lib">
- <fileset dir="${LibDir}/cobertura" includes="*.jar" />
- </path>
- <taskdef classpathref="cobertura.lib" resource="tasks.properties" />
-+<!-- And/or support for Cobertura code coverage tool -->
+<!-- <property name="cobertura.coverage.dir" value="${BuildDir}/coverage" /> -->
+<!-- <path id="cobertura.lib"> -->
+<!-- <fileset dir="${LibDir}/cobertura" includes="*.jar" /> -->
@@ -100,3 +110,57 @@
<include name="test/**/*.java" />
<classpath refid="compile-classpath" />
</javac>
+@@ -635,14 +637,14 @@
+ </pathelement>
+ </path>
+ <mkdir dir="${emma.instr.dir}" />
+- <emma enabled="true"> <!-- verbosity="verbose" -->
+- <instr instrpathref="emma-classpath"
+- destdir="${EmmaBuildClassesDir}"
+- metadatafile="${emma.coverage.dir}/metadata.emma"
+- merge="true"
+- mode="fullcopy"
+- />
+- </emma>
++<!-- <emma enabled="true"> --><!-- verbosity="verbose" -->
++<!-- <instr instrpathref="emma-classpath" -->
++<!-- destdir="${EmmaBuildClassesDir}" -->
++<!-- metadatafile="${emma.coverage.dir}/metadata.emma" -->
++<!-- merge="true" -->
++<!-- mode="fullcopy" -->
++<!-- /> -->
++<!-- </emma> -->
+ <!-- Ok, so let's just nuke the stupid test classes...
+ - ... for which there are 2 possible locations...
+ -->
+@@ -765,19 +767,19 @@
+ </classpath>
+ </junit>
+ <!-- and then reporting -->
+- <cobertura-report format="html" destdir="${cobertura.coverage.dir}" >
+- <fileset dir="${JavaSrcDir}">
+- <include name="**/*.java" />
+- </fileset>
+- </cobertura-report>
++<!-- <cobertura-report format="html" destdir="${cobertura.coverage.dir}" > -->
++<!-- <fileset dir="${JavaSrcDir}"> -->
++<!-- <include name="**/*.java" /> -->
++<!-- </fileset> -->
++<!-- </cobertura-report> -->
+
+ <!-- Let's also report junit results? (at least if they fail) -->
+- <junitreport todir="${TestResultsDir}">
+- <fileset dir="${TestXmlResultsDir}">
+- <include name="TEST-*.xml" />
+- </fileset>
+- <report todir="${TestResultsDir}" />
+- </junitreport>
++<!-- <junitreport todir="${TestResultsDir}"> -->
++<!-- <fileset dir="${TestXmlResultsDir}"> -->
++<!-- <include name="TEST-*.xml" /> -->
++<!-- </fileset> -->
++<!-- <report todir="${TestResultsDir}" /> -->
++<!-- </junitreport> -->
+ </target>
+
+ </project>
More information about the pkg-java-commits
mailing list