--- Begin Message ---
Package: cvs-syncmail
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 6291396e4ac6368b248510415a3cc33cc3c8b8da Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Mon, 27 Feb 2012 13:14:46 -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 | 10 ++++++
debian/control | 4 +-
debian/patches/00list | 4 --
.../{01_encoding.dpatch => 01_encoding.patch} | 34 ++++++++++----------
.../{02_spelling.dpatch => 02_spelling.patch} | 8 +---
.../{03_dir_issues.dpatch => 03_dir_issues.patch} | 8 +---
.../{04_man_page.dpatch => 04_man_page.patch} | 10 ++----
debian/patches/series | 4 ++
debian/rules | 10 +-----
debian/source/format | 1 +
10 files changed, 43 insertions(+), 50 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_encoding.dpatch => 01_encoding.patch} (76%)
rename debian/patches/{02_spelling.dpatch => 02_spelling.patch} (68%)
rename debian/patches/{03_dir_issues.dpatch => 03_dir_issues.patch} (91%)
rename debian/patches/{04_man_page.dpatch => 04_man_page.patch} (97%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index bc024d2..63fc957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cvs-syncmail (2.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: patch 01 was updated with "quilt refresh" to make
+ it apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Mon, 27 Feb 2012 13:14:00 -0500
+
cvs-syncmail (2.3-1) unstable; urgency=low
* New maintainer (Closes: #300564)
diff --git a/debian/control b/debian/control
index cc38d7e..c74e209 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: cvs-syncmail
Section: utils
Priority: optional
Maintainer: Christopher Sacca <[email protected]>
-Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
-Standards-Version: 3.6.2
+Build-Depends-Indep: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: cvs-syncmail
Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0bfa0ff..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_encoding.dpatch
-02_spelling.dpatch
-03_dir_issues.dpatch
-04_man_page.dpatch
diff --git a/debian/patches/01_encoding.dpatch b/debian/patches/01_encoding.patch
similarity index 76%
rename from debian/patches/01_encoding.dpatch
rename to debian/patches/01_encoding.patch
index 8b7460d..c2e0a12 100644
--- a/debian/patches/01_encoding.dpatch
+++ b/debian/patches/01_encoding.patch
@@ -1,16 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_encoding.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Old patch to support character encodings
+From: <[email protected]>
+Subject: Old patch to support character encodings
-@DPATCH@
---- cvs-syncmail-2.3/syncmail 2005-08-05 12:02:22.612818776 -0400
-+++ cvs-syncmail-2.3/syncmail 2005-08-05 12:03:13.181131224 -0400
-@@ -71,6 +71,9 @@
- --charset=charset
- Add a encoding header to message.
+---
+ syncmail | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+--- a/syncmail
++++ b/syncmail
+@@ -65,6 +65,9 @@
+ --reply-to=ADDR
+ Add a "Reply-To: ADDR" header to the email message.
+ --charset=charset
+ Add a encoding header to message.
@@ -18,7 +18,7 @@
--quiet / -q
Don't print as much status to stdout.
-@@ -218,7 +221,7 @@
+@@ -212,7 +215,7 @@
@@ -27,7 +27,7 @@
# cannot wait for child process or that will cause parent to retain cvs
# lock for too long. Urg!
if not os.fork():
-@@ -247,6 +250,9 @@
+@@ -241,6 +244,9 @@
To: %(people)s''' % vars
if replyto:
print >> s, 'Reply-To: %s' % replyto
@@ -37,7 +37,7 @@
print >>s, '''\
Subject: %(subject)s
Date: %(date)s
-@@ -371,7 +377,7 @@
+@@ -365,7 +371,7 @@
sys.argv[1:], 'hC:cuS:R:qf:m:',
['fromhost=', 'context=', 'cvsroot=', 'mailhost=',
'subject-prefix=', 'reply-to=',
@@ -46,7 +46,7 @@
except getopt.error, msg:
usage(1, msg)
-@@ -380,6 +386,7 @@
+@@ -374,6 +380,7 @@
verbose = 1
subject_prefix = ""
replyto = None
@@ -54,7 +54,7 @@
fromhost = None
for opt, arg in opts:
if opt in ('-h', '--help'):
-@@ -397,6 +404,8 @@
+@@ -391,6 +398,8 @@
subject_prefix = arg
elif opt in ('-R', '--reply-to'):
replyto = arg
@@ -63,7 +63,7 @@
elif opt in ('-q', '--quiet'):
verbose = 0
elif opt in ('-f', '--fromhost'):
-@@ -433,7 +442,7 @@
+@@ -427,7 +436,7 @@
print 'Mailing %s...' % COMMASPACE.join(people)
print 'Generating notification message...'
blast_mail(subject, people, changes.values(),
diff --git a/debian/patches/02_spelling.dpatch b/debian/patches/02_spelling.patch
similarity index 68%
rename from debian/patches/02_spelling.dpatch
rename to debian/patches/02_spelling.patch
index fb0e32c..4825b80 100644
--- a/debian/patches/02_spelling.dpatch
+++ b/debian/patches/02_spelling.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_spelling.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Spelling correction.
+From: <[email protected]>
+Subject: Spelling correction.
-@DPATCH@
--- cvs-syncmail/doc/syncmail.1 2005-08-05 14:09:05.274788944 -0400
+++ cvs-syncmail/doc/syncmail.1 2005-08-05 14:09:29.578094280 -0400
diff --git a/debian/patches/03_dir_issues.dpatch b/debian/patches/03_dir_issues.patch
similarity index 91%
rename from debian/patches/03_dir_issues.dpatch
rename to debian/patches/03_dir_issues.patch
index 3dbcd28..970c34c 100644
--- a/debian/patches/03_dir_issues.dpatch
+++ b/debian/patches/03_dir_issues.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_dir_issues.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correction on issues with directories
+From: <[email protected]>
+Subject: Correction on issues with directories
-@DPATCH@
--- cvs-syncmail/syncmail 2005-08-05 13:30:47.042173408 -0400
+++ cvs-syncmail/syncmail 2005-08-05 16:38:19.021653120 -0400
diff --git a/debian/patches/04_man_page.dpatch b/debian/patches/04_man_page.patch
similarity index 97%
rename from debian/patches/04_man_page.dpatch
rename to debian/patches/04_man_page.patch
index 00d6926..f1fae41 100644
--- a/debian/patches/04_man_page.dpatch
+++ b/debian/patches/04_man_page.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_man_page.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Corrects lintian infos on the man page
-## DP: Changes - to \- or \(hy depending on use
+From: <[email protected]>
+Subject: Corrects lintian infos on the man page
+Changes - to - or (hy depending on use
-@DPATCH@
--- cvs-syncmail/doc/syncmail.1 2005-08-09 09:41:27.076546440 -0400
+++ cvs-syncmail/doc/syncmail.1 2005-08-09 10:16:44.115707568 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0a1b880
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_encoding.patch
+02_spelling.patch
+03_dir_issues.patch
+04_man_page.patch
diff --git a/debian/rules b/debian/rules
index 932bbfb..bf2c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,11 @@
#!/usr/bin/make -f
-export DH_COMPAT=3
-
-# Include magic dpatch stuff to give us
-# patch and depatch targets
-include /usr/share/dpatch/dpatch.make
-
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
touch configure-stamp
@@ -23,7 +17,7 @@ build-stamp: configure-stamp
#/usr/bin/docbook-to-man debian/syncmail.sgml > syncmail.1
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
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
--- End Message ---
