Package: libnss-mysql-bg
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 5227ca34c31c78a891877fd849b5dbe4cb36dcd1 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 03:51:35 -0500
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 | 2 --
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 3 ---
...mkinstalldirs.dpatch => 01_mkinstalldirs.patch} | 8 ++------
.../{02_autotools.dpatch => 02_autotools.patch} | 8 ++------
.../patches/{03_config.dpatch => 03_config.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 9 ++-------
debian/source/format | 1 +
11 files changed, 23 insertions(+), 33 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_mkinstalldirs.dpatch => 01_mkinstalldirs.patch} (77%)
rename debian/patches/{02_autotools.dpatch => 02_autotools.patch} (99%)
rename debian/patches/{03_config.dpatch => 03_config.patch} (60%)
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 d8cc5c2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-This package uses dpatch for its patches management, see
-/usr/share/doc/dpatch/README.source if you are unfamiliar with it.
diff --git a/debian/changelog b/debian/changelog
index a705dd6..bba30aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libnss-mysql-bg (1.5-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.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 03:49:35 -0500
+
libnss-mysql-bg (1.5-2) unstable; urgency=low
* debian/rules: add binary-indep target (closes: #395712)
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 729f123..efb899b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libnss-mysql-bg
Section: admin
Priority: optional
Maintainer: Emmanuel Lacour <[email protected]>
-Build-Depends: debhelper (>= 7), libmysqlclient15-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libmysqlclient15-dev
+Standards-Version: 3.9.3
Package: libnss-mysql-bg
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 59aa9bb..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_mkinstalldirs.dpatch
-02_autotools.dpatch
-03_config.dpatch
diff --git a/debian/patches/01_mkinstalldirs.dpatch b/debian/patches/01_mkinstalldirs.patch
similarity index 77%
rename from debian/patches/01_mkinstalldirs.dpatch
rename to debian/patches/01_mkinstalldirs.patch
index bfac7c4..e4ba3b3 100644
--- a/debian/patches/01_mkinstalldirs.dpatch
+++ b/debian/patches/01_mkinstalldirs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_mkinstalldirs.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix bad mkinstalldirs call
+From: <[email protected]>
+Subject: Fix bad mkinstalldirs call
-@DPATCH@
--- ./Makefile.am
+++ ./Makefile.am
@@ -27,12 +27,12 @@ EXTRA_DIST = FAQ UPGRADING DEBUGGING libnss-mysql.spec src/*.sym \
diff --git a/debian/patches/02_autotools.dpatch b/debian/patches/02_autotools.patch
similarity index 99%
rename from debian/patches/02_autotools.dpatch
rename to debian/patches/02_autotools.patch
index 7dafbd3..b651293 100644
--- a/debian/patches/02_autotools.dpatch
+++ b/debian/patches/02_autotools.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_autotools.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Autotools update (aclocal, libtoolize -c -f, autoconf, automake)
+From: <[email protected]>
+Subject: Autotools update (aclocal, libtoolize -c -f, autoconf, automake)
-@DPATCH@
--- ./Makefile.in
+++ ./Makefile.in
@@ -1,8 +1,8 @@
diff --git a/debian/patches/03_config.dpatch b/debian/patches/03_config.patch
similarity index 60%
rename from debian/patches/03_config.dpatch
rename to debian/patches/03_config.patch
index 18ff4b1..e59605d 100644
--- a/debian/patches/03_config.dpatch
+++ b/debian/patches/03_config.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_config.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update configuration file to debian layout
+From: <[email protected]>
+Subject: Update configuration file to debian layout
-@DPATCH@
--- ./sample/linux/libnss-mysql.cfg 2005-01-31 03:16:46.000000000 +0100
+++ ./sample/linux/libnss-mysql.cfg 2008-11-05 14:43:20.000000000 +0100
@@ -35,6 +35,6 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6ad3877
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_mkinstalldirs.patch
+02_autotools.patch
+03_config.patch
diff --git a/debian/rules b/debian/rules
index 66dc421..136a0b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,8 @@ major=2
#major=`ls src/.libs/lib*.so.* | \
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-patch:
- dpatch apply-all
-
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
./configure
touch configure-stamp
@@ -52,8 +49,6 @@ clean:
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.log
dh_clean
- dpatch deapply-all
- rm -rf debian/patched
install: build
dh_testdir
@@ -99,4 +94,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch
+.PHONY: build clean binary-indep binary-arch binary install configure
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
