Package: binclock
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 2daf84d73b1c109f6f91ce46df833f13b3b546d4 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 20 Apr 2012 07:36:19 +0300
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/copyright                                   |    2 +-
 .../patches/{makefile.dpatch => 00-makefile.patch} |    0
 debian/patches/00list                              |    1 -
 debian/patches/series                              |    2 ++
 debian/rules                                       |    2 --
 debian/source/format                               |    1 +
 doc/binclock.1                                     |    2 +-
 10 files changed, 18 insertions(+), 8 deletions(-)
 rename debian/patches/{makefile.dpatch => 00-makefile.patch} (100%)
 delete mode 100644 debian/patches/00list
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 05a3e70..145702f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+binclock (1.5-5.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.
+  * Fix copyright-refers-to-symlink-license (Lintian).
+  * Fix manpage-has-bad-whatis-entry (Lintian) with patch 10.
+
+ -- Jari Aalto <jari.aa...@cante.net>  Fri, 20 Apr 2012 07:33:43 +0300
+
 binclock (1.5-5) unstable; urgency=low
 
   * Bump compat level and debhelper dependency to 7.
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 406c0ef..cc0f8dd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: binclock
 Section: utils
 Priority: optional
 Maintainer: Nico Golde <n...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, dpatch (>= 1.11)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), cdbs
+Standards-Version: 3.9.3
 Homepage: http://www.ngolde.de/binclock.html
 
 Package: binclock
diff --git a/debian/copyright b/debian/copyright
index c1b70ac..70c2b64 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,4 +24,4 @@ License:
    MA 02110-1301, USA.
 
 On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/makefile.dpatch b/debian/patches/00-makefile.patch
similarity index 100%
rename from debian/patches/makefile.dpatch
rename to debian/patches/00-makefile.patch
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f0be4dd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-makefile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ef44fef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-manpage.patch
+00-makefile.patch
diff --git a/debian/rules b/debian/rules
index e424d95..3c7d1d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/dpatch/dpatch.make 
 
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := all 
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)
diff --git a/doc/binclock.1 b/doc/binclock.1
index 7cf08f2..abf560e 100644
--- a/doc/binclock.1
+++ b/doc/binclock.1
@@ -1,6 +1,6 @@
 .TH  BINCLOCK "1" "July 2004" "binclock 1.5" "User Commands"
 .SH NAME
-prints time in binary format
+binclock - prints time in binary format
 .SH SYNOPSIS
 .B binclock 
 [\fIOPTION\fR]...
-- 
1.7.9.5

Reply via email to