Package: tpp
Severity: wishlist
Tags: patch
Hi Nico,
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.
Thanks,
Jari
[*] 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>.
>From b61e110930321ad0b2ae09890a359d8c531aeb23 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 20 Apr 2012 12:43:25 +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 | 11 +++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/copyright | 2 +-
debian/patches/{make.dpatch => 00-make.patch} | 8 ++------
debian/patches/00list | 2 --
debian/patches/{man.dpatch => 05-man.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 15 ++++++++++-----
debian/source/format | 1 +
debian/watch | 2 ++
11 files changed, 35 insertions(+), 24 deletions(-)
rename debian/patches/{make.dpatch => 00-make.patch} (69%)
delete mode 100644 debian/patches/00list
rename debian/patches/{man.dpatch => 05-man.patch} (90%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
create mode 100644 debian/watch
diff --git a/debian/changelog b/debian/changelog
index f9f7e07..9b78d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tpp (1.3.1-3) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch, build-indep, binary-arch targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix debian-watch-file-is-missing (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 20 Apr 2012 12:42:08 +0300
+
tpp (1.3.1-2) unstable; urgency=low
* Make use of the new Homepage control field instead of the tag.
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 fc548d1..691770f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: tpp
Section: graphics
Priority: optional
Maintainer: Nico Golde <n...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch (>=1.11)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.ngolde.de/tpp/
Package: tpp
Architecture: all
-Depends: ruby (>=1.8.0-1), libncurses-ruby1.8
+Depends: ${misc:Depends}, ruby (>=1.8.0-1), libncurses-ruby1.8
Suggests: figlet, texpower
Description: text presentation program
Tpp stands for text presentation program and is an ncurses-based presentation
diff --git a/debian/copyright b/debian/copyright
index bbaac88..a686932 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,4 +22,4 @@ This software is copyrighted (c) 2004,2005,2007 by Nico Golde and Andreas Krennm
MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/make.dpatch b/debian/patches/00-make.patch
similarity index 69%
rename from debian/patches/make.dpatch
rename to debian/patches/00-make.patch
index 0e7289e..241cad6 100644
--- a/debian/patches/make.dpatch
+++ b/debian/patches/00-make.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## make.dpatch by Nico Golde <n...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Nico Golde <n...@debian.org>
+Subject: Adjust documention file install
-@DPATCH@
diff -urNad tpp-1.3.1~/Makefile tpp-1.3.1/Makefile
--- tpp-1.3.1~/Makefile 2005-06-12 13:37:20.000000000 +0200
+++ tpp-1.3.1/Makefile 2007-04-23 11:24:33.000000000 +0200
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 15c9426..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-make
-man
diff --git a/debian/patches/man.dpatch b/debian/patches/05-man.patch
similarity index 90%
rename from debian/patches/man.dpatch
rename to debian/patches/05-man.patch
index f56593e..0968629 100644
--- a/debian/patches/man.dpatch
+++ b/debian/patches/05-man.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## man.dpatch by Nico Golde <n...@ngolde.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Nico Golde <n...@ngolde.de>
+Subject: Fix hyphens in manual page
-@DPATCH@
diff -urNad tpp-1.3.1~/doc/tpp.1 tpp-1.3.1/doc/tpp.1
--- tpp-1.3.1~/doc/tpp.1 2007-04-23 11:12:21.000000000 +0200
+++ tpp-1.3.1/doc/tpp.1 2007-12-11 08:41:23.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..997a0b4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+00-make.patch
+05-man.patch
diff --git a/debian/rules b/debian/rules
index bc591e2..4a5c902 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,21 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
configure-stamp:
dh_testdir
touch configure-stamp
-build: build-stamp patch
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp: configure-stamp
dh_testdir
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -22,10 +25,12 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install prefix=$(CURDIR)/debian/tpp/usr
+binary-arch:
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
@@ -43,4 +48,4 @@ binary-indep: build install
dh_builddeb
binary: binary-indep
-.PHONY: build clean binary-indep binary install configure patch unpatch
+.PHONY: build clean binary-indep binary install configure
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/debian/watch b/debian/watch
new file mode 100644
index 0000000..3ef482d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.ngolde.de/tpp.html .*tpp-([\d.]+).tar.gz
--
1.7.9.5
