Package: elza
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 b71711d2395cb051800565f2ef0029830ccfe8f4 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 12:42:05 +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 | 9 +++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 3 ---
.../{10_elza-def.dpatch => 10-elza-def.patch} | 9 ++-------
.../{20_elza-pl.dpatch => 20-elza-pl.patch} | 9 ++-------
.../{30_elza-pl.dpatch => 30-elza-pl.patch} | 9 ++-------
debian/patches/series | 3 +++
debian/rules | 9 ++++-----
debian/source/format | 2 +-
11 files changed, 26 insertions(+), 37 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_elza-def.dpatch => 10-elza-def.patch} (83%)
rename debian/patches/{20_elza-pl.dpatch => 20-elza-pl.patch} (93%)
rename debian/patches/{30_elza-pl.dpatch => 30-elza-pl.patch} (78%)
create mode 100644 debian/patches/series
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 7f3a1be..9b79d2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+elza (1.4.3-15.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.1 and debhelper to 9.
+ * Use dh_prep in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 12:39:54 +0300
+
elza (1.4.3-15) unstable; urgency=low
* Lintian cleanups
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index cd7ffc8..8dbdab3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: interpreters
Priority: optional
Maintainer: Sebastien Delafond <s...@debian.org>
Build-Depends-Indep: docbook-to-man
-Build-Depends: debhelper (>= 6), dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: elza
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fe7522e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_elza-def.dpatch
-20_elza-pl.dpatch
-30_elza-pl.dpatch
diff --git a/debian/patches/10_elza-def.dpatch b/debian/patches/10-elza-def.patch
similarity index 83%
rename from debian/patches/10_elza-def.dpatch
rename to debian/patches/10-elza-def.patch
index a352158..0b93100 100644
--- a/debian/patches/10_elza-def.dpatch
+++ b/debian/patches/10-elza-def.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_elza-def.dpatch by Sebastien Delafond <s...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No Win32 module.
-## DP: Correct location for various Unix binaries.
+From: Sebastien Delafond <s...@debian.org>
+Subject: No Win32 module. Correct location for various Unix binaries.
-@DPATCH@
diff -urNad elza-1.4.3~/elza.def elza-1.4.3/elza.def
--- elza-1.4.3~/elza.def 2007-01-02 10:05:49.000000000 -0800
+++ elza-1.4.3/elza.def 2007-01-02 10:06:30.000000000 -0800
diff --git a/debian/patches/20_elza-pl.dpatch b/debian/patches/20-elza-pl.patch
similarity index 93%
rename from debian/patches/20_elza-pl.dpatch
rename to debian/patches/20-elza-pl.patch
index bd4311e..c51bee3 100644
--- a/debian/patches/20_elza-pl.dpatch
+++ b/debian/patches/20-elza-pl.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fileZjEFUl.dpatch by Sebastien Delafond <sdelaf...@gmx.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set correct interpreter
-## DP: Fixed line-terminations
+From: Sebastien Delafond <sdelaf...@gmx.net>
+Subject: Set correct interpreter and fix line-terminations
-@DPATCH@
diff -urNad elza-1.4.3/elza.pl /tmp/dpep.r8rSXb/elza-1.4.3/elza.pl
--- elza-1.4.3/elza.pl 2005-01-21 15:09:22.000000000 -0800
+++ /tmp/dpep.r8rSXb/elza-1.4.3/elza.pl 2005-01-21 15:27:36.000000000 -0800
diff --git a/debian/patches/30_elza-pl.dpatch b/debian/patches/30-elza-pl.patch
similarity index 78%
rename from debian/patches/30_elza-pl.dpatch
rename to debian/patches/30-elza-pl.patch
index 5928d54..2b4f2e8 100644
--- a/debian/patches/30_elza-pl.dpatch
+++ b/debian/patches/30-elza-pl.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_elza-pl.dpatch by Sebastien Delafond <sdelaf...@gmx.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed bug when POSTing a request
-## DP: Fixed bug when using a SOCKS proxy
+From: Sebastien Delafond <sdelaf...@gmx.net>
+Subject: Fix bug when POSTing a request and bug when using a SOCKS proxy
-@DPATCH@
diff -urNad elza-1.4.3/elza.pl /tmp/dpep.C7rYmi/elza-1.4.3/elza.pl
--- elza-1.4.3/elza.pl 2005-01-21 15:28:55.000000000 -0800
+++ /tmp/dpep.C7rYmi/elza-1.4.3/elza.pl 2005-01-21 15:29:51.000000000 -0800
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d14e80f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-elza-def.patch
+20-elza-pl.patch
+30-elza-pl.patch
diff --git a/debian/rules b/debian/rules
index 7c6f9c8..08ba33b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
export DESTDIR=$(CURDIR)/debian/elza
build: build-arch build-indep
-build-indep: patch build-stamp
+build-indep: build-stamp
build-arch:
build-stamp:
dh_testdir
@@ -20,7 +19,7 @@ build-stamp:
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
@@ -32,7 +31,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install -m 644 elza.def $(DESTDIR)/etc # Config file
@@ -59,4 +58,4 @@ binary-indep: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
