Package: polipo
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 2edd9b3e051e04286d471fcbd4826cb1c272b1ff Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 09:13:04 -0500
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/changelog | 10 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 3 -
.../{10_makefile.dpatch => 10_makefile.patch} | 36 ++++------------
.../patches/{20_config.dpatch => 20_config.patch} | 26 +----------
...iously-ignore-CNAMEs-after-a-DNS-timeout.dpatch | 45 --------------------
...riously-ignore-CNAMEs-after-a-DNS-timeout.patch | 36 ++++++++++++++++
debian/patches/series | 3 +
debian/rules | 1 -
debian/source/format | 1 +
11 files changed, 64 insertions(+), 103 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10_makefile.dpatch => 10_makefile.patch} (55%)
rename debian/patches/{20_config.dpatch => 20_config.patch} (65%)
delete mode 100644 debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.dpatch
create mode 100644 debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.patch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 09ec360..427e1a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+polipo (1.0.4.1-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: some patches were updated with "quilt refresh" to make
+ them apply cleanly (10, 30).
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 09:10:41 -0500
+
polipo (1.0.4.1-1.1) unstable; urgency=low
* Non-maintainer upload.
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 5152bb8..c3ddf46 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: polipo
Section: web
Priority: optional
Maintainer: Erinn Clark <er...@torproject.org>
-Build-Depends: debhelper (>= 5), cdbs, texinfo, dpatch
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), cdbs, texinfo
+Standards-Version: 3.9.3
Homepage: http://www.pps.jussieu.fr/~jch/software/polipo/
Package: polipo
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c7f6af3..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_makefile.dpatch
-20_config.dpatch
-30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.dpatch
diff --git a/debian/patches/10_makefile.dpatch b/debian/patches/10_makefile.patch
similarity index 55%
rename from debian/patches/10_makefile.dpatch
rename to debian/patches/10_makefile.patch
index afa7b89..d37cef8 100644
--- a/debian/patches/10_makefile.dpatch
+++ b/debian/patches/10_makefile.patch
@@ -1,31 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_makefile.dpatch by Denis V. Sirotkin <fech...@gmail.com>
-## Original changes was done by Tom Huckstep <tom-debian-pol...@jaguarpaw.co.uk>
-##
-## DP: Change description
+From: Denis V. Sirotkin <fech...@gmail.com>
+Subject: Change description
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+---
+ Makefile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-
---- polipo-1.0.1.orig/Makefile
-+++ polipo-1.0.1/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -1,4 +1,5 @@
-PREFIX = /usr/local
+PREFIX = /usr
@@ -33,7 +15,7 @@ exit 0
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/man
INFODIR = $(PREFIX)/info
-@@ -62,7 +63,7 @@
+@@ -63,7 +64,7 @@
DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
@@ -42,7 +24,7 @@ exit 0
SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
config.c local.c http.c client.c server.c auth.c tunnel.c \
-@@ -91,10 +92,13 @@
+@@ -92,10 +93,13 @@
mkdir -p $(TARGET)$(BINDIR)
mkdir -p $(TARGET)$(LOCAL_ROOT)
mkdir -p $(TARGET)$(LOCAL_ROOT)/doc
diff --git a/debian/patches/20_config.dpatch b/debian/patches/20_config.patch
similarity index 65%
rename from debian/patches/20_config.dpatch
rename to debian/patches/20_config.patch
index f621cdf..896f54d 100644
--- a/debian/patches/20_config.dpatch
+++ b/debian/patches/20_config.patch
@@ -1,28 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_config.dpatch by Denis V. Sirotkin <fech...@gmail.com>
-## Original changes was done by Tom Huckstep <tom-debian-pol...@jaguarpaw.co.uk>
-##
-## DP: Change description
+From: Denis V. Sirotkin <fech...@gmail.com>
+Subject: Change description
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
--- polipo-1.0.1.orig/config.sample
+++ polipo-1.0.1/config.sample
diff --git a/debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.dpatch b/debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.dpatch
deleted file mode 100644
index 343c74c..0000000
--- a/debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.dpatch
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.dpatch by Alan Jenkins
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't spuriously ignore CNAMEs after a DNS timeout
-## DP: cherry-picked from 1144bc9a25fe685bf5a8d18a22d4fa79b9ade75b
-
-@DPATCH@
-
-From 1144bc9a25fe685bf5a8d18a22d4fa79b9ade75b Mon Sep 17 00:00:00 2001
-From: Juliusz Chroboczek <j...@pps.jussieu.fr>
-Date: Tue, 10 Nov 2009 16:48:04 -0800
-Subject: [PATCH] Don't spuriously ignore CNAMEs after a DNS timeout.
-
-Ignore-this: 60fbb7453699ecbff6961bf1622dfb3
-From Alan Jenkins.
-
-darcs-hash:20091111004804-4cc09-0d24709fbdebd5a7bdc5ce01a6a76aab5bc1241c.gz
----
- dns.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/dns.c b/dns.c
-index 8d4ac75..1a5b39b 100644
---- a/dns.c
-+++ b/dns.c
-@@ -1181,6 +1181,15 @@ dnsReplyHandler(int abort, FdEventHandlerPtr event)
- } else
- releaseAtom(value);
- } else if(af == 0) {
-+ /* Ignore errors in this case. */
-+ if(query->inet4 && query->inet4->length == 0) {
-+ releaseAtom(query->inet4);
-+ query->inet4 = NULL;
-+ }
-+ if(query->inet6 && query->inet6->length == 0) {
-+ releaseAtom(query->inet6);
-+ query->inet6 = NULL;
-+ }
- if(query->inet4 || query->inet6) {
- do_log(L_WARN, "Host %s has both %s and CNAME -- "
- "ignoring CNAME.\n", scrub(query->name->string),
---
-1.7.1
-
diff --git a/debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.patch b/debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.patch
new file mode 100644
index 0000000..4f5eb23
--- /dev/null
+++ b/debian/patches/30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.patch
@@ -0,0 +1,36 @@
+From: Juliusz Chroboczek <j...@pps.jussieu.fr>
+Subject: Don't spuriously ignore CNAMEs after a DNS timeout
+X-Comment:
+ cherry-picked from 1144bc9a25fe685bf5a8d18a22d4fa79b9ade75b
+ .
+ From 1144bc9a25fe685bf5a8d18a22d4fa79b9ade75b Mon Sep 17 00:00:00 2001
+ From: Juliusz Chroboczek <j...@pps.jussieu.fr>
+ Date: Tue, 10 Nov 2009 16:48:04 -0800
+ Subject: [PATCH] Don't spuriously ignore CNAMEs after a DNS timeout.
+ .
+ Ignore-this: 60fbb7453699ecbff6961bf1622dfb3
+ From Alan Jenkins.
+ .
+ darcs-hash:20091111004804-4cc09-0d24709fbdebd5a7bdc5ce01a6a76aab5bc1241c.gz
+ ---
+ dns.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/dns.c
++++ b/dns.c
+@@ -1181,6 +1181,15 @@
+ } else
+ releaseAtom(value);
+ } else if(af == 0) {
++ /* Ignore errors in this case. */
++ if(query->inet4 && query->inet4->length == 0) {
++ releaseAtom(query->inet4);
++ query->inet4 = NULL;
++ }
++ if(query->inet6 && query->inet6->length == 0) {
++ releaseAtom(query->inet6);
++ query->inet6 = NULL;
++ }
+ if(query->inet4 || query->inet6) {
+ do_log(L_WARN, "Host %s has both %s and CNAME -- "
+ "ignoring CNAME.\n", query->name->string,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..adfcc8a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10_makefile.patch
+20_config.patch
+30_Don-t-spuriously-ignore-CNAMEs-after-a-DNS-timeout.patch
diff --git a/debian/rules b/debian/rules
index d023ee3..22ba2ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include debian/cdbs/helper-scripts.mk
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
