Package: poppass-cgi
Severity: wishlist
Tags: patch
Hi Martin,
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 c8026b19f7a7c52809c2331488dc3e28b4957183 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 22:19:10 +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 | 8 ++++----
debian/copyright | 4 ++++
debian/patches/00list | 4 ----
...perl-location.dpatch => 10-perl-location.patch} | 8 ++------
...es.dpatch => 70-ignore-textual-responses.patch} | 8 ++------
...name.dpatch => 70-use-http-auth-username.patch} | 8 ++------
.../{99-debug-fix.dpatch => 99-debug-fix.patch} | 8 ++------
debian/patches/Makefile | 4 ----
debian/patches/series | 4 ++++
debian/rules | 15 +++++++--------
debian/source/format | 1 +
13 files changed, 40 insertions(+), 45 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{10-perl-location.dpatch => 10-perl-location.patch} (62%)
rename debian/patches/{70-ignore-textual-responses.dpatch => 70-ignore-textual-responses.patch} (83%)
rename debian/patches/{70-use-http-auth-username.dpatch => 70-use-http-auth-username.patch} (87%)
rename debian/patches/{99-debug-fix.dpatch => 99-debug-fix.patch} (65%)
delete mode 100644 debian/patches/Makefile
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index ca16142..ac1b502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+poppass-cgi (3-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 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 22:08:30 +0300
+
poppass-cgi (3-5) unstable; urgency=low
* Patch from Joost Cassee to populate the username from HTTP basic
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 b1e8fea..f815b69 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: poppass-cgi
Section: web
Priority: optional
Maintainer: martin f. krafft <madd...@debian.org>
-Build-Depends: debhelper (>> 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: poppass-cgi
Architecture: all
-Depends: perl, libcgi-pm-perl, libwww-perl
-Description: a CGI script to interact with a poppassd server
+Depends: ${misc:Depends}, perl, libcgi-pm-perl, libwww-perl
+Description: CGI script to interact with a poppassd server
poppass is a CGI script written to allow users to change their passwords
through the web. It interacts with a poppassd server (see the poppassd Debian
package) and does no changing itself. It can therefore be installed in an
diff --git a/debian/copyright b/debian/copyright
index d1cbe34..8e09d84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,10 @@ It was downloaded from ftp://ftp.mtnsoft.com/poppass
Upstream Author: je...@mtnsoft.com
+Copyright holder:
+
+ Copyright (C) 1996 Jerry Workman <je...@mtnsoft.com>
+
Copyright:
This program is free software; you can redistribute it and/or modify it
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 82933e1..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-10-perl-location
-70-ignore-textual-responses
-70-use-http-auth-username
-99-debug-fix
diff --git a/debian/patches/10-perl-location.dpatch b/debian/patches/10-perl-location.patch
similarity index 62%
rename from debian/patches/10-perl-location.dpatch
rename to debian/patches/10-perl-location.patch
index fc4ce6d..ada8eca 100644
--- a/debian/patches/10-perl-location.dpatch
+++ b/debian/patches/10-perl-location.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-perl-location.dpatch by martin f. krafft <madd...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <madd...@debian.org>
+Subject: Fix shebang line
-@DPATCH@
diff -urNad trunk~/poppass trunk/poppass
--- trunk~/poppass 2000-01-19 18:58:45.000000000 +0100
+++ trunk/poppass 2006-07-12 01:06:43.646833105 +0200
diff --git a/debian/patches/70-ignore-textual-responses.dpatch b/debian/patches/70-ignore-textual-responses.patch
similarity index 83%
rename from debian/patches/70-ignore-textual-responses.dpatch
rename to debian/patches/70-ignore-textual-responses.patch
index 219e093..642c333 100644
--- a/debian/patches/70-ignore-textual-responses.dpatch
+++ b/debian/patches/70-ignore-textual-responses.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70-ignore-textual-responses.dpatch by martin f. krafft <madd...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Only respect numeric responses from pop server (Bug#445002)
+From: martin f. krafft <madd...@debian.org>
+Subject: Only respect numeric responses from pop server (Bug#445002)
-@DPATCH@
diff -urNad trunk~/poppass trunk/poppass
--- trunk~/poppass 2007-10-06 13:06:21.000000000 +0100
+++ trunk/poppass 2007-10-06 13:06:54.000000000 +0100
diff --git a/debian/patches/70-use-http-auth-username.dpatch b/debian/patches/70-use-http-auth-username.patch
similarity index 87%
rename from debian/patches/70-use-http-auth-username.dpatch
rename to debian/patches/70-use-http-auth-username.patch
index 7901922..f4ce1bd 100644
--- a/debian/patches/70-use-http-auth-username.dpatch
+++ b/debian/patches/70-use-http-auth-username.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70-use-http-auth-username.dpatch by martin f. krafft <madd...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <madd...@debian.org>
+Subject: HTTP AUTH support
-@DPATCH@
diff -urNad trunk~/poppass trunk/poppass
--- trunk~/poppass 2007-10-06 13:06:21.000000000 +0100
+++ trunk/poppass 2007-10-06 13:16:45.000000000 +0100
diff --git a/debian/patches/99-debug-fix.dpatch b/debian/patches/99-debug-fix.patch
similarity index 65%
rename from debian/patches/99-debug-fix.dpatch
rename to debian/patches/99-debug-fix.patch
index a408b8d..677ef1a 100644
--- a/debian/patches/99-debug-fix.dpatch
+++ b/debian/patches/99-debug-fix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-debug-fix.dpatch by martin f. krafft <madd...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <madd...@debian.org>
+Subject: Correct debugging function call
-@DPATCH@
diff -urNad trunk~/poppass trunk/poppass
--- trunk~/poppass 2000-01-19 18:58:45.000000000 +0100
+++ trunk/poppass 2006-07-12 01:07:09.194638141 +0200
diff --git a/debian/patches/Makefile b/debian/patches/Makefile
deleted file mode 100644
index 4e8ee11..0000000
--- a/debian/patches/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: 00list
-00list:
- find . -maxdepth 1 -name Makefile -prune -o -name 00list -prune -o -type f -print \
- | sed -ne 's,\./\(.*\)\.dpatch,\1,p' | sort -n > $@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b91c428
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+10-perl-location.patch
+70-ignore-textual-responses.patch
+70-use-http-auth-username.patch
+99-debug-fix.patch
diff --git a/debian/rules b/debian/rules
index a2ed66e..dac7d11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,31 +3,30 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
configure: configure-stamp
configure-stamp:
dh_testdir
- $(MAKE) -C debian/patches
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: configure-stamp patch
+build-stamp: configure-stamp
dh_testdir
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- $(MAKE) -C debian/patches
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install -o root -g root -m 0755 poppass $(CURDIR)/debian/poppass-cgi/usr/lib/cgi-bin
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.5
