Package: setserial
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 7d5ded517991c1b8ffc00ad11e8ea981a51b548f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 26 Feb 2012 18:05:47 -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/README.source | 6 ------
debian/changelog | 12 ++++++++----
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 17 -----------------
.../{01_makefile.dpatch => 01_makefile.patch} | 5 ++---
...pcmcia_readme.dpatch => 04_pcmcia_readme.patch} | 5 ++---
...mcia_cardctl.dpatch => 05_pcmcia_cardctl.patch} | 5 ++---
...dctl_out.dpatch => 06_pcmcia_cardctl_out.patch} | 5 ++---
...un_stab.dpatch => 07_pcmcia_var_run_stab.patch} | 5 ++---
.../{08_pcmcia_c.dpatch => 08_pcmcia_c.patch} | 5 ++---
...pcmcia_repair.dpatch => 09_pcmcia_repair.patch} | 5 ++---
..._setserial.dpatch => 10_rc_etc_setserial.patch} | 5 ++---
.../{11_rc_serial.dpatch => 11_rc_serial.patch} | 5 ++---
..._serial_m68k.dpatch => 12_rc_serial_m68k.patch} | 5 ++---
...upstream.dpatch => 13_rc_serial_upstream.patch} | 5 ++---
.../{14_safety_h.dpatch => 14_safety_h.patch} | 5 ++---
...{15_serial_conf.dpatch => 15_serial_conf.patch} | 5 ++---
...onf_sparc.dpatch => 16_serial_conf_sparc.patch} | 5 ++---
...tserial_8_in.dpatch => 17_setserial_8_in.patch} | 5 ++---
...{18_setserial_c.dpatch => 18_setserial_c.patch} | 5 ++---
.../{19_version_h.dpatch => 19_version_h.patch} | 5 ++---
debian/patches/series | 17 +++++++++++++++++
debian/rules | 5 ++---
debian/source/format | 1 +
25 files changed, 65 insertions(+), 84 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_makefile.dpatch => 01_makefile.patch} (86%)
rename debian/patches/{04_pcmcia_readme.dpatch => 04_pcmcia_readme.patch} (83%)
rename debian/patches/{05_pcmcia_cardctl.dpatch => 05_pcmcia_cardctl.patch} (76%)
rename debian/patches/{06_pcmcia_cardctl_out.dpatch => 06_pcmcia_cardctl_out.patch} (90%)
rename debian/patches/{07_pcmcia_var_run_stab.dpatch => 07_pcmcia_var_run_stab.patch} (78%)
rename debian/patches/{08_pcmcia_c.dpatch => 08_pcmcia_c.patch} (98%)
rename debian/patches/{09_pcmcia_repair.dpatch => 09_pcmcia_repair.patch} (96%)
rename debian/patches/{10_rc_etc_setserial.dpatch => 10_rc_etc_setserial.patch} (96%)
rename debian/patches/{11_rc_serial.dpatch => 11_rc_serial.patch} (98%)
rename debian/patches/{12_rc_serial_m68k.dpatch => 12_rc_serial_m68k.patch} (95%)
rename debian/patches/{13_rc_serial_upstream.dpatch => 13_rc_serial_upstream.patch} (97%)
rename debian/patches/{14_safety_h.dpatch => 14_safety_h.patch} (93%)
rename debian/patches/{15_serial_conf.dpatch => 15_serial_conf.patch} (88%)
rename debian/patches/{16_serial_conf_sparc.dpatch => 16_serial_conf_sparc.patch} (97%)
rename debian/patches/{17_setserial_8_in.dpatch => 17_setserial_8_in.patch} (98%)
rename debian/patches/{18_setserial_c.dpatch => 18_setserial_c.patch} (98%)
rename debian/patches/{19_version_h.dpatch => 19_version_h.patch} (85%)
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 c5bf4ab..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-setserial
---------
-
-This package contains some patches to work on debian.
-
-See /usr/share/doc/dpatch/README.source.gz for mor information.
diff --git a/debian/changelog b/debian/changelog
index 6a415d4..5c5e39a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+setserial (2.17-47) unstable; urgency=low
+
+ * QA 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 <jari.aa...@cante.net> Sun, 26 Feb 2012 17:50:00 -0500
+
setserial (2.17-46) unstable; urgency=low
* Added README.source
@@ -1084,7 +1092,3 @@ setserial (2.10-1) unstable; urgency=low
* Initial Release.
-- Gordon Russell <g.russ...@dcs.napier.ac.uk> Wed, 22 Jan 1997 11:22:25 +0000
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 0b14968..3696c90 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: setserial
Section: comm
Priority: extra
Maintainer: Debian QA Group <packa...@qa.debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, po-debconf, dpatch
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev, po-debconf
+Standards-Version: 3.9.3
Package: setserial
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5128f48..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,17 +0,0 @@
-01_makefile.dpatch
-04_pcmcia_readme.dpatch
-05_pcmcia_cardctl.dpatch
-06_pcmcia_cardctl_out.dpatch
-07_pcmcia_var_run_stab.dpatch
-08_pcmcia_c.dpatch
-09_pcmcia_repair.dpatch
-10_rc_etc_setserial.dpatch
-11_rc_serial.dpatch
-12_rc_serial_m68k.dpatch
-13_rc_serial_upstream.dpatch
-14_safety_h.dpatch
-15_serial_conf.dpatch
-16_serial_conf_sparc.dpatch
-17_setserial_8_in.dpatch
-18_setserial_c.dpatch
-19_version_h.dpatch
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.patch
similarity index 86%
rename from debian/patches/01_makefile.dpatch
rename to debian/patches/01_makefile.patch
index f88a15e..12eb859 100644
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial Makefile patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial Makefile patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/Makefile.in setserial-2.17/Makefile.in
--- setserial-2.17.orig/Makefile.in 2008-09-26 21:59:11.000000000 +0000
diff --git a/debian/patches/04_pcmcia_readme.dpatch b/debian/patches/04_pcmcia_readme.patch
similarity index 83%
rename from debian/patches/04_pcmcia_readme.dpatch
rename to debian/patches/04_pcmcia_readme.patch
index f468895..16e4dc4 100644
--- a/debian/patches/04_pcmcia_readme.dpatch
+++ b/debian/patches/04_pcmcia_readme.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial pcmcia README patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial pcmcia README patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/pcmcia/README setserial-2.17/pcmcia/README
--- setserial-2.17.orig/pcmcia/README 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/05_pcmcia_cardctl.dpatch b/debian/patches/05_pcmcia_cardctl.patch
similarity index 76%
rename from debian/patches/05_pcmcia_cardctl.dpatch
rename to debian/patches/05_pcmcia_cardctl.patch
index 52e236a..b39d532 100644
--- a/debian/patches/05_pcmcia_cardctl.dpatch
+++ b/debian/patches/05_pcmcia_cardctl.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial pcmcia cardctl patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial pcmcia cardctl patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/pcmcia/cardctl setserial-2.17/pcmcia/cardctl
--- setserial-2.17.orig/pcmcia/cardctl 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/06_pcmcia_cardctl_out.dpatch b/debian/patches/06_pcmcia_cardctl_out.patch
similarity index 90%
rename from debian/patches/06_pcmcia_cardctl_out.dpatch
rename to debian/patches/06_pcmcia_cardctl_out.patch
index 9268db7..a062db8 100644
--- a/debian/patches/06_pcmcia_cardctl_out.dpatch
+++ b/debian/patches/06_pcmcia_cardctl_out.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial pcmcia cardctl.out patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial pcmcia cardctl.out patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/pcmcia/cardctl.out setserial-2.17/pcmcia/cardctl.out
--- setserial-2.17.orig/pcmcia/cardctl.out 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/07_pcmcia_var_run_stab.dpatch b/debian/patches/07_pcmcia_var_run_stab.patch
similarity index 78%
rename from debian/patches/07_pcmcia_var_run_stab.dpatch
rename to debian/patches/07_pcmcia_var_run_stab.patch
index 8cd7d11..908774a 100644
--- a/debian/patches/07_pcmcia_var_run_stab.dpatch
+++ b/debian/patches/07_pcmcia_var_run_stab.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial pcmcia var_run_stab patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial pcmcia var_run_stab patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/pcmcia/var_run_stab setserial-2.17/pcmcia/var_run_stab
--- setserial-2.17.orig/pcmcia/var_run_stab 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/08_pcmcia_c.dpatch b/debian/patches/08_pcmcia_c.patch
similarity index 98%
rename from debian/patches/08_pcmcia_c.dpatch
rename to debian/patches/08_pcmcia_c.patch
index b54e573..06488ea 100644
--- a/debian/patches/08_pcmcia_c.dpatch
+++ b/debian/patches/08_pcmcia_c.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial pcmcia.c patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial pcmcia.c patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/pcmcia.c setserial-2.17/pcmcia.c
--- setserial-2.17.orig/pcmcia.c 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/09_pcmcia_repair.dpatch b/debian/patches/09_pcmcia_repair.patch
similarity index 96%
rename from debian/patches/09_pcmcia_repair.dpatch
rename to debian/patches/09_pcmcia_repair.patch
index cb5b0cd..2ef5515 100644
--- a/debian/patches/09_pcmcia_repair.dpatch
+++ b/debian/patches/09_pcmcia_repair.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial pcmcia.repair patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial pcmcia.repair patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/pcmcia.repair setserial-2.17/pcmcia.repair
--- setserial-2.17.orig/pcmcia.repair 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/10_rc_etc_setserial.dpatch b/debian/patches/10_rc_etc_setserial.patch
similarity index 96%
rename from debian/patches/10_rc_etc_setserial.dpatch
rename to debian/patches/10_rc_etc_setserial.patch
index 5c807d8..afa6007 100644
--- a/debian/patches/10_rc_etc_setserial.dpatch
+++ b/debian/patches/10_rc_etc_setserial.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial rc.etc-serial patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial rc.etc-serial patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/rc.etc-setserial setserial-2.17/rc.etc-setserial
--- setserial-2.17.orig/rc.etc-setserial 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/11_rc_serial.dpatch b/debian/patches/11_rc_serial.patch
similarity index 98%
rename from debian/patches/11_rc_serial.dpatch
rename to debian/patches/11_rc_serial.patch
index a7483bc..b9f63b5 100644
--- a/debian/patches/11_rc_serial.dpatch
+++ b/debian/patches/11_rc_serial.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial rc.serial patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial rc.serial patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/rc.serial setserial-2.17/rc.serial
--- setserial-2.17.orig/rc.serial 2008-09-26 21:59:11.000000000 +0000
diff --git a/debian/patches/12_rc_serial_m68k.dpatch b/debian/patches/12_rc_serial_m68k.patch
similarity index 95%
rename from debian/patches/12_rc_serial_m68k.dpatch
rename to debian/patches/12_rc_serial_m68k.patch
index 5d5a408..9bf31fb 100644
--- a/debian/patches/12_rc_serial_m68k.dpatch
+++ b/debian/patches/12_rc_serial_m68k.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial rc.serial.mk68 patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial rc.serial.mk68 patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/rc.serial.m68k setserial-2.17/rc.serial.m68k
--- setserial-2.17.orig/rc.serial.m68k 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/13_rc_serial_upstream.dpatch b/debian/patches/13_rc_serial_upstream.patch
similarity index 97%
rename from debian/patches/13_rc_serial_upstream.dpatch
rename to debian/patches/13_rc_serial_upstream.patch
index e9d10aa..00f5f78 100644
--- a/debian/patches/13_rc_serial_upstream.dpatch
+++ b/debian/patches/13_rc_serial_upstream.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial rc.serial.upstream patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial rc.serial.upstream patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/rc.serial.upstream setserial-2.17/rc.serial.upstream
--- setserial-2.17.orig/rc.serial.upstream 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/14_safety_h.dpatch b/debian/patches/14_safety_h.patch
similarity index 93%
rename from debian/patches/14_safety_h.dpatch
rename to debian/patches/14_safety_h.patch
index 151ce4b..c861219 100644
--- a/debian/patches/14_safety_h.dpatch
+++ b/debian/patches/14_safety_h.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial safety.h patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial safety.h patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/safety.h setserial-2.17/safety.h
--- setserial-2.17.orig/safety.h 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/15_serial_conf.dpatch b/debian/patches/15_serial_conf.patch
similarity index 88%
rename from debian/patches/15_serial_conf.dpatch
rename to debian/patches/15_serial_conf.patch
index 3aec573..2737291 100644
--- a/debian/patches/15_serial_conf.dpatch
+++ b/debian/patches/15_serial_conf.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial serial.conf patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial serial.conf patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/serial.conf setserial-2.17/serial.conf
--- setserial-2.17.orig/serial.conf 2008-09-26 21:59:11.000000000 +0000
diff --git a/debian/patches/16_serial_conf_sparc.dpatch b/debian/patches/16_serial_conf_sparc.patch
similarity index 97%
rename from debian/patches/16_serial_conf_sparc.dpatch
rename to debian/patches/16_serial_conf_sparc.patch
index 081545c..b73e2d1 100644
--- a/debian/patches/16_serial_conf_sparc.dpatch
+++ b/debian/patches/16_serial_conf_sparc.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial serial.confg.sparc patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial serial.confg.sparc patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/serial.conf.sparc setserial-2.17/serial.conf.sparc
--- setserial-2.17.orig/serial.conf.sparc 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/17_setserial_8_in.dpatch b/debian/patches/17_setserial_8_in.patch
similarity index 98%
rename from debian/patches/17_setserial_8_in.dpatch
rename to debian/patches/17_setserial_8_in.patch
index 5ece51a..d59247a 100644
--- a/debian/patches/17_setserial_8_in.dpatch
+++ b/debian/patches/17_setserial_8_in.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial setserial.8.in patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial setserial.8.in patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/setserial.8.in setserial-2.17/setserial.8.in
--- setserial-2.17.orig/setserial.8.in 2008-09-26 21:59:11.000000000 +0000
diff --git a/debian/patches/18_setserial_c.dpatch b/debian/patches/18_setserial_c.patch
similarity index 98%
rename from debian/patches/18_setserial_c.dpatch
rename to debian/patches/18_setserial_c.patch
index a399794..f1473d8 100644
--- a/debian/patches/18_setserial_c.dpatch
+++ b/debian/patches/18_setserial_c.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial setserial.c patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial setserial.c patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/setserial.c setserial-2.17/setserial.c
--- setserial-2.17.orig/setserial.c 2008-09-26 21:59:11.000000000 +0000
diff --git a/debian/patches/19_version_h.dpatch b/debian/patches/19_version_h.patch
similarity index 85%
rename from debian/patches/19_version_h.dpatch
rename to debian/patches/19_version_h.patch
index 5414ec8..066b04f 100644
--- a/debian/patches/19_version_h.dpatch
+++ b/debian/patches/19_version_h.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## DP: setserial version.h patch
+From: Jonas Genannt <jonas.gena...@capi2name.de>
+Subject: setserial version.h patch
-@DPATCH@
diff -Naurp setserial-2.17.orig/version.h setserial-2.17/version.h
--- setserial-2.17.orig/version.h 2008-09-26 21:59:11.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2286500
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,17 @@
+01_makefile.patch
+04_pcmcia_readme.patch
+05_pcmcia_cardctl.patch
+06_pcmcia_cardctl_out.patch
+07_pcmcia_var_run_stab.patch
+08_pcmcia_c.patch
+09_pcmcia_repair.patch
+10_rc_etc_setserial.patch
+11_rc_serial.patch
+12_rc_serial_m68k.patch
+13_rc_serial_upstream.patch
+14_safety_h.patch
+15_serial_conf.patch
+16_serial_conf_sparc.patch
+17_setserial_8_in.patch
+18_setserial_c.patch
+19_version_h.patch
diff --git a/debian/rules b/debian/rules
index 1e701e2..e2a46ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,12 @@
# Copyright 1994,1995 by Ian Jackson, 1998 Christoph Lameter
# debian/rules for setserial, by Gordon Russell.
-include /usr/share/dpatch/dpatch.make
DESTDIR = $(CURDIR)/debian/setserial
arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
build: stamp-build
-stamp-build: patch-stamp
+stamp-build:
dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -28,7 +27,7 @@ endif
$(MAKE) setserial CFLAGS="-O2"
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f config.sub config.guess
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
