switch to quilt

10 files changed, 25 insertions, 40 deletions

diff --git a/debian/changelog b/debian/changelog
index 1ebd148..39a28cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ipmitool (1.8.11-1) unstable; urgency=low
+
+  * New upstream release 
+  * Change to quilt rather than dpatch
+  * Refresh config.sub/config.guess in configure
+
+ -- Matthew Johnson <mjj29@debian.org>  Sun, 22 Mar 2009 16:44:06 +0000
+
 ipmitool (1.8.9-2) unstable; urgency=medium
 
   * Change pidfile name to the one it actually is. (Closes: #508434)
diff --git a/debian/control b/debian/control
index 623af56..1ce659c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: ipmitool
 Section: utils
 Priority: optional
 Maintainer: Matthew Johnson <mjj29@debian.org>
-Uploaders:
-Build-Depends: debhelper (>> 5.0.0), libreadline5-dev | libreadline-dev, libssl-dev, dpatch
+Build-Depends: debhelper (>> 5.0.0), libreadline5-dev | libreadline-dev, libssl-dev, quilt, autotools-dev
 Standards-Version: 3.7.3
 
 Package: ipmitool
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 6c4ed35..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-10_ipmi_lanp.dpatch
-20_ipmi_isol.dpatch
-20_ipmi_impi.dpatch
-20_ipmi_sdr.dpatch
-99_readme_typo.dpatch
diff --git a/debian/patches/10_ipmi_lanp.dpatch b/debian/patches/10_ipmi_lanp
index 4e7edfd..7bd5f97 100644
--- a/debian/patches/10_ipmi_lanp.dpatch
+++ b/debian/patches/10_ipmi_lanp
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 10_ipmi_lanp.dpatch by  <mjj29@debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 10_ipmi_lanp closes #389741
-
-@DPATCH@
-
+## 10_ipmi_lanp closes #389741
 --- ipmitool-1.8.9.orig/lib/ipmi_lanp.c	2007-03-06 22:15:36.000000000 +0000
 +++ ipmitool-1.8.9/lib/ipmi_lanp.c	2007-12-13 10:06:18.045813387 +0000
 @@ -1489,28 +1489,43 @@
diff --git a/debian/patches/20_ipmi_impi.dpatch b/debian/patches/20_ipmi_impi
index d966a1d..dd5a770 100644
--- a/debian/patches/20_ipmi_impi.dpatch
+++ b/debian/patches/20_ipmi_impi
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 20ipmi_impi.dpatch by  <mjj29@debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 20ipmi_impi, closes #412816
-
-@DPATCH@
-
+## 20ipmi_impi, closes #412816
 --- ipmitool-1.8.9-rc1/lib/ipmi_strings.c.orig	2005-05-15 06:26:33.000000000 +0200
 +++ ipmitool-1.8.9-rc1/lib/ipmi_strings.c	2005-10-23 15:22:57.000000000 +0200
 @@ -43,7 +43,7 @@
diff --git a/debian/patches/20_ipmi_isol.dpatch b/debian/patches/20_ipmi_isol
index 382e62a..ac70722 100644
--- a/debian/patches/20_ipmi_isol.dpatch
+++ b/debian/patches/20_ipmi_isol
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 20_ipmi_isol.dpatch by  <mjj29@debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 20_ipmi_isol, closes #412816
-
-@DPATCH@
-
+## 20_ipmi_isol, closes #412816
 diff -urN ipmitool-1.8.9.orig/include/ipmitool/ipmi_isol.h ipmitool-1.8.9/include/ipmitool/ipmi_isol.h
 --- ipmitool-1.8.9.orig/include/ipmitool/ipmi_isol.h	2007-02-22 08:38:55.000000000 +0000
 +++ ipmitool-1.8.9/include/ipmitool/ipmi_isol.h	2007-12-13 10:16:57.063986495 +0000
diff --git a/debian/patches/20_ipmi_sdr.dpatch b/debian/patches/20_ipmi_sdr
index 4e6ff4f..dcb8c23 100644
--- a/debian/patches/20_ipmi_sdr.dpatch
+++ b/debian/patches/20_ipmi_sdr
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 20_ipmi_sdr.dpatch by Cyril Brulebois <cyril.brulebois@kerlabs.com>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable reading temperatures again (Closes: #507760).
-
-@DPATCH@
-
+## Enable reading temperatures again (Closes: #507760).
 --- a/lib/ipmi_sdr.c
 +++ b/lib/ipmi_sdr.c
 @@ -1122,6 +1122,13 @@
diff --git a/debian/patches/99_readme_typo.dpatch b/debian/patches/99_readme_typo
index f70f54c..3338aa8 100644
--- a/debian/patches/99_readme_typo.dpatch
+++ b/debian/patches/99_readme_typo
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 99_readme_typo.dpatch by dann frazier <dannf@hp.com>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Typo in README. Closes: #508231
-
-@DPATCH@
-
+## Typo in README. Closes: #508231
 diff -urpN ipmitool-1.8.9.orig/README ipmitool-1.8.9/README
 --- ipmitool-1.8.9.orig/README	2005-01-06 12:13:51.000000000 -0700
 +++ ipmitool-1.8.9/README	2008-12-08 18:12:15.000000000 -0700
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e4df9d3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+10_ipmi_lanp
+20_ipmi_isol
+20_ipmi_impi
+20_ipmi_sdr
+99_readme_typo
diff --git a/debian/rules b/debian/rules
index adbc323..255653e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 #export DH_VERBOSE=1
 export DH_OPTIONS
 
@@ -15,8 +17,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: patch
 	dh_testdir
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
 	./configure --prefix=/usr \
 		    --with-kerneldir \
 		    --mandir=/usr/share/man
@@ -43,6 +47,7 @@ clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f config.sub config.guess
 	
 	# Add here commands to clean up after the build process.
 	if [ -f Makefile ]; then $(MAKE) distclean; fi
@@ -105,5 +110,3 @@ binary-arch: build-arch install-arch
 
 binary: binary-arch #binary-indep
 .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-indep install-arch configure
-
-include /usr/share/dpatch/dpatch.make