From b9298394cf03aa8b47c850c7e4df9dd5499b3be6 Mon Sep 17 00:00:00 2001 From: Emmanuel Lacour Date: Tue, 17 Apr 2012 13:40:13 +0200 Subject: [PATCH] Use quilt instead of dpatch --- debian/control | 2 +- debian/patches/00list | 4 ---- debian/patches/{01_mkinstalldirs.dpatch => 01_mkinstalldirs.diff} | 0 debian/patches/{02_autotools.dpatch => 02_autotools.diff} | 0 debian/patches/{03_config.dpatch => 03_config.diff} | 0 debian/patches/{04_shadow.dpatch => 04_shadow.diff} | 0 debian/patches/series | 4 ++++ debian/rules | 4 ++-- 8 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{01_mkinstalldirs.dpatch => 01_mkinstalldirs.diff} (100%) rename debian/patches/{02_autotools.dpatch => 02_autotools.diff} (100%) rename debian/patches/{03_config.dpatch => 03_config.diff} (100%) rename debian/patches/{04_shadow.dpatch => 04_shadow.diff} (100%) create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index 729f123..35214b9 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libnss-mysql-bg Section: admin Priority: optional Maintainer: Emmanuel Lacour -Build-Depends: debhelper (>= 7), libmysqlclient15-dev, dpatch +Build-Depends: debhelper (>= 7), libmysqlclient15-dev, quilt (>= 0.40) Standards-Version: 3.8.3 Package: libnss-mysql-bg diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 916e78a..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,4 +0,0 @@ -01_mkinstalldirs.dpatch -02_autotools.dpatch -03_config.dpatch -04_shadow.dpatch diff --git a/debian/patches/01_mkinstalldirs.dpatch b/debian/patches/01_mkinstalldirs.diff similarity index 100% rename from debian/patches/01_mkinstalldirs.dpatch rename to debian/patches/01_mkinstalldirs.diff diff --git a/debian/patches/02_autotools.dpatch b/debian/patches/02_autotools.diff similarity index 100% rename from debian/patches/02_autotools.dpatch rename to debian/patches/02_autotools.diff diff --git a/debian/patches/03_config.dpatch b/debian/patches/03_config.diff similarity index 100% rename from debian/patches/03_config.dpatch rename to debian/patches/03_config.diff diff --git a/debian/patches/04_shadow.dpatch b/debian/patches/04_shadow.diff similarity index 100% rename from debian/patches/04_shadow.dpatch rename to debian/patches/04_shadow.diff diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bfcb330 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01_mkinstalldirs.diff +02_autotools.diff +03_config.diff +04_shadow.diff diff --git a/debian/rules b/debian/rules index 66dc421..3ea33fb 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ major=2 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` patch: - dpatch apply-all + dh_quilt_patch configure: configure-stamp configure-stamp: patch @@ -52,7 +52,7 @@ clean: [ ! -f Makefile ] || $(MAKE) distclean rm -f config.log dh_clean - dpatch deapply-all + dh_quilt_unpatch rm -rf debian/patched install: build -- 2.11.0