--- Begin Message ---
Package: mt-st
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 81329265e643cf0bdd062733bec145a0995a9c04 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Mon, 27 Feb 2012 04:01:13 -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.aalto@cante.net>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
...trip.dpatch => 13upstream_shouldnt_strip.patch} | 9 +++------
...cc_warnings.dpatch => 15fix_gcc_warnings.patch} | 9 +++------
debian/patches/series | 2 ++
debian/rules | 2 --
debian/source/format | 1 +
9 files changed, 20 insertions(+), 19 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{13upstream_shouldnt_strip.dpatch => 13upstream_shouldnt_strip.patch} (74%)
rename debian/patches/{15fix_gcc_warnings.dpatch => 15fix_gcc_warnings.patch} (89%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index b0c8c00..b58f649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mt-st (1.1-4.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.
+
+ -- Jari Aalto <jari.aalto@cante.net> Mon, 27 Feb 2012 03:57:28 -0500
+
mt-st (1.1-4) unstable; urgency=low
* Add ".conf" suffix to modprobe.d snippet. Closes: #518245.
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 d3c22b6..152376d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: mt-st
Section: admin
Priority: extra
Maintainer: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
-Build-Depends: debhelper (>= 7.2.2), dpatch
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: mt-st
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7a73749..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-13upstream_shouldnt_strip
-15fix_gcc_warnings
diff --git a/debian/patches/13upstream_shouldnt_strip.dpatch b/debian/patches/13upstream_shouldnt_strip.patch
similarity index 74%
rename from debian/patches/13upstream_shouldnt_strip.dpatch
rename to debian/patches/13upstream_shouldnt_strip.patch
index aef4300..b131396 100644
--- a/debian/patches/13upstream_shouldnt_strip.dpatch
+++ b/debian/patches/13upstream_shouldnt_strip.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13upstream_shouldnt_strip.dpatch by <hesso@pool.math.tu-berlin.de>
-##
-## DP: Don't let the upstream Makefile do "install -s". Entrust this
-## DP: to debhelper.
+From: Unknown
+Subject: Don't let the upstream Makefile do "install -s".
+ Entrust this to debhelper.
-@DPATCH@
--- mt-st-0.9b.orig/Makefile 2007-08-20 01:18:33.000000000 +0200
+++ mt-st-0.9b/Makefile 2007-08-20 01:18:40.000000000 +0200
@@ -12,11 +12,11 @@
diff --git a/debian/patches/15fix_gcc_warnings.dpatch b/debian/patches/15fix_gcc_warnings.patch
similarity index 89%
rename from debian/patches/15fix_gcc_warnings.dpatch
rename to debian/patches/15fix_gcc_warnings.patch
index b1887cd..19fa39c 100644
--- a/debian/patches/15fix_gcc_warnings.dpatch
+++ b/debian/patches/15fix_gcc_warnings.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15fix_gcc_warnings.dpatch by <hesso@pool.math.tu-berlin.de>
-##
-## DP: Get rid of all those gcc warnings.
-## DP: (stinit.c hunk) buflen is positive in all cases.
+From: Unknown
+Subject: Get rid of all those gcc warnings.
+ (stinit.c hunk) buflen is positive in all cases.
-@DPATCH@
--- mt-st-1.1.orig/mt.c 2008-04-27 18:49:00.000000000 +0200
+++ mt-st-1.1/mt.c 2008-05-24 19:25:04.000000000 +0200
@@ -164,7 +164,7 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0370179
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+13upstream_shouldnt_strip.patch
+15fix_gcc_warnings.patch
diff --git a/debian/rules b/debian/rules
index 61a1d4f..cdd4d42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/-.*$$//')
build: build-stamp
build-stamp:
dh_testdir
- dpatch apply-all
make CFLAGS="-W -Wall -Wno-unused-parameter $(DEBCFLAGS)"
touch build-stamp
@@ -27,7 +26,6 @@ clean:
dh_testdir
rm -f build-stamp
make clean
- dpatch deapply-all
dh_clean
install: build
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 ---