Package: infiniband-diags
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
Notes:
The build process modifies original files and to preserve these files,
save/restore steps have been added to debian/rules.
Benoit, as we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 3d6a7110a5bbf0a06bb3901e60a3d4a5aacaea6d Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 8 Apr 2012 23:32:27 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 2 -
debian/changelog | 9 +++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 17 ------
...1_remove_rpath.dpatch => 01_remove_rpath.patch} | 8 +--
...isms.dpatch => 02_ibcheckerrors_bashisms.patch} | 8 +--
...shisms.dpatch => 03_ibcheckerrs_bashisms.patch} | 8 +--
...ashisms.dpatch => 04_ibchecknet_bashisms.patch} | 8 +--
...shisms.dpatch => 05_ibchecknode_bashisms.patch} | 8 +--
...shisms.dpatch => 06_ibcheckport_bashisms.patch} | 8 +--
...s.dpatch => 07_ibcheckportstate_bashisms.patch} | 8 +--
...s.dpatch => 08_ibcheckportwidth_bashisms.patch} | 8 +--
...hisms.dpatch => 09_ibcheckstate_bashisms.patch} | 8 +--
...hisms.dpatch => 10_ibcheckwidth_bashisms.patch} | 8 +--
...ms.dpatch => 11_ibclearcounters_bashisms.patch} | 8 +--
...isms.dpatch => 12_ibclearerrors_bashisms.patch} | 8 +--
...sms.dpatch => 13_ibdatacounters_bashisms.patch} | 8 +--
...hisms.dpatch => 14_ibdatacounts_bashisms.patch} | 8 +--
...s_bashisms.dpatch => 15_ibhosts_bashisms.patch} | 8 +--
...bashisms.dpatch => 16_ibrouters_bashisms.patch} | 8 +--
...ashisms.dpatch => 17_ibswitches_bashisms.patch} | 8 +--
debian/patches/series | 17 ++++++
debian/rules | 56 ++++++++++++--------
debian/source/format | 1 +
25 files changed, 97 insertions(+), 147 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_remove_rpath.dpatch => 01_remove_rpath.patch} (85%)
rename debian/patches/{02_ibcheckerrors_bashisms.dpatch => 02_ibcheckerrors_bashisms.patch} (65%)
rename debian/patches/{03_ibcheckerrs_bashisms.dpatch => 03_ibcheckerrs_bashisms.patch} (83%)
rename debian/patches/{04_ibchecknet_bashisms.dpatch => 04_ibchecknet_bashisms.patch} (65%)
rename debian/patches/{05_ibchecknode_bashisms.dpatch => 05_ibchecknode_bashisms.patch} (78%)
rename debian/patches/{06_ibcheckport_bashisms.dpatch => 06_ibcheckport_bashisms.patch} (78%)
rename debian/patches/{07_ibcheckportstate_bashisms.dpatch => 07_ibcheckportstate_bashisms.patch} (77%)
rename debian/patches/{08_ibcheckportwidth_bashisms.dpatch => 08_ibcheckportwidth_bashisms.patch} (77%)
rename debian/patches/{09_ibcheckstate_bashisms.dpatch => 09_ibcheckstate_bashisms.patch} (65%)
rename debian/patches/{10_ibcheckwidth_bashisms.dpatch => 10_ibcheckwidth_bashisms.patch} (65%)
rename debian/patches/{11_ibclearcounters_bashisms.dpatch => 11_ibclearcounters_bashisms.patch} (64%)
rename debian/patches/{12_ibclearerrors_bashisms.dpatch => 12_ibclearerrors_bashisms.patch} (65%)
rename debian/patches/{13_ibdatacounters_bashisms.dpatch => 13_ibdatacounters_bashisms.patch} (65%)
rename debian/patches/{14_ibdatacounts_bashisms.dpatch => 14_ibdatacounts_bashisms.patch} (78%)
rename debian/patches/{15_ibhosts_bashisms.dpatch => 15_ibhosts_bashisms.patch} (60%)
rename debian/patches/{16_ibrouters_bashisms.dpatch => 16_ibrouters_bashisms.patch} (59%)
rename debian/patches/{17_ibswitches_bashisms.dpatch => 17_ibswitches_bashisms.patch} (59%)
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 48b599a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/dpatch/README.source.gz
-
diff --git a/debian/changelog b/debian/changelog
index 41e055b..3f19948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+infiniband-diags (1.4.4-20090314-1.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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 08 Apr 2012 21:37:59 +0300
+
infiniband-diags (1.4.4-20090314-1) unstable; urgency=low
* Initial release (Closes: #539803)
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 8fd399e..23db9c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-de...@lists.alioth.debian.org>
Uploaders: Benoit Mortier <benoit.mort...@opensides.be>, Guy Coates <g...@sanger.ac.uk>, Mario Lang <ml...@debian.org>
-Build-Depends: debhelper (>= 7), automake, chrpath, dpatch, libibcommon-dev, libibumad-dev, libibmad-dev, libopensm2-dev (>=3.2.5)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), autotools-dev, automake, chrpath, libibcommon-dev, libibumad-dev, libibmad-dev, libopensm2-dev (>=3.2.5)
+Standards-Version: 3.9.3.1
Homepage: http://www.openfabrics.org
Package: infiniband-diags
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cd4eb9e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,17 +0,0 @@
-01_remove_rpath
-02_ibcheckerrors_bashisms
-03_ibcheckerrs_bashisms
-04_ibchecknet_bashisms
-05_ibchecknode_bashisms
-06_ibcheckport_bashisms
-07_ibcheckportstate_bashisms
-08_ibcheckportwidth_bashisms
-09_ibcheckstate_bashisms
-10_ibcheckwidth_bashisms
-11_ibclearcounters_bashisms
-12_ibclearerrors_bashisms
-13_ibdatacounters_bashisms
-14_ibdatacounts_bashisms
-15_ibhosts_bashisms
-16_ibrouters_bashisms
-17_ibswitches_bashisms
diff --git a/debian/patches/01_remove_rpath.dpatch b/debian/patches/01_remove_rpath.patch
similarity index 85%
rename from debian/patches/01_remove_rpath.dpatch
rename to debian/patches/01_remove_rpath.patch
index dcc57b0..36119b4 100644
--- a/debian/patches/01_remove_rpath.dpatch
+++ b/debian/patches/01_remove_rpath.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_rpath.dpatch by <ben...@catbert.opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove the rpath parameter from Makefile.am
+From: <ben...@catbert.opensides.be>
+Subject: Remove the rpath parameter from Makefile.am
-@DPATCH@
--- trunk/Makefile.am 2009-07-29 14:58:01.000000000 +0200
+++ trunk/Makefile.am 2009-07-31 23:35:56.000000000 +0200
diff --git a/debian/patches/02_ibcheckerrors_bashisms.dpatch b/debian/patches/02_ibcheckerrors_bashisms.patch
similarity index 65%
rename from debian/patches/02_ibcheckerrors_bashisms.dpatch
rename to debian/patches/02_ibcheckerrors_bashisms.patch
index f9cee78..79fcf9f 100644
--- a/debian/patches/02_ibcheckerrors_bashisms.dpatch
+++ b/debian/patches/02_ibcheckerrors_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_ibcheckerrors_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckerrors script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckerrors script
-@DPATCH@
--- trunk/scripts/ibcheckerrors.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckerrors.in.new 2009-12-20 19:12:11.000000000 +0100
diff --git a/debian/patches/03_ibcheckerrs_bashisms.dpatch b/debian/patches/03_ibcheckerrs_bashisms.patch
similarity index 83%
rename from debian/patches/03_ibcheckerrs_bashisms.dpatch
rename to debian/patches/03_ibcheckerrs_bashisms.patch
index d9f2174..1c50e5c 100644
--- a/debian/patches/03_ibcheckerrs_bashisms.dpatch
+++ b/debian/patches/03_ibcheckerrs_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_ibcheckerrs_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckerrs script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckerrs script
-@DPATCH@
--- trunk/scripts/ibcheckerrs.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckerrs.in.new 2009-12-20 19:13:14.000000000 +0100
diff --git a/debian/patches/04_ibchecknet_bashisms.dpatch b/debian/patches/04_ibchecknet_bashisms.patch
similarity index 65%
rename from debian/patches/04_ibchecknet_bashisms.dpatch
rename to debian/patches/04_ibchecknet_bashisms.patch
index c096ed1..e476827 100644
--- a/debian/patches/04_ibchecknet_bashisms.dpatch
+++ b/debian/patches/04_ibchecknet_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_ibchecknet_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibchecknet script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibchecknet script
-@DPATCH@
--- trunk/scripts/ibchecknet.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibchecknet.in.new 2009-12-20 19:14:01.000000000 +0100
diff --git a/debian/patches/05_ibchecknode_bashisms.dpatch b/debian/patches/05_ibchecknode_bashisms.patch
similarity index 78%
rename from debian/patches/05_ibchecknode_bashisms.dpatch
rename to debian/patches/05_ibchecknode_bashisms.patch
index f974aee..36ffdb4 100644
--- a/debian/patches/05_ibchecknode_bashisms.dpatch
+++ b/debian/patches/05_ibchecknode_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_ibchecknode_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibchecknode script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibchecknode script
-@DPATCH@
--- trunk/scripts/ibchecknode.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibchecknode.in.new 2009-12-20 19:14:49.000000000 +0100
diff --git a/debian/patches/06_ibcheckport_bashisms.dpatch b/debian/patches/06_ibcheckport_bashisms.patch
similarity index 78%
rename from debian/patches/06_ibcheckport_bashisms.dpatch
rename to debian/patches/06_ibcheckport_bashisms.patch
index 972f3c6..d99763f 100644
--- a/debian/patches/06_ibcheckport_bashisms.dpatch
+++ b/debian/patches/06_ibcheckport_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_ibcheckport_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckport script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckport script
-@DPATCH@
--- trunk/scripts/ibcheckport.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckport.in.new 2009-12-20 19:21:21.000000000 +0100
diff --git a/debian/patches/07_ibcheckportstate_bashisms.dpatch b/debian/patches/07_ibcheckportstate_bashisms.patch
similarity index 77%
rename from debian/patches/07_ibcheckportstate_bashisms.dpatch
rename to debian/patches/07_ibcheckportstate_bashisms.patch
index 1e290fc..d690d86 100644
--- a/debian/patches/07_ibcheckportstate_bashisms.dpatch
+++ b/debian/patches/07_ibcheckportstate_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_ibcheckportstate_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckportstate script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckportstate script
-@DPATCH@
--- trunk/scripts/ibcheckportstate.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckportstate.in.new 2009-12-20 19:22:20.000000000 +0100
diff --git a/debian/patches/08_ibcheckportwidth_bashisms.dpatch b/debian/patches/08_ibcheckportwidth_bashisms.patch
similarity index 77%
rename from debian/patches/08_ibcheckportwidth_bashisms.dpatch
rename to debian/patches/08_ibcheckportwidth_bashisms.patch
index a37f3a5..70c7f17 100644
--- a/debian/patches/08_ibcheckportwidth_bashisms.dpatch
+++ b/debian/patches/08_ibcheckportwidth_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_ibcheckportwidth_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckportwidth script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckportwidth script
-@DPATCH@
--- trunk/scripts/ibcheckportwidth.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckportwidth.in.new 2009-12-20 19:23:15.000000000 +0100
diff --git a/debian/patches/09_ibcheckstate_bashisms.dpatch b/debian/patches/09_ibcheckstate_bashisms.patch
similarity index 65%
rename from debian/patches/09_ibcheckstate_bashisms.dpatch
rename to debian/patches/09_ibcheckstate_bashisms.patch
index e4f7086..cc21f3c 100644
--- a/debian/patches/09_ibcheckstate_bashisms.dpatch
+++ b/debian/patches/09_ibcheckstate_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_ibcheckstate_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckstate script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckstate script
-@DPATCH@
--- trunk/scripts/ibcheckstate.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckstate.in.new 2009-12-20 19:24:50.000000000 +0100
diff --git a/debian/patches/10_ibcheckwidth_bashisms.dpatch b/debian/patches/10_ibcheckwidth_bashisms.patch
similarity index 65%
rename from debian/patches/10_ibcheckwidth_bashisms.dpatch
rename to debian/patches/10_ibcheckwidth_bashisms.patch
index 246771a..0a93675 100644
--- a/debian/patches/10_ibcheckwidth_bashisms.dpatch
+++ b/debian/patches/10_ibcheckwidth_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_ibcheckwidth_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckwidth script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibcheckwidth script
-@DPATCH@
--- trunk/scripts/ibcheckwidth.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibcheckwidth.in.new 2009-12-20 19:25:24.000000000 +0100
diff --git a/debian/patches/11_ibclearcounters_bashisms.dpatch b/debian/patches/11_ibclearcounters_bashisms.patch
similarity index 64%
rename from debian/patches/11_ibclearcounters_bashisms.dpatch
rename to debian/patches/11_ibclearcounters_bashisms.patch
index 5d8b9d6..072771f 100644
--- a/debian/patches/11_ibclearcounters_bashisms.dpatch
+++ b/debian/patches/11_ibclearcounters_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_ibclearcounters_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibclearcounters script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibclearcounters script
-@DPATCH@
--- trunk/scripts/ibclearcounters.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibclearcounters.in.new 2009-12-20 19:26:00.000000000 +0100
diff --git a/debian/patches/12_ibclearerrors_bashisms.dpatch b/debian/patches/12_ibclearerrors_bashisms.patch
similarity index 65%
rename from debian/patches/12_ibclearerrors_bashisms.dpatch
rename to debian/patches/12_ibclearerrors_bashisms.patch
index 0b5a360..6c24efa 100644
--- a/debian/patches/12_ibclearerrors_bashisms.dpatch
+++ b/debian/patches/12_ibclearerrors_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_ibclearerrors_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibclearerrors script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibclearerrors script
-@DPATCH@
--- trunk/scripts/ibclearerrors.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibclearerrors.in.new 2009-12-20 19:26:35.000000000 +0100
diff --git a/debian/patches/13_ibdatacounters_bashisms.dpatch b/debian/patches/13_ibdatacounters_bashisms.patch
similarity index 65%
rename from debian/patches/13_ibdatacounters_bashisms.dpatch
rename to debian/patches/13_ibdatacounters_bashisms.patch
index 41c715c..477a1b8 100644
--- a/debian/patches/13_ibdatacounters_bashisms.dpatch
+++ b/debian/patches/13_ibdatacounters_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_ibdatacounters_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibdatacounters script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibdatacounters script
-@DPATCH@
--- trunk/scripts/ibdatacounters.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibdatacounters.in.new 2009-12-20 19:27:22.000000000 +0100
diff --git a/debian/patches/14_ibdatacounts_bashisms.dpatch b/debian/patches/14_ibdatacounts_bashisms.patch
similarity index 78%
rename from debian/patches/14_ibdatacounts_bashisms.dpatch
rename to debian/patches/14_ibdatacounts_bashisms.patch
index 10aa23d..ce694ec 100644
--- a/debian/patches/14_ibdatacounts_bashisms.dpatch
+++ b/debian/patches/14_ibdatacounts_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_ibdatacounts_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibdatacounts script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibdatacounts script
-@DPATCH@
--- trunk/scripts/ibdatacounts.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibdatacounts.in.new 2009-12-20 19:28:18.000000000 +0100
diff --git a/debian/patches/15_ibhosts_bashisms.dpatch b/debian/patches/15_ibhosts_bashisms.patch
similarity index 60%
rename from debian/patches/15_ibhosts_bashisms.dpatch
rename to debian/patches/15_ibhosts_bashisms.patch
index 168ce6b..d17fd71 100644
--- a/debian/patches/15_ibhosts_bashisms.dpatch
+++ b/debian/patches/15_ibhosts_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_ibhosts_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibhosts script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibhosts script
-@DPATCH@
--- trunk/scripts/ibhosts.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibhosts.in.new 2009-12-20 19:28:45.000000000 +0100
diff --git a/debian/patches/16_ibrouters_bashisms.dpatch b/debian/patches/16_ibrouters_bashisms.patch
similarity index 59%
rename from debian/patches/16_ibrouters_bashisms.dpatch
rename to debian/patches/16_ibrouters_bashisms.patch
index 9db7fb5..0809d59 100644
--- a/debian/patches/16_ibrouters_bashisms.dpatch
+++ b/debian/patches/16_ibrouters_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_ibrouters_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibrouters script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibrouters script
-@DPATCH@
--- trunk/scripts/ibrouters.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibrouters.in.new 2009-12-20 19:29:52.000000000 +0100
diff --git a/debian/patches/17_ibswitches_bashisms.dpatch b/debian/patches/17_ibswitches_bashisms.patch
similarity index 59%
rename from debian/patches/17_ibswitches_bashisms.dpatch
rename to debian/patches/17_ibswitches_bashisms.patch
index 0f46684..9059149 100644
--- a/debian/patches/17_ibswitches_bashisms.dpatch
+++ b/debian/patches/17_ibswitches_bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_ibswitches_bashisms.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibswitches script
+From: <benoit.mort...@opensides.be>
+Subject: Correct bashims in ibswitches script
-@DPATCH@
--- trunk/scripts/ibswitches.in 2009-07-29 14:58:00.000000000 +0200
+++ trunk/scripts/ibswitches.in.new 2009-12-20 19:34:04.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..feab6a1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,17 @@
+01_remove_rpath.patch
+02_ibcheckerrors_bashisms.patch
+03_ibcheckerrs_bashisms.patch
+04_ibchecknet_bashisms.patch
+05_ibchecknode_bashisms.patch
+06_ibcheckport_bashisms.patch
+07_ibcheckportstate_bashisms.patch
+08_ibcheckportwidth_bashisms.patch
+09_ibcheckstate_bashisms.patch
+10_ibcheckwidth_bashisms.patch
+11_ibclearcounters_bashisms.patch
+12_ibclearerrors_bashisms.patch
+13_ibdatacounters_bashisms.patch
+14_ibdatacounts_bashisms.patch
+15_ibhosts_bashisms.patch
+16_ibrouters_bashisms.patch
+17_ibswitches_bashisms.patch
diff --git a/debian/rules b/debian/rules
index 432d873..66c7bec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,20 +20,41 @@ else
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
-
-
-config.status: patch configure
+# Modified by build process
+KEEP_FILES = \
+ include/ibdiag_version.h \
+ infiniband-diags.spec \
+ scripts/ibcheckerrors \
+ scripts/ibcheckerrs \
+ scripts/ibchecknet \
+ scripts/ibchecknode \
+ scripts/ibcheckport \
+ scripts/ibcheckportstate \
+ scripts/ibcheckportwidth \
+ scripts/ibcheckstate \
+ scripts/ibcheckwidth \
+ scripts/ibclearcounters \
+ scripts/ibclearerrors \
+ scripts/ibdatacounters \
+ scripts/ibdatacounts \
+ scripts/ibhosts \
+ scripts/ibnodes \
+ scripts/ibrouters \
+ scripts/ibswitches
+
+config.status: configure
dh_testdir
+ for f in $(KEEP_FILES); do [ -f $$f.save ] || cp -a $$f $$f.save ; done
# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
-endif
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --with-perl-installdir=/usr/share/perl5 --sbindir=/usr/sbin
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: config.status
@@ -45,32 +66,21 @@ build-stamp: config.status
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
+ rm -f build-stamp config.sub config.guess
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
+ dh_clean
+ for f in $(KEEP_FILES); do [ ! -f $$f.save ] || mv $$f.save $$f; done
install: build
dh_testdir
dh_testroot
- dh_prep
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/infiniband-diags.
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.1
