Package: php-crypt-gpg
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 19ce45160e918f44d4c193e161f1782a8f9ab13d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 08:55:28 -0500
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     |    9 +++++++++
 debian/control       |    4 ++--
 debian/rules         |   10 ++++------
 debian/source/format |    1 +
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 7d09d0e..6019ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+php-crypt-gpg (1.1.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove deprecated dpatch (not used, no patches) from debian/control
+    and debian/rules and upgrade to packaging format "3.0 quilt".
+  * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net>  Wed, 29 Feb 2012 08:54:27 -0500
+
 php-crypt-gpg (1.1.1-1) unstable; urgency=low
 
   * New upstream source
diff --git a/debian/control b/debian/control
index aee989d..aa9f43d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: php-crypt-gpg
 Section: php
 Priority: optional
 Maintainer: Joey Schulze <j...@infodrom.org>
-Build-Depends: debhelper (>= 5.0), dpatch
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: php-pear
 Vcs-Browser: http://cvs.infodrom.org/php-mail/trunk?cvsroot=debian
 Homepage: http://pear.php.net/package/Crypt_GPG
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 
 Package: php-crypt-gpg
 Architecture: all
diff --git a/debian/rules b/debian/rules
index b074dd3..0d6e31d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,15 +31,13 @@ pear_pkg = Crypt_GPG
 installbin = install -g root -o root -m 755
 installdoc = install -g root -o root -m 644
 
-include /usr/share/dpatch/dpatch.make
 
-build: patch
+build:
 	test -e debian/control
 	touch stamp-build
 
-clean: debclean unpatch
+clean: debclean
 	rm -f $(pear_pkg)/package.xml
-	test -z "$(ls debian/patches/*.dpatch)" || chmod a-x debian/patches/*.dpatch
 	rm -f stamp-build
 
 debclean:
@@ -79,7 +77,7 @@ binary-indep: debclean
 	rm -rf debian/tmp/usr/share/php/data
 	rm -rf debian/tmp/usr/share/php/test
 	rm -rf debian/tmp/usr/share/php/data/Log/misc
-        #
+	#
 	dpkg-gencontrol -isp
 	dpkg --build debian/tmp ..
 
@@ -106,6 +104,6 @@ checkroot:
 
 dist: binary dsc
 
-.PHONY: binary binary-arch binary-indep clean debclean build patch unpatch
+.PHONY: binary binary-arch binary-indep clean debclean build
 
 
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

Reply via email to