[Pkg-ofed-commits] [infiniband-diags] 03/07: Imported Debian patch 1.4.4-20090314-1.1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 07:17:56 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository infiniband-diags.
commit 3d11855bf622f603f36370d958487ac1f5ecb44f
Author: Jari Aalto <jari.aalto at cante.net>
Date: Thu Apr 19 19:18:49 2012 +0300
Imported Debian patch 1.4.4-20090314-1.1
---
debian/README.source | 2 -
debian/changelog | 12 +++++
debian/compat | 2 +-
debian/control | 9 +++-
debian/lintian-overrides | 1 -
...1_remove_rpath.dpatch => 00-remove-rpath.patch} | 8 +--
debian/patches/00list | 17 -------
...th.dpatch => 02-remove-rpath-makefile.in.patch} | 40 ++++++++-------
...isms.dpatch => 04-ibcheckerrors-bashisms.patch} | 8 +--
...shisms.dpatch => 06-ibcheckerrs-bashisms.patch} | 8 +--
...ashisms.dpatch => 08-ibchecknet-bashisms.patch} | 8 +--
...shisms.dpatch => 10-ibchecknode-bashisms.patch} | 8 +--
...shisms.dpatch => 12-ibcheckport-bashisms.patch} | 8 +--
...s.dpatch => 14-ibcheckportstate-bashisms.patch} | 8 +--
...s.dpatch => 16-ibcheckportwidth-bashisms.patch} | 8 +--
...hisms.dpatch => 18-ibcheckstate-bashisms.patch} | 8 +--
...hisms.dpatch => 20-ibcheckwidth-bashisms.patch} | 8 +--
...ms.dpatch => 22-ibclearcounters-bashisms.patch} | 8 +--
...isms.dpatch => 24-ibclearerrors-bashisms.patch} | 8 +--
...sms.dpatch => 26-ibdatacounters-bashisms.patch} | 8 +--
...hisms.dpatch => 28-ibdatacounts-bashisms.patch} | 8 +--
...s_bashisms.dpatch => 30-ibhosts-bashisms.patch} | 8 +--
...bashisms.dpatch => 32-ibrouters-bashisms.patch} | 8 +--
...ashisms.dpatch => 34-ibswitches-bashisms.patch} | 8 +--
debian/patches/series | 18 +++++++
debian/rules | 58 ++++++++++++----------
debian/source/format | 1 +
27 files changed, 127 insertions(+), 169 deletions(-)
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..cdba52f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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.
+ * Add new patch 02 to prevent using --rpath (Policy); renumber all patches
+ * Delete debian/lintian-overrides which is no longer neeeded (--rpath).
+ * Fix extended-description-is-probably-too-short (Lintian).
+
+ -- Jari Aalto <jari.aalto at cante.net> Thu, 19 Apr 2012 19:18:49 +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..0be84f3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,18 @@ Section: net
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel at lists.alioth.debian.org>
Uploaders: Benoit Mortier <benoit.mortier at opensides.be>, Guy Coates <gmpc at sanger.ac.uk>, Mario Lang <mlang at 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
Architecture: i386 ia64 amd64 powerpc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
Description: InfiniBand diagnostic programs
+ InfiniBand is a switched fabric communications link used in
+ high-performance computing and enterprise data centers. Its features
+ include high throughput, low latency, quality of service and
+ failover, and it is designed to be scalable.
+ .
This package provides diagnostic programs and scripts needed to
diagnose an InfiniBand subnet.
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index a217ccb..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-infiniband-diags: binary-or-shlib-defines-rpath ./usr/sbin/ibnetdiscover /usr/lib
diff --git a/debian/patches/01_remove_rpath.dpatch b/debian/patches/00-remove-rpath.patch
similarity index 85%
copy from debian/patches/01_remove_rpath.dpatch
copy to debian/patches/00-remove-rpath.patch
index dcc57b0..36119b4 100644
--- a/debian/patches/01_remove_rpath.dpatch
+++ b/debian/patches/00-remove-rpath.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_rpath.dpatch by <benoit at catbert.opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove the rpath parameter from Makefile.am
+From: <benoit at catbert.opensides.be>
+Subject: Remove the rpath parameter from Makefile.am
- at 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/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/02-remove-rpath-makefile.in.patch
similarity index 63%
rename from debian/patches/01_remove_rpath.dpatch
rename to debian/patches/02-remove-rpath-makefile.in.patch
index dcc57b0..9a72855 100644
--- a/debian/patches/01_remove_rpath.dpatch
+++ b/debian/patches/02-remove-rpath-makefile.in.patch
@@ -1,42 +1,44 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove_rpath.dpatch by <benoit at catbert.opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove the rpath parameter from Makefile.am
+From: Jari Aalto <jari.aalto at cante.net>
+Subject: Remove --rpath
- at DPATCH@
+---
+ Makefile.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
---- trunk/Makefile.am 2009-07-29 14:58:01.000000000 +0200
-+++ trunk/Makefile.am 2009-07-31 23:35:56.000000000 +0200
-@@ -37,7 +37,6 @@
-
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -386,7 +386,7 @@
+ src_ibaddr_CFLAGS = -Wall $(DBGFLAGS)
src_ibnetdiscover_SOURCES = src/ibnetdiscover.c src/grouping.c src/ibdiag_common.c
src_ibnetdiscover_CFLAGS = -Wall $(DBGFLAGS)
-src_ibnetdiscover_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
-
++src_ibnetdiscover_LDFLAGS =
src_ibping_SOURCES = src/ibping.c src/ibdiag_common.c
src_ibping_CFLAGS = -Wall $(DBGFLAGS)
-@@ -56,7 +55,6 @@
-
+ src_ibportstate_SOURCES = src/ibportstate.c src/ibdiag_common.c
+@@ -399,7 +399,7 @@
+ src_ibsysstat_CFLAGS = -Wall $(DBGFLAGS)
src_ibtracert_SOURCES = src/ibtracert.c src/ibdiag_common.c
src_ibtracert_CFLAGS = -Wall $(DBGFLAGS)
-src_ibtracert_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
-
++src_ibtracert_LDFLAGS =
src_perfquery_SOURCES = src/perfquery.c src/ibdiag_common.c
src_perfquery_CFLAGS = -Wall $(DBGFLAGS)
-@@ -69,15 +67,12 @@
-
+ src_sminfo_SOURCES = src/sminfo.c src/ibdiag_common.c
+@@ -408,13 +408,13 @@
+ src_smpdump_CFLAGS = -Wall $(DBGFLAGS)
src_smpquery_SOURCES = src/smpquery.c src/ibdiag_common.c
src_smpquery_CFLAGS = -Wall $(DBGFLAGS)
-src_smpquery_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
-
++src_smpquery_LDFLAGS =
src_saquery_SOURCES = src/saquery.c src/ibdiag_common.c
src_saquery_CFLAGS = -Wall -DOSM_VENDOR_INTF_OPENIB -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP $(DBGFLAGS)
-src_saquery_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
-
++src_saquery_LDFLAGS =
src_ibsendtrap_SOURCES = src/ibsendtrap.c src/ibdiag_common.c
src_ibsendtrap_CFLAGS = -Wall $(DBGFLAGS)
-src_ibsendtrap_LDFLAGS = -Wl,--rpath -Wl,$(libdir)
-
++src_ibsendtrap_LDFLAGS =
src_vendstat_SOURCES = src/vendstat.c src/ibdiag_common.c
src_vendstat_CFLAGS = -Wall $(DBGFLAGS)
+ src_mcm_rereg_test_SOURCES = src/mcm_rereg_test.c
diff --git a/debian/patches/02_ibcheckerrors_bashisms.dpatch b/debian/patches/04-ibcheckerrors-bashisms.patch
similarity index 65%
rename from debian/patches/02_ibcheckerrors_bashisms.dpatch
rename to debian/patches/04-ibcheckerrors-bashisms.patch
index f9cee78..79fcf9f 100644
--- a/debian/patches/02_ibcheckerrors_bashisms.dpatch
+++ b/debian/patches/04-ibcheckerrors-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_ibcheckerrors_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckerrors script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckerrors script
- at 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/06-ibcheckerrs-bashisms.patch
similarity index 83%
rename from debian/patches/03_ibcheckerrs_bashisms.dpatch
rename to debian/patches/06-ibcheckerrs-bashisms.patch
index d9f2174..1c50e5c 100644
--- a/debian/patches/03_ibcheckerrs_bashisms.dpatch
+++ b/debian/patches/06-ibcheckerrs-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_ibcheckerrs_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckerrs script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckerrs script
- at 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/08-ibchecknet-bashisms.patch
similarity index 65%
rename from debian/patches/04_ibchecknet_bashisms.dpatch
rename to debian/patches/08-ibchecknet-bashisms.patch
index c096ed1..e476827 100644
--- a/debian/patches/04_ibchecknet_bashisms.dpatch
+++ b/debian/patches/08-ibchecknet-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_ibchecknet_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibchecknet script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibchecknet script
- at 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/10-ibchecknode-bashisms.patch
similarity index 78%
rename from debian/patches/05_ibchecknode_bashisms.dpatch
rename to debian/patches/10-ibchecknode-bashisms.patch
index f974aee..36ffdb4 100644
--- a/debian/patches/05_ibchecknode_bashisms.dpatch
+++ b/debian/patches/10-ibchecknode-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_ibchecknode_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibchecknode script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibchecknode script
- at 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/12-ibcheckport-bashisms.patch
similarity index 78%
rename from debian/patches/06_ibcheckport_bashisms.dpatch
rename to debian/patches/12-ibcheckport-bashisms.patch
index 972f3c6..d99763f 100644
--- a/debian/patches/06_ibcheckport_bashisms.dpatch
+++ b/debian/patches/12-ibcheckport-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_ibcheckport_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckport script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckport script
- at 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/14-ibcheckportstate-bashisms.patch
similarity index 77%
rename from debian/patches/07_ibcheckportstate_bashisms.dpatch
rename to debian/patches/14-ibcheckportstate-bashisms.patch
index 1e290fc..d690d86 100644
--- a/debian/patches/07_ibcheckportstate_bashisms.dpatch
+++ b/debian/patches/14-ibcheckportstate-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_ibcheckportstate_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckportstate script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckportstate script
- at 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/16-ibcheckportwidth-bashisms.patch
similarity index 77%
rename from debian/patches/08_ibcheckportwidth_bashisms.dpatch
rename to debian/patches/16-ibcheckportwidth-bashisms.patch
index a37f3a5..70c7f17 100644
--- a/debian/patches/08_ibcheckportwidth_bashisms.dpatch
+++ b/debian/patches/16-ibcheckportwidth-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_ibcheckportwidth_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckportwidth script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckportwidth script
- at 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/18-ibcheckstate-bashisms.patch
similarity index 65%
rename from debian/patches/09_ibcheckstate_bashisms.dpatch
rename to debian/patches/18-ibcheckstate-bashisms.patch
index e4f7086..cc21f3c 100644
--- a/debian/patches/09_ibcheckstate_bashisms.dpatch
+++ b/debian/patches/18-ibcheckstate-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_ibcheckstate_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckstate script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckstate script
- at 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/20-ibcheckwidth-bashisms.patch
similarity index 65%
rename from debian/patches/10_ibcheckwidth_bashisms.dpatch
rename to debian/patches/20-ibcheckwidth-bashisms.patch
index 246771a..0a93675 100644
--- a/debian/patches/10_ibcheckwidth_bashisms.dpatch
+++ b/debian/patches/20-ibcheckwidth-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_ibcheckwidth_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibcheckwidth script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibcheckwidth script
- at 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/22-ibclearcounters-bashisms.patch
similarity index 64%
rename from debian/patches/11_ibclearcounters_bashisms.dpatch
rename to debian/patches/22-ibclearcounters-bashisms.patch
index 5d8b9d6..072771f 100644
--- a/debian/patches/11_ibclearcounters_bashisms.dpatch
+++ b/debian/patches/22-ibclearcounters-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_ibclearcounters_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibclearcounters script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibclearcounters script
- at 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/24-ibclearerrors-bashisms.patch
similarity index 65%
rename from debian/patches/12_ibclearerrors_bashisms.dpatch
rename to debian/patches/24-ibclearerrors-bashisms.patch
index 0b5a360..6c24efa 100644
--- a/debian/patches/12_ibclearerrors_bashisms.dpatch
+++ b/debian/patches/24-ibclearerrors-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_ibclearerrors_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibclearerrors script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibclearerrors script
- at 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/26-ibdatacounters-bashisms.patch
similarity index 65%
rename from debian/patches/13_ibdatacounters_bashisms.dpatch
rename to debian/patches/26-ibdatacounters-bashisms.patch
index 41c715c..477a1b8 100644
--- a/debian/patches/13_ibdatacounters_bashisms.dpatch
+++ b/debian/patches/26-ibdatacounters-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_ibdatacounters_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibdatacounters script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibdatacounters script
- at 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/28-ibdatacounts-bashisms.patch
similarity index 78%
rename from debian/patches/14_ibdatacounts_bashisms.dpatch
rename to debian/patches/28-ibdatacounts-bashisms.patch
index 10aa23d..ce694ec 100644
--- a/debian/patches/14_ibdatacounts_bashisms.dpatch
+++ b/debian/patches/28-ibdatacounts-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_ibdatacounts_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibdatacounts script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibdatacounts script
- at 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/30-ibhosts-bashisms.patch
similarity index 60%
rename from debian/patches/15_ibhosts_bashisms.dpatch
rename to debian/patches/30-ibhosts-bashisms.patch
index 168ce6b..d17fd71 100644
--- a/debian/patches/15_ibhosts_bashisms.dpatch
+++ b/debian/patches/30-ibhosts-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_ibhosts_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibhosts script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibhosts script
- at 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/32-ibrouters-bashisms.patch
similarity index 59%
rename from debian/patches/16_ibrouters_bashisms.dpatch
rename to debian/patches/32-ibrouters-bashisms.patch
index 9db7fb5..0809d59 100644
--- a/debian/patches/16_ibrouters_bashisms.dpatch
+++ b/debian/patches/32-ibrouters-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_ibrouters_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibrouters script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibrouters script
- at 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/34-ibswitches-bashisms.patch
similarity index 59%
rename from debian/patches/17_ibswitches_bashisms.dpatch
rename to debian/patches/34-ibswitches-bashisms.patch
index 0f46684..9059149 100644
--- a/debian/patches/17_ibswitches_bashisms.dpatch
+++ b/debian/patches/34-ibswitches-bashisms.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_ibswitches_bashisms.dpatch by <benoit.mortier at opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct bashims in ibswitches script
+From: <benoit.mortier at opensides.be>
+Subject: Correct bashims in ibswitches script
- at 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..cba9ea8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,18 @@
+00-remove-rpath.patch
+02-remove-rpath-makefile.in.patch
+04-ibcheckerrors-bashisms.patch
+06-ibcheckerrs-bashisms.patch
+08-ibchecknet-bashisms.patch
+10-ibchecknode-bashisms.patch
+12-ibcheckport-bashisms.patch
+14-ibcheckportstate-bashisms.patch
+16-ibcheckportwidth-bashisms.patch
+18-ibcheckstate-bashisms.patch
+20-ibcheckwidth-bashisms.patch
+22-ibclearcounters-bashisms.patch
+24-ibclearerrors-bashisms.patch
+26-ibdatacounters-bashisms.patch
+28-ibdatacounts-bashisms.patch
+30-ibhosts-bashisms.patch
+32-ibrouters-bashisms.patch
+34-ibswitches-bashisms.patch
diff --git a/debian/rules b/debian/rules
index 432d873..8863ac1 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
-
+ rm -f build-stamp config.sub config.guess
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-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.
@@ -92,8 +102,6 @@ install: build
chrpath -d debian/infiniband-diags/usr/sbin/saquery
chrpath -d debian/infiniband-diags/usr/sbin/smpquery
- install -D -m 644 debian/lintian-overrides debian/infiniband-diags/usr/share/lintian/overrides/infiniband-diags
-
# Build architecture-independent files here.
binary-indep: install
# We have nothing to do by default.
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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/infiniband-diags.git
More information about the Pkg-ofed-commits
mailing list