Package: otpw
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 8de5303411481d73da72b8030aabd03a6572db25 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 21 Apr 2012 11:58:38 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 15 +++++++++++++++
debian/compat | 2 +-
debian/control | 10 +++++-----
debian/copyright | 13 ++++++++-----
debian/patches/00list | 1 -
.../{01_pam_otpw_8.dpatch => 01-pam-otpw-8.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 19 ++++++-------------
debian/source/format | 1 +
debian/watch | 8 --------
10 files changed, 39 insertions(+), 39 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_pam_otpw_8.dpatch => 01-pam-otpw-8.patch} (52%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 9837e47..47e821a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+otpw (1.3-2.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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-with-old-dh-make-debian-copyright (Lintian).
+ * Fix binary-control-field-duplicates-source (Lintian).
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix no-homepage-field (Lintian).
+ * Fix debian-watch-contains-dh_make-template (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 21 Apr 2012 11:58:14 +0300
+
otpw (1.3-2) unstable; urgency=low
* Update maintainer address
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 1bdad8f..db7eda7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
Source: otpw
Priority: optional
-Maintainer: Matthew Johnson <[email protected]>
-Build-Depends: debhelper (>= 5), libpam-dev, dpatch
-Standards-Version: 3.7.2
Section: libs
+Maintainer: Matthew Johnson <[email protected]>
+Build-Depends: debhelper (>= 9), libpam-dev
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/otpw
Package: libotpw-dev
Section: libdevel
Architecture: any
-Depends:
+Depends: ${misc:Depends},
Recommends: otpw-bin
Description: OTPW library development files and documentation
OTPW is a one-time password system which is robust against
@@ -19,7 +20,6 @@ Description: OTPW library development files and documentation
programs using OTPW and the documentation of the OTPW system.
Package: libpam-otpw
-Section: libs
Architecture: any
Recommends: otpw-bin
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index 2fe9899..62d0014 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,9 @@ It was downloaded from http://www.cl.cam.ac.uk/~mgk25/download/otpw-1.3.tar.gz
Upstream Author: Markus Kuhn <[email protected]>
-Copyright: 1998--2003 Markus Kuhn (exceptions below).
+Copyright:
+
+Copyright (C) 1998--2003 Markus Kuhn (exceptions below).
License:
@@ -18,13 +20,13 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.
-Full text of the licence can be found in /usr/share/common-licenses/GPL
+Full text of the licence can be found in /usr/share/common-licenses/GPL-2
Upstream has confirmed that all the files distributed in the tarball are
licenced under the GPL.
The files rmd160.c and rmd160.h are written by Antoon Bosselaers and Copyright
-(c) Katholieke Universiteit Leuven 1996. Upstream has confirmed that he has
+(C) Katholieke Universiteit Leuven 1996. Upstream has confirmed that he has
permission to distribute and use these also under the terms of the GNU GPL
version 2 or later as well:
@@ -60,7 +62,8 @@ version 2 or later as well:
> http://www.cl.cam.ac.uk/~mgk25/ || CB3 0FD, Great Britain
>
-The Debian packaging is (C) 2007, Matthew Johnson <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright (C) 2007, Matthew Johnson
+<[email protected]> and is licensed under the GPL, see
+"/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 90219c0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_pam_otpw_8
diff --git a/debian/patches/01_pam_otpw_8.dpatch b/debian/patches/01-pam-otpw-8.patch
similarity index 52%
rename from debian/patches/01_pam_otpw_8.dpatch
rename to debian/patches/01-pam-otpw-8.patch
index 8ffd728..7b69358 100644
--- a/debian/patches/01_pam_otpw_8.dpatch
+++ b/debian/patches/01-pam-otpw-8.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_pam_otpw_8.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch the manpage to the correct section
+From: <[email protected]>
+Subject: Patch the manpage to the correct section
-@DPATCH@
--- a/pam_otpw.8 2007-03-13 10:27:09.979243250 +0000
+++ b/pam_otpw.8.orig 2007-03-13 10:27:02.262761000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..69203ca
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-pam-otpw-8.patch
diff --git a/debian/rules b/debian/rules
index 68cce5a..3d076a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -18,17 +17,11 @@ else
CFLAGS += -O2
endif
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -38,13 +31,13 @@ build-stamp: patch
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) clean
rm -f libotpw.a
dh_clean
@@ -52,7 +45,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp
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
index 0efafd0..14b6c81 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,10 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
http://www.cl.cam.ac.uk/~mgk25/download/otpw-([\.0-9]*)\.tar\.gz
-
--
1.7.9.5
