[pkg-java] r12335 - in trunk/ow-util-ant-tasks/debian: . patches source

Fri May 7 22:10:26 UTC 2010

Author: twerner
Date: 2010-05-07 22:10:25 +0000 (Fri, 07 May 2010)
New Revision: 12335

Added:
   trunk/ow-util-ant-tasks/debian/patches/series
   trunk/ow-util-ant-tasks/debian/source/
   trunk/ow-util-ant-tasks/debian/source/format
Removed:
   trunk/ow-util-ant-tasks/debian/patches/00list
Modified:
   trunk/ow-util-ant-tasks/debian/changelog
   trunk/ow-util-ant-tasks/debian/control
   trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch
   trunk/ow-util-ant-tasks/debian/patches/02_upstream_correct_manifest_description.dpatch
   trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch
   trunk/ow-util-ant-tasks/debian/rules
Log:
Switch to source format 3.0.

Modified: trunk/ow-util-ant-tasks/debian/changelog
===================================================================

--- trunk/ow-util-ant-tasks/debian/changelog	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/changelog	2010-05-07 22:10:25 UTC (rev 12335)
@@ -5,8 +5,9 @@
   * Remove Barry from Uploaders list.
   * Add missing Depends: ${misc:Depends}.
   * Switch to debhelper compat version 7.
+  * Switch to source format 3.0.
 
- -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 00:05:11 +0200
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 00:10:14 +0200
 
 ow-util-ant-tasks (1.3.2-2ubuntu1) karmic; urgency=low
 

Modified: trunk/ow-util-ant-tasks/debian/control
===================================================================
--- trunk/ow-util-ant-tasks/debian/control	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/control	2010-05-07 22:10:25 UTC (rev 12335)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), dpatch (>= 2.0.14)
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: default-jdk, ant (>= 1.7), junit, libxalan2-java, libasm2-java
 Standards-Version: 3.7.2
 

Deleted: trunk/ow-util-ant-tasks/debian/patches/00list
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/00list	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/patches/00list	2010-05-07 22:10:25 UTC (rev 12335)
@@ -1,3 +0,0 @@
-01_upstream_enhance_compile_target
-02_upstream_correct_manifest_description
-05_MultipleCopy

Modified: trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch	2010-05-07 22:10:25 UTC (rev 12335)
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01-upstream_enhance_compile_target.dpatch by Barry Hawkins <barry at bytemason.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Add directives to enhance the degree of control over javac
 ## DP: behavior; helpful when building with free runtimes.
 
- at DPATCH@
-
 diff -uNr ow-util-ant-tasks-1.3/build.xml build-01.xml
 --- ow-util-ant-tasks-1.3.2/build.xml	2007-07-07 13:53:53.000000000 -0100
 +++ build.xml	2007-07-07 13:53:03.000000000 -0100

Modified: trunk/ow-util-ant-tasks/debian/patches/02_upstream_correct_manifest_description.dpatch
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/02_upstream_correct_manifest_description.dpatch	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/patches/02_upstream_correct_manifest_description.dpatch	2010-05-07 22:10:25 UTC (rev 12335)
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_upstream_correct_manifest_description.dpatch by Barry Hawkins <barry at bytemason.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: The description of the manifest is grammatically quite off;
 ## DP: this patch corrects it.
 
- at DPATCH@
-
 diff -uNr ow-util-ant-tasks-1.3/build.xml build-02.xml
 --- ow-util-ant-tasks-1.3/build.xml	2005-06-02 08:55:28.000000000 -0400
 +++ build-02.xml	2005-08-26 14:31:08.000000000 -0400

Modified: trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch	2010-05-07 22:10:25 UTC (rev 12335)
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 05_MultipleCopy.dpatch by  <konqueror at gmx.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Build against Ant 1.7.0
 
- at DPATCH@
-
 --- ./src/org/objectweb/util/ant/MultipleCopy.java.orig	2007-07-07 13:23:10.000000000 -0100
 +++ ./src/org/objectweb/util/ant/MultipleCopy.java	2007-07-07 13:23:35.000000000 -0100
 @@ -101,8 +101,8 @@


Property changes on: trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch
___________________________________________________________________
Deleted: svn:executable
   - *

Added: trunk/ow-util-ant-tasks/debian/patches/series
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/series	                        (rev 0)
+++ trunk/ow-util-ant-tasks/debian/patches/series	2010-05-07 22:10:25 UTC (rev 12335)
@@ -0,0 +1,3 @@
+01_upstream_enhance_compile_target.dpatch
+02_upstream_correct_manifest_description.dpatch
+05_MultipleCopy.dpatch

Modified: trunk/ow-util-ant-tasks/debian/rules
===================================================================
--- trunk/ow-util-ant-tasks/debian/rules	2010-05-07 22:05:34 UTC (rev 12334)
+++ trunk/ow-util-ant-tasks/debian/rules	2010-05-07 22:10:25 UTC (rev 12335)
@@ -8,9 +8,6 @@
 # Set a locale; currently using default
 export LANG=C
 
-# Include to enable dpatch
-include /usr/share/dpatch/dpatch.make
-
 TEMPDIR=debian/libow-util-ant-tasks-java
 
 # Set JAVA_HOME to be used for Java commands
@@ -37,13 +34,13 @@
 
 build: build-stamp
 
-build-stamp: patch-stamp
+build-stamp:
 	dh_testdir
 	$(ANT) jar
 	$(ANT) jdoc
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

Added: trunk/ow-util-ant-tasks/debian/source/format
===================================================================
--- trunk/ow-util-ant-tasks/debian/source/format	                        (rev 0)
+++ trunk/ow-util-ant-tasks/debian/source/format	2010-05-07 22:10:25 UTC (rev 12335)
@@ -0,0 +1 @@
+3.0 (quilt)


