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

[Torsten Werner]

Author: twerner
Date: 2010-05-08 10:21:24 +0000 (Sat, 08 May 2010)
New Revision: 12345

Added:
   trunk/libwoodstox-java/debian/patches/series
   trunk/libwoodstox-java/debian/source/
   trunk/libwoodstox-java/debian/source/format
Removed:
   trunk/libwoodstox-java/debian/patches/00list
Modified:
   trunk/libwoodstox-java/debian/changelog
   trunk/libwoodstox-java/debian/control
   trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
   trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch
   trunk/libwoodstox-java/debian/rules
Log:
Switch to source format 3.0.

Modified: trunk/libwoodstox-java/debian/changelog
===================================================================
--- trunk/libwoodstox-java/debian/changelog	2010-05-08 10:17:00 UTC (rev 12344)
+++ trunk/libwoodstox-java/debian/changelog	2010-05-08 10:21:24 UTC (rev 12345)
@@ -8,8 +8,9 @@
 
   [ Torsten Werner ]
   * Merge changes from Ubuntu.
+  * Switch to source format 3.0.
 
- -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 12:14:29 +0200
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 12:19:39 +0200
 
 libwoodstox-java (1:3.9.2.dfsg-1ubuntu3) lucid; urgency=low
 

Modified: trunk/libwoodstox-java/debian/control
===================================================================
--- trunk/libwoodstox-java/debian/control	2010-05-08 10:17:00 UTC (rev 12344)
+++ trunk/libwoodstox-java/debian/control	2010-05-08 10:21:24 UTC (rev 12345)
@@ -4,7 +4,7 @@
 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, default-jdk, junit
-Build-Depends: cdbs, debhelper (>= 5), dpatch
+Build-Depends: cdbs, debhelper (>= 5)
 Standards-Version: 3.7.3
 Homepage: http://woodstox.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/packages/trunk/libwoodstox-java/

Deleted: trunk/libwoodstox-java/debian/patches/00list
===================================================================
--- trunk/libwoodstox-java/debian/patches/00list	2010-05-08 10:17:00 UTC (rev 12344)
+++ trunk/libwoodstox-java/debian/patches/00list	2010-05-08 10:21:24 UTC (rev 12345)
@@ -1,2 +0,0 @@
-10-disable-unused
-20-testsuite-enable

Modified: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch	2010-05-08 10:17:00 UTC (rev 12344)
+++ trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch	2010-05-08 10:21:24 UTC (rev 12345)
@@ -1,10 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-disable-unused.dpatch by  <fourmond at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Vincent Fourmond <fourmond at debian.org>
 
- at DPATCH@
 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


Property changes on: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch	2010-05-08 10:17:00 UTC (rev 12344)
+++ trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch	2010-05-08 10:21:24 UTC (rev 12345)
@@ -1,10 +1,9 @@
-#! /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
+From: Thierry Carrez <thierry.carrez at ubuntu.com>
+Subject: Enable test suite
 
- at DPATCH@
+* Enable test suite, make it block the build in case of failure
+* Disable tests relying on non-packages external libs
+
 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

Added: trunk/libwoodstox-java/debian/patches/series
===================================================================
--- trunk/libwoodstox-java/debian/patches/series	                        (rev 0)
+++ trunk/libwoodstox-java/debian/patches/series	2010-05-08 10:21:24 UTC (rev 12345)
@@ -0,0 +1,2 @@
+10-disable-unused.dpatch
+20-testsuite-enable.dpatch

Modified: trunk/libwoodstox-java/debian/rules
===================================================================
--- trunk/libwoodstox-java/debian/rules	2010-05-08 10:17:00 UTC (rev 12344)
+++ trunk/libwoodstox-java/debian/rules	2010-05-08 10:21:24 UTC (rev 12345)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java

Added: trunk/libwoodstox-java/debian/source/format
===================================================================
--- trunk/libwoodstox-java/debian/source/format	                        (rev 0)
+++ trunk/libwoodstox-java/debian/source/format	2010-05-08 10:21:24 UTC (rev 12345)
@@ -0,0 +1 @@
+3.0 (quilt)