Package: bld
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 086ee4d3169e089cacc76dedc942649eafd814d6 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 21 Apr 2012 15:36:51 +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/README.source | 38 --------------------
debian/changelog | 10 ++++++
debian/compat | 2 +-
debian/control | 10 +++---
debian/patches/00list | 3 --
...ump.dpatch => 01-fix-potential-core-dump.patch} | 8 ++---
.../{02-fix_strip.dpatch => 02-fix-strip.patch} | 8 ++---
...03-remove-extensions-from-README.postfix.patch} | 8 ++---
debian/patches/series | 3 ++
debian/rules | 20 ++++-------
debian/source/format | 1 +
11 files changed, 32 insertions(+), 79 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01-fix_potential_core_dump.dpatch => 01-fix-potential-core-dump.patch} (66%)
rename debian/patches/{02-fix_strip.dpatch => 02-fix-strip.patch} (80%)
rename debian/patches/{03-remove_extensions_from_README.postfix.dpatch => 03-remove-extensions-from-README.postfix.patch} (89%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index fc98b3d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
----
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index 3205a98..7ece671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+bld (0.3.4.1-4.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 required build-arch and build-indep targets to rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <[email protected]> Sat, 21 Apr 2012 15:34:59 +0300
+
bld (0.3.4.1-4) unstable; urgency=low
[ SevenMachines ]
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 482eb9c..9aa04ec 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: bld
Section: admin
Priority: optional
Maintainer: Martin Meredith <[email protected]>
-Build-Depends: debhelper (>= 7.0.0), dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://bld.r14.freenix.org/
Package: bld
Architecture: any
-Depends: ${shlibs:Depends}, adduser
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
Suggests: bld-tools, bld-postfix
Description: Black List Daemon, automatically build blacklists
BLD stands for "black list daemon" and is intended to build blacklists
@@ -24,7 +24,7 @@ Description: Black List Daemon, automatically build blacklists
Package: bld-postfix
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, postfix
+Depends: ${misc:Depends}, ${shlibs:Depends}, postfix
Recommends: bld (= ${source:Version})
Description: Postfix tools for the Black List Daemon
BLD stands for "black list daemon" and is intended to build blacklists
@@ -39,7 +39,7 @@ Description: Postfix tools for the Black List Daemon
Package: bld-tools
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: bld (= ${source:Version})
Description: Generic tools for Black List Daemon
BLD stands for "black list daemon" and is intended to build blacklists
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1ab8c9f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01-fix_potential_core_dump
-02-fix_strip
-03-remove_extensions_from_README.postfix
diff --git a/debian/patches/01-fix_potential_core_dump.dpatch b/debian/patches/01-fix-potential-core-dump.patch
similarity index 66%
rename from debian/patches/01-fix_potential_core_dump.dpatch
rename to debian/patches/01-fix-potential-core-dump.patch
index a692168..f33479a 100644
--- a/debian/patches/01-fix_potential_core_dump.dpatch
+++ b/debian/patches/01-fix-potential-core-dump.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-fix_potential_core_dump.dpatch by Oleg Milaenko <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix Potential Core dump
+From: Oleg Milaenko <[email protected]>
+Subject: Fix Potential Core dump
-@DPATCH@
diff -urNad bld-0.3.4.1~/postfix_policy.c bld-0.3.4.1/postfix_policy.c
--- bld-0.3.4.1~/postfix_policy.c 2009-02-14 12:40:19.000000000 +0000
+++ bld-0.3.4.1/postfix_policy.c 2009-02-14 12:54:29.000000000 +0000
diff --git a/debian/patches/02-fix_strip.dpatch b/debian/patches/02-fix-strip.patch
similarity index 80%
rename from debian/patches/02-fix_strip.dpatch
rename to debian/patches/02-fix-strip.patch
index 9fb158d..c9080cc 100644
--- a/debian/patches/02-fix_strip.dpatch
+++ b/debian/patches/02-fix-strip.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-fix_strip.dpatch by Martin Meredith <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes stripping lines from the Makefile.in.
+From: Martin Meredith <[email protected]>
+Subject: Removes stripping lines from the Makefile.in.
-@DPATCH@
diff -urNad bld-0.3.4.1~/Makefile.in bld-0.3.4.1/Makefile.in
--- bld-0.3.4.1~/Makefile.in 2008-07-02 23:48:11.000000000 +0100
+++ bld-0.3.4.1/Makefile.in 2009-02-14 12:47:29.000000000 +0000
diff --git a/debian/patches/03-remove_extensions_from_README.postfix.dpatch b/debian/patches/03-remove-extensions-from-README.postfix.patch
similarity index 89%
rename from debian/patches/03-remove_extensions_from_README.postfix.dpatch
rename to debian/patches/03-remove-extensions-from-README.postfix.patch
index 12fd1fd..9b05e6e 100644
--- a/debian/patches/03-remove_extensions_from_README.postfix.dpatch
+++ b/debian/patches/03-remove-extensions-from-README.postfix.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-remove_extensions_from_README.postfix.dpatch by Martin Meredith <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes the .pl extensions from README.postfix.
+From: Martin Meredith <[email protected]>
+Subject: Removes the .pl extensions from README.postfix.
-@DPATCH@
diff -urNad bld-0.3.4.1~/README.postfix bld-0.3.4.1/README.postfix
--- bld-0.3.4.1~/README.postfix 2008-07-02 23:49:44.000000000 +0100
+++ bld-0.3.4.1/README.postfix 2009-02-14 13:16:12.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a93c4ae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-fix-potential-core-dump.patch
+02-fix-strip.patch
+03-remove-extensions-from-README.postfix.patch
diff --git a/debian/rules b/debian/rules
index 7d40aae..2c0847b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,14 @@ else
CFLAGS += -O2
endif
-config.status: patch configure
+config.status: configure
dh_testdir
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc/bld
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: config.status
@@ -22,8 +26,7 @@ build-stamp: config.status
$(MAKE)
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -78,16 +81,5 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all > patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
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
