[pkg-java] r15680 - trunk/libwoodstox-java/debian/patches

[Giovanni Mascellani]

Author: gio
Date: 2012-01-11 12:35:50 +0000 (Wed, 11 Jan 2012)
New Revision: 15680

Added:
   trunk/libwoodstox-java/debian/patches/20-testsuite-enable
Removed:
   trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch
Modified:
   trunk/libwoodstox-java/debian/patches/series
Log:
Removing ancient .dpatch suffix.


Copied: trunk/libwoodstox-java/debian/patches/20-testsuite-enable (from rev 15679, trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch)
===================================================================
--- trunk/libwoodstox-java/debian/patches/20-testsuite-enable	                        (rev 0)
+++ trunk/libwoodstox-java/debian/patches/20-testsuite-enable	2012-01-11 12:35:50 UTC (rev 15680)
@@ -0,0 +1,40 @@
+From: Thierry Carrez <thierry.carrez at ubuntu.com>
+Subject: Enable test suite
+Last-Update: 2012-10-11
+Forwarded: not-needed
+
+Enable test suite, but don't fail even if some test goes wrong.
+
+Index: libwoodstox-java/build.xml
+===================================================================
+--- libwoodstox-java.orig/build.xml	2011-08-21 11:00:48.000000000 +0200
++++ libwoodstox-java/build.xml	2011-08-21 11:26:23.000000000 +0200
+@@ -476,7 +476,6 @@
+                 <pathelement path="${dir.build.classes.woodstox}" />
+                 <pathelement path="${dir.build.classes.stax2}" />
+                 <pathelement location="${dir.classes.test}" /> 
+-                <path refid="junit-libs"/>
+           </classpath>     
+         </junit>
+     </target>
+@@ -494,9 +493,7 @@
+             <include name="**/*.java" />
+             <classpath refid="classpath.compile" />
+             <classpath>
+-                <pathelement path="${dir.build.classes.stax2}"/>  
+                 <pathelement path="${dir.build.classes.woodstox}"/>  
+-                <path refid="junit-libs"/>
+             </classpath>
+         </javac>
+         <!-- 08-Jun-2009, tatu: need to copy some test files too -->
+@@ -522,10 +519,8 @@
+             <formatter type="xml" />
+             <classpath refid="classpath.compile" />
+             <classpath>
+-                <pathelement path="${dir.build.classes.stax2}" />
+                 <pathelement path="${dir.build.classes.woodstox}" />
+                 <pathelement location="${dir.classes.test}" /> 
+-                <path refid="junit-libs"/>
+             </classpath>     
+         </junit>
+ 

Deleted: trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch	2012-01-11 12:33:55 UTC (rev 15679)
+++ trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch	2012-01-11 12:35:50 UTC (rev 15680)
@@ -1,40 +0,0 @@
-From: Thierry Carrez <thierry.carrez at ubuntu.com>
-Subject: Enable test suite
-Last-Update: 2012-10-11
-Forwarded: not-needed
-
-Enable test suite, but don't fail even if some test goes wrong.
-
-Index: libwoodstox-java/build.xml
-===================================================================
---- libwoodstox-java.orig/build.xml	2011-08-21 11:00:48.000000000 +0200
-+++ libwoodstox-java/build.xml	2011-08-21 11:26:23.000000000 +0200
-@@ -476,7 +476,6 @@
-                 <pathelement path="${dir.build.classes.woodstox}" />
-                 <pathelement path="${dir.build.classes.stax2}" />
-                 <pathelement location="${dir.classes.test}" /> 
--                <path refid="junit-libs"/>
-           </classpath>     
-         </junit>
-     </target>
-@@ -494,9 +493,7 @@
-             <include name="**/*.java" />
-             <classpath refid="classpath.compile" />
-             <classpath>
--                <pathelement path="${dir.build.classes.stax2}"/>  
-                 <pathelement path="${dir.build.classes.woodstox}"/>  
--                <path refid="junit-libs"/>
-             </classpath>
-         </javac>
-         <!-- 08-Jun-2009, tatu: need to copy some test files too -->
-@@ -522,10 +519,8 @@
-             <formatter type="xml" />
-             <classpath refid="classpath.compile" />
-             <classpath>
--                <pathelement path="${dir.build.classes.stax2}" />
-                 <pathelement path="${dir.build.classes.woodstox}" />
-                 <pathelement location="${dir.classes.test}" /> 
--                <path refid="junit-libs"/>
-             </classpath>     
-         </junit>
- 

Modified: trunk/libwoodstox-java/debian/patches/series
===================================================================
--- trunk/libwoodstox-java/debian/patches/series	2012-01-11 12:33:55 UTC (rev 15679)
+++ trunk/libwoodstox-java/debian/patches/series	2012-01-11 12:35:50 UTC (rev 15680)
@@ -1,2 +1,2 @@
 10-fix-build.xml
-20-testsuite-enable.dpatch
+20-testsuite-enable