--- Begin Message ---
Package: xtermset
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 436e56c849c47abc7861b25b0380bc4142be6d82 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Mon, 27 Feb 2012 02:56:21 -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/README.source | 6 ------
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...> 01-fix-wrong-use-of-hyphens-in-manpage.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
9 files changed, 17 insertions(+), 19 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-fix-wrong-use-of-hyphens-in-manpage.dpatch => 01-fix-wrong-use-of-hyphens-in-manpage.patch} (92%)
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 7f7837a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-Further information can be found here (with the dpatch package installed):
-/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index 4c8cd95..5df7d1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xtermset (0.5.2-5) 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.aalto@cante.net> Mon, 27 Feb 2012 02:54:01 -0500
+
xtermset (0.5.2-4) unstable; urgency=low
* Orphan this package
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 9b3af91..fe15bb4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: xtermset
Section: x11
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 5), autoconf, automake, dpatch
+Build-Depends: debhelper (>= 9), autoconf, automake
Homepage: http://www.bje.nu/apps/xtermset/
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/xtermset/trunk
Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/xtermset
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
Package: xtermset
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0c5cd58..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-fix-wrong-use-of-hyphens-in-manpage
diff --git a/debian/patches/01-fix-wrong-use-of-hyphens-in-manpage.dpatch b/debian/patches/01-fix-wrong-use-of-hyphens-in-manpage.patch
similarity index 92%
rename from debian/patches/01-fix-wrong-use-of-hyphens-in-manpage.dpatch
rename to debian/patches/01-fix-wrong-use-of-hyphens-in-manpage.patch
index 9309260..f6a13ef 100644
--- a/debian/patches/01-fix-wrong-use-of-hyphens-in-manpage.dpatch
+++ b/debian/patches/01-fix-wrong-use-of-hyphens-in-manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-fix-wrong-use-of-hyphens-in-manpage.dpatch by Patrick Schoenfeld
-## <schoenfeld@in-medias-res.com>
-##
-## DP: Fix wrong use of hyphens in the manpage
+From: Patrick Schoenfeld
+Subject: Fix wrong use of hyphens in the manpage
-@DPATCH@
diff -urNad xtermset-0.5.2~/doc/xtermset.1 xtermset-0.5.2/doc/xtermset.1
--- xtermset-0.5.2~/doc/xtermset.1 2000-12-20 16:53:52.000000000 +0100
+++ xtermset-0.5.2/doc/xtermset.1 2008-02-25 15:12:42.613308808 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e5ba41d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix-wrong-use-of-hyphens-in-manpage.patch
diff --git a/debian/rules b/debian/rules
index b7aee99..2feb8b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -37,7 +36,7 @@ config.status: configure
build: build-stamp
-build-stamp: patch config.status
+build-stamp: config.status
dh_testdir
$(MAKE)
touch $@
@@ -67,7 +66,7 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-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 ---
--- Begin Message ---
Source: xtermset
Source-Version: 0.5.2-5
We believe that the bug you reported is fixed in the latest version of
xtermset, which is due to be installed in the Debian FTP archive:
xtermset_0.5.2-5.debian.tar.gz
to main/x/xtermset/xtermset_0.5.2-5.debian.tar.gz
xtermset_0.5.2-5.dsc
to main/x/xtermset/xtermset_0.5.2-5.dsc
xtermset_0.5.2-5_amd64.deb
to main/x/xtermset/xtermset_0.5.2-5_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 664321@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jari Aalto <jari.aalto@cante.net> (supplier of updated xtermset package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 28 Mar 2012 22:14:13 +0300
Source: xtermset
Binary: xtermset
Architecture: source amd64
Version: 0.5.2-5
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Jari Aalto <jari.aalto@cante.net>
Description:
xtermset - change the characteristics of an xterm
Closes: 664321
Changes:
xtermset (0.5.2-5) unstable; urgency=low
.
* QA upload.
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
(Closes: #664321).
* Update to Standards-Version to 3.9.3.1 and debhelper to 9.
* Add missing build-arch, build-indep rules and use dh_prep.
Checksums-Sha1:
678379eb5021ad1e33b10e2f70385174e567e031 1229 xtermset_0.5.2-5.dsc
d8dff06494ab38f2bc8cd57a2754fca1f2296b7f 4617 xtermset_0.5.2-5.debian.tar.gz
348057e6b56e5d7de8ebdb456bdf318291ce27da 12132 xtermset_0.5.2-5_amd64.deb
Checksums-Sha256:
cf3137235de9278687d0dc095601a4932ef96b0ace3a0990b3addf8f0aa50b6c 1229 xtermset_0.5.2-5.dsc
afaf62f3844ea26f3992a11f406288b566b323cbcac73eee2c148266127c1f1b 4617 xtermset_0.5.2-5.debian.tar.gz
59452d2189c2e5934f9c995a3eb91d2c719f8ea7a8be89778212497e2d9b7d35 12132 xtermset_0.5.2-5_amd64.deb
Files:
59620dd6b8b48bf8a8f47cba072e8c1d 1229 x11 optional xtermset_0.5.2-5.dsc
677b57519c5c8a14bfb528ce3b7621d3 4617 x11 optional xtermset_0.5.2-5.debian.tar.gz
69d28225279887e8ede3c58362f7581b 12132 x11 optional xtermset_0.5.2-5_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk+H/FkACgkQLARVQsm1XayXOwCgu/HBBvaHfEMg/84e50CA15J1
KkIAn0Y3dC3ecR/R8i5BUGJQ/T6SWSSK
=Vf/v
-----END PGP SIGNATURE-----
--- End Message ---