Package: ibutils
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
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 61f181d5bda1006f42987fd2503c8c21f67089a2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 12:36:57 -0500
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 | 10 ++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 3 -
...pomatch_diff.dpatch => 01_topomatch_diff.patch} | 8 +---
...{02_sysdef_diff.dpatch => 02_sysdef_diff.patch} | 8 +---
debian/patches/series | 3 +
debian/rules | 46 +++++++++++---------
debian/source/format | 1 +
10 files changed, 46 insertions(+), 41 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_topomatch_diff.dpatch => 01_topomatch_diff.patch} (68%)
rename debian/patches/{02_sysdef_diff.dpatch => 02_sysdef_diff.patch} (65%)
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 5277a9f..d50a630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ibutils (1.2-OFED-1.4.2-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * In debian/rules::clean make sure to delete all files even if Makefile
+ is not available.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 29 Feb 2012 12:21:58 -0500
+
ibutils (1.2-OFED-1.4.2-1.1) unstable; urgency=medium
* Non-maintainer upload.
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 d7f2d7e..a3cb04d 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), autotools-dev, dpatch, chrpath, swig, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), autotools-dev, chrpath, swig, graphviz, libibcommon-dev, libibumad-dev, tcl8.4-dev, tk8.4-dev, libopensm2-dev (>=3.2.5)
+Standards-Version: 3.9.3
Homepage: http://www.openfabrics.org
Package: ibutils
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 146e41b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_topomatch_diff
-02_sysdef_diff
-
diff --git a/debian/patches/01_topomatch_diff.dpatch b/debian/patches/01_topomatch_diff.patch
similarity index 68%
rename from debian/patches/01_topomatch_diff.dpatch
rename to debian/patches/01_topomatch_diff.patch
index 7d9ca87..89b4de4 100644
--- a/debian/patches/01_topomatch_diff.dpatch
+++ b/debian/patches/01_topomatch_diff.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_topomatch_diff.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix char * problem
+From: <benoit.mort...@opensides.be>
+Subject: fix char * problem
-@DPATCH@
--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/TopoMatch.cpp
+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/TopoMatch.cpp
diff --git a/debian/patches/02_sysdef_diff.dpatch b/debian/patches/02_sysdef_diff.patch
similarity index 65%
rename from debian/patches/02_sysdef_diff.dpatch
rename to debian/patches/02_sysdef_diff.patch
index 810dfc4..496de0d 100644
--- a/debian/patches/02_sysdef_diff.dpatch
+++ b/debian/patches/02_sysdef_diff.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_sysdef_diff.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix char * problem
+From: <benoit.mort...@opensides.be>
+Subject: fix char * problem
-@DPATCH@
--- ibutils-1.2-OFED-1.4.2.orig/ibdm/ibdm/SysDef.cpp
+++ ibutils-1.2-OFED-1.4.2/ibdm/ibdm/SysDef.cpp
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d87f337
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_topomatch_diff.patch
+02_sysdef_diff.patch
+
diff --git a/debian/rules b/debian/rules
index 526f0db..0925dc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,15 +22,11 @@ endif
-config.status: patch configure
+config.status: configure
dh_testdir
# 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)" \
--sysconfdir=/etc --with-graphviz-lib=/usr/lib/graphbiz/tcl
@@ -45,32 +41,40 @@ build-stamp: config.status
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
-
+ rm -f build-stamp config.guess config.sub
+ find . -type d \
+ -name .deps \
+ -o -name .libs \
+ | xargs --no-run-if-empty rm -rf
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) clean
-
- rm -f config.sub config.guess config.status config.log Makefile
+ find . -type f \
+ -name Makefile \
+ -o -name libtool \
+ -o -name "*.[ao]" \
+ -o -name "*.l[ao]" \
+ | xargs --no-run-if-empty rm -f
+ rm -f \
+ ibdiag/src/ibdiagnet \
+ ibdiag/src/ibdiagpath \
+ ibdiag/src/ibdiagui \
+ ibdm/ibdm/ibdmsh \
+ ibdm/src/ibdmchk \
+ ibdm/src/ibdmtr \
+ ibdm/src/ibnlparse \
+ ibdm/src/ibtopodiff \
+ ibis/src/ibis
+ rm -f config.sub config.guess config.status config.log ibutils.spec
rm -f ibdiag/config.status ibdiag/config.log ibdm/config.status ibdm/config.log ibis/config.status ibis/config.log
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
- dh_prep
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/ibutils.
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
