Package: libhtmlparser-java
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
Tiago, as we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 6d80518a575feff481b415cb5d2f5eefa3628b84 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 03:45:45 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
...ncy.dpatch => 01_remove_jdk15-dependency.patch} | 8 ++------
...les.dpatch => 02_adjust_path_in_examples.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 1 -
debian/source/format | 1 +
9 files changed, 18 insertions(+), 18 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_remove_jdk15-dependency.dpatch => 01_remove_jdk15-dependency.patch} (85%)
rename debian/patches/{02_adjust_path_in_examples.dpatch => 02_adjust_path_in_examples.patch} (98%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 0e46777..2f7fb4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libhtmlparser-java (1.6.20060610.dfsg0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 03:39:35 -0500
+
libhtmlparser-java (1.6.20060610.dfsg0-3) unstable; urgency=low
* Remove bashism in debian/rules (brace expansion). (Closes: #477610)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 4646e94..f468b08 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: libs
Priority: optional
Maintainer: Tiago Saboga <[email protected]>
Homepage: http://htmlparser.sourceforge.net/
-Build-Depends: cdbs, debhelper (>= 5), ant, java-gcj-compat-dev, dpatch
+Build-Depends: cdbs, debhelper (>= 9), ant, java-gcj-compat-dev
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhtmlparser-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhtmlparser-java
-Standards-Version: 3.7.3
+Standards-Version: 3.9.3
Package: libhtmlparser-java
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0b00c24..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_remove_jdk15-dependency
-02_adjust_path_in_examples
diff --git a/debian/patches/01_remove_jdk15-dependency.dpatch b/debian/patches/01_remove_jdk15-dependency.patch
similarity index 85%
rename from debian/patches/01_remove_jdk15-dependency.dpatch
rename to debian/patches/01_remove_jdk15-dependency.patch
index 84175d7..df0a6a3 100644
--- a/debian/patches/01_remove_jdk15-dependency.dpatch
+++ b/debian/patches/01_remove_jdk15-dependency.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_jdk15-dependency.dpatch by Tiago Saboga <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Tiago Saboga <[email protected]>
+Subject: Fix build
-@DPATCH@
diff -urNad libhtmlparser-java-1.6.20060610~/src/build.xml libhtmlparser-java-1.6.20060610/src/build.xml
--- libhtmlparser-java-1.6.20060610~/src/build.xml 2007-11-06 14:05:31.000000000 -0200
+++ libhtmlparser-java-1.6.20060610/src/build.xml 2007-11-06 14:06:51.000000000 -0200
diff --git a/debian/patches/02_adjust_path_in_examples.dpatch b/debian/patches/02_adjust_path_in_examples.patch
similarity index 98%
rename from debian/patches/02_adjust_path_in_examples.dpatch
rename to debian/patches/02_adjust_path_in_examples.patch
index 18d1d7b..1817f8d 100644
--- a/debian/patches/02_adjust_path_in_examples.dpatch
+++ b/debian/patches/02_adjust_path_in_examples.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_adjust_path_in_examples.dpatch by Tiago Saboga <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Tiago Saboga <[email protected]>
+Subject: Fix LOCALCLASSPATH in exaples
-@DPATCH@
diff -urNad libhtmlparser-java-1.6.20060610~/bin/beanybaby libhtmlparser-java-1.6.20060610/bin/beanybaby
--- libhtmlparser-java-1.6.20060610~/bin/beanybaby 2007-11-06 14:13:58.000000000 -0200
+++ libhtmlparser-java-1.6.20060610/bin/beanybaby 2007-11-06 14:14:08.000000000 -0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7793734
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_remove_jdk15-dependency.patch
+02_adjust_path_in_examples.patch
diff --git a/debian/rules b/debian/rules
index 137a443..d7aba4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
JAVA_HOME = /usr/lib/jvm/java-gcj
DEB_ANT_BUILD_TARGET = jarparser javadoc filterbuilder thumbelina
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.9
