Your message dated Tue, 22 May 2012 11:04:20 +0000
with message-id <[email protected]>
and subject line Bug#669899: fixed in poppass-cgi 3-5.1
has caused the Debian Bug report #669899,
regarding [PATCH] poppass-cgi: Helping to update to packaging format 3.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
669899: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669899
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]>
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 <[email protected]>
---
 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 <[email protected]>  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 <[email protected]>
-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: [email protected]
 
+Copyright holder:
+
+    Copyright (C) 1996 Jerry Workman <[email protected]>
+
 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 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <[email protected]>
+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 <[email protected]>
-##
-## 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 <[email protected]>
+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 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <[email protected]>
+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 <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: martin f. krafft <[email protected]>
+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


--- End Message ---
--- Begin Message ---
Source: poppass-cgi
Source-Version: 3-5.1

We believe that the bug you reported is fixed in the latest version of
poppass-cgi, which is due to be installed in the Debian FTP archive:

poppass-cgi_3-5.1.debian.tar.gz
  to main/p/poppass-cgi/poppass-cgi_3-5.1.debian.tar.gz
poppass-cgi_3-5.1.dsc
  to main/p/poppass-cgi/poppass-cgi_3-5.1.dsc
poppass-cgi_3-5.1_all.deb
  to main/p/poppass-cgi/poppass-cgi_3-5.1_all.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 [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jari Aalto <[email protected]> (supplier of updated poppass-cgi 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 [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Sun, 06 May 2012 09:42:10 +0300
Source: poppass-cgi
Binary: poppass-cgi
Architecture: source all
Version: 3-5.1
Distribution: unstable
Urgency: low
Maintainer: martin f. krafft <[email protected]>
Changed-By: Jari Aalto <[email protected]>
Description: 
 poppass-cgi - CGI script to interact with a poppassd server
Closes: 669899
Changes: 
 poppass-cgi (3-5.1) unstable; urgency=low
 .
   * Non-maintainer upload; ACKed by the maintainer.
   * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
     (Closes: #669899).
   * 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).
Checksums-Sha1: 
 c6cb74ced57b43689a68306870a3f8aa4065c828 1023 poppass-cgi_3-5.1.dsc
 d053152c22586a521556cc76577d7cea5e5dff09 4183 poppass-cgi_3-5.1.debian.tar.gz
 982267bddde23aee70bfc0f9f8677da16bfeb952 6322 poppass-cgi_3-5.1_all.deb
Checksums-Sha256: 
 60a08b7c4916d0b8a173b73931dca1fe13b87f8570b9fa993cd945038fd93b4a 1023 
poppass-cgi_3-5.1.dsc
 2a4ed76d2cf26d2db6d586a07cfa3126c613fdde6a8eed3baca485874fd9de41 4183 
poppass-cgi_3-5.1.debian.tar.gz
 1fa6b77c757ef6999fa550f7d649084048df28f991455285cd585d4d43f5a1a0 6322 
poppass-cgi_3-5.1_all.deb
Files: 
 e7d769932762269441a0dbf05ec1fc03 1023 web optional poppass-cgi_3-5.1.dsc
 381788fc242b05b02e2f2a809fe6aa77 4183 web optional 
poppass-cgi_3-5.1.debian.tar.gz
 b3a8b30e1853304c44848ca087e764f9 6322 web optional poppass-cgi_3-5.1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk+7bnIACgkQLARVQsm1XaxxigCguqlkjB3MUPGikDayPmjRVf5R
DvQAoLNIxd6NXkcdOAW9jByqJZmlnrAL
=zi0G
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to