Convert dpatch headers to quilt

diff --git a/debian/patches/01_mkinstalldirs.diff b/debian/patches/01_mkinstalldirs.diff
index bfac7c4..e4ba3b3 100644 (file)
--- a/debian/patches/01_mkinstalldirs.diff
+++ b/debian/patches/01_mkinstalldirs.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_mkinstalldirs.dpatch by  <elacour@home-dn.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix bad mkinstalldirs call
+From: <elacour@home-dn.net>
+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/03_config.diff b/debian/patches/03_config.diff
index 18ff4b1..e59605d 100755 (executable)
--- a/debian/patches/03_config.diff
+++ b/debian/patches/03_config.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_config.dpatch by  <elacour@home-dn.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Update configuration file to debian layout
+From: <elacour@home-dn.net>
+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/04_shadow.diff b/debian/patches/04_shadow.diff
index dbfff6e..0732e56 100755 (executable)
--- a/debian/patches/04_shadow.diff
+++ b/debian/patches/04_shadow.diff
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_shadow.dpatch by  <elacour@home-dn.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add check for egid to properly works like "shadow" enabled authentications
+From: <hweidner@gmx.net>
+Subject: Add check for egid to properly works like "shadow" enabled authentications
 
-@DPATCH@
 --- libnss-mysql-bg-1.5/src/lookup.c       2011-09-13 09:28:30.000000000 +0200
 +++ libnss-mysql-bg-1.5/src/lookup.c    2011-09-13 09:47:16.000000000 +0200
 @@ -21,6 +21,8 @@

diff --git a/debian/patches/05_fix_acinclude b/debian/patches/05_fix_acinclude
index 357314b..29166eb 100644 (file)
--- a/debian/patches/05_fix_acinclude
+++ b/debian/patches/05_fix_acinclude
@@ -1,16 +1,11 @@
+From: <elacour@home-dn.net>
+Subject: Use mysql_config to find mysql multi-arch libs
+
 Index: libnss-mysql-bg-1.5/acinclude.m4
 ===================================================================
 --- libnss-mysql-bg-1.5.orig/acinclude.m4      2012-04-18 10:20:01.205313859 +0200
 +++ libnss-mysql-bg-1.5/acinclude.m4   2012-04-18 11:18:19.681344131 +0200
-@@ -50,6 +50,7 @@
- fi
- 
- AC_MSG_CHECKING([for MySQL libraries])
-+
- dnl Check for share first, then static, such that static
- dnl will take precedence
- for f in $baselist; do
-@@ -80,6 +81,19 @@
+@@ -80,6 +80,19 @@
      fi
  done