Package: paros
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
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From 6bfd2578db58f9b21796c19e5728137fcbf651e2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 13:00:29 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 4 ----
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 2 +-
debian/patches/00list | 4 ----
debian/patches/{10_build.dpatch => 10-build.patch} | 8 ++------
...20-httpclient-CloneNotSupportedException.patch} | 8 ++------
...indowClose.dpatch => 30-jdic-windowClose.patch} | 8 ++------
...tch => 40-user-preferences-Constant.java.patch} | 10 +++-------
debian/patches/series | 4 ++++
debian/rules | 11 +++++++----
debian/source/format | 1 +
13 files changed, 35 insertions(+), 41 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_build.dpatch => 10-build.patch} (87%)
rename debian/patches/{20_httpclient_CloneNotSupportedException.dpatch => 20-httpclient-CloneNotSupportedException.patch} (92%)
rename debian/patches/{30_jdic_windowClose.dpatch => 30-jdic-windowClose.patch} (65%)
rename debian/patches/{40_user-preferences_Constant.java.dpatch => 40-user-preferences-Constant.java.patch} (84%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 096d38b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-Please refer to /usr/share/doc/dpatch/README.source.gz for more
-information about dpatch.
-
- -- Sebastien Delafond <s...@debian.org> Mon, 28 Sep 2009 18:12:26 +0200
diff --git a/debian/changelog b/debian/changelog
index 06fa056..8fcfedd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+paros (3.2.13-6.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.
+ * Add build-arch and build-indep targets to rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 12:58:58 +0300
+
paros (3.2.13-6) unstable; urgency=low
* Re-include /usr/share/paros/license/TheClarifiedArtisticLicense.htm,
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index e620239..82cdf66 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: paros
Section: net
Priority: extra
Maintainer: Sebastien Delafond <s...@debian.org>
-Build-Depends: debhelper (>= 7), openjdk-6-jdk | java6-sdk, dpatch, ant
+Build-Depends: debhelper (>= 9), openjdk-6-jdk | java6-sdk, ant
Build-Depends-Indep: libcommons-codec-java, libcommons-collections3-java, libcommons-configuration-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, liblog4j1.2-java, libjdic-java, libhsqldb-java
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Homepage: http://parosproxy.org
Package: paros
diff --git a/debian/copyright b/debian/copyright
index 4aed13c..0e50129 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,4 +20,4 @@ can be found in `/usr/share/common-licenses/Artistic'.
The Debian packaging is Copyright 2008, Sebastien Delafond
<s...@debian.org> and is licensed under the GPL, see
-`/usr/share/common-licenses/GPL'.
+`/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index edd6d5c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-10_build
-20_httpclient_CloneNotSupportedException
-30_jdic_windowClose
-40_user-preferences_Constant.java
diff --git a/debian/patches/10_build.dpatch b/debian/patches/10-build.patch
similarity index 87%
rename from debian/patches/10_build.dpatch
rename to debian/patches/10-build.patch
index dae0e90..a2823d8 100644
--- a/debian/patches/10_build.dpatch
+++ b/debian/patches/10-build.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_build.dpatch by Sebastien Delafond <s...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the build.xml to use Debian-provided jar files.
+From: Sebastien Delafond <s...@debian.org>
+Subject: Fix the build.xml to use Debian-provided jar files.
-@DPATCH@
diff -urNad paros-3.2.13~/build/build.xml paros-3.2.13/build/build.xml
--- paros-3.2.13~/build/build.xml 2008-08-22 12:54:39.000000000 -0700
+++ paros-3.2.13/build/build.xml 2008-08-22 12:56:18.000000000 -0700
diff --git a/debian/patches/20_httpclient_CloneNotSupportedException.dpatch b/debian/patches/20-httpclient-CloneNotSupportedException.patch
similarity index 92%
rename from debian/patches/20_httpclient_CloneNotSupportedException.dpatch
rename to debian/patches/20-httpclient-CloneNotSupportedException.patch
index c8bf65b..a62998c 100644
--- a/debian/patches/20_httpclient_CloneNotSupportedException.dpatch
+++ b/debian/patches/20-httpclient-CloneNotSupportedException.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_httpclient_CloneNotSupportedException.dpatch by Sebastien Delafond <s...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: commons-httpclient 3.1 throws CloneNotSupportedException for clone()
+From: Sebastien Delafond <s...@debian.org>
+Subject: commons-httpclient 3.1 throws CloneNotSupportedException for clone()
-@DPATCH@
diff -urNad paros-3.2.13~/src/org/parosproxy/paros/core/scanner/Analyser.java paros-3.2.13/src/org/parosproxy/paros/core/scanner/Analyser.java
--- paros-3.2.13~/src/org/parosproxy/paros/core/scanner/Analyser.java 2008-08-22 13:15:37.000000000 -0700
+++ paros-3.2.13/src/org/parosproxy/paros/core/scanner/Analyser.java 2008-08-22 13:15:56.000000000 -0700
diff --git a/debian/patches/30_jdic_windowClose.dpatch b/debian/patches/30-jdic-windowClose.patch
similarity index 65%
rename from debian/patches/30_jdic_windowClose.dpatch
rename to debian/patches/30-jdic-windowClose.patch
index 6a1b093..ff06be4 100644
--- a/debian/patches/30_jdic_windowClose.dpatch
+++ b/debian/patches/30-jdic-windowClose.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_jdic_windowClose.dpatch by Sebastien Delafond <s...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: jdic 0.9.5 adds a new abstract method to be implemented.
+From: Sebastien Delafond <s...@debian.org>
+Subject: jdic 0.9.5 adds a new abstract method to be implemented.
-@DPATCH@
diff -urNad paros-3.2.13~/src/org/parosproxy/paros/extension/history/EmbeddedBrowser.java paros-3.2.13/src/org/parosproxy/paros/extension/history/EmbeddedBrowser.java
--- paros-3.2.13~/src/org/parosproxy/paros/extension/history/EmbeddedBrowser.java 2008-08-22 13:15:02.000000000 -0700
+++ paros-3.2.13/src/org/parosproxy/paros/extension/history/EmbeddedBrowser.java 2008-08-22 13:15:12.000000000 -0700
diff --git a/debian/patches/40_user-preferences_Constant.java.dpatch b/debian/patches/40-user-preferences-Constant.java.patch
similarity index 84%
rename from debian/patches/40_user-preferences_Constant.java.dpatch
rename to debian/patches/40-user-preferences-Constant.java.patch
index 0727332..eee93fe 100644
--- a/debian/patches/40_user-preferences_Constant.java.dpatch
+++ b/debian/patches/40-user-preferences-Constant.java.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_user-preferences_Constant.java.dpatch by Sebastien Delafond <s...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set paros config files in System.getProperty("user.dir"), which
-## DP: we set to ~/.paros at runtime
+From: Sebastien Delafond <s...@debian.org>
+Subject: Set paros config files in System.getProperty("user.dir"), which
+ we set to ~/.paros at runtime
-@DPATCH@
diff -urNad paros-3.2.13~/src/org/parosproxy/paros/Constant.java paros-3.2.13/src/org/parosproxy/paros/Constant.java
--- paros-3.2.13~/src/org/parosproxy/paros/Constant.java 2008-08-22 16:02:39.000000000 -0700
+++ paros-3.2.13/src/org/parosproxy/paros/Constant.java 2008-08-22 16:03:24.000000000 -0700
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b72fe5c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+10-build.patch
+20-httpclient-CloneNotSupportedException.patch
+30-jdic-windowClose.patch
+40-user-preferences-Constant.java.patch
diff --git a/debian/rules b/debian/rules
index 9c4d998..9baeb79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,16 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
DESTDIR := $(CURDIR)/debian/paros
BUILD_DIR := $(CURDIR)/build
DIST_DIR := $(BUILD_DIR)/paros
-build: patch build-stamp
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
@@ -17,7 +20,7 @@ build-stamp:
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -79,4 +82,4 @@ binary-indep: install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
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.5
