Package: libibumad
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 35825a3fe1a7fb42a710b1b0b903e428b2ee8c64 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 12:58:40 -0500
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/README.source | 1 -
debian/changelog | 9 +++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 2 -
...{01_Makefile-am.dpatch => 01_Makefile-am.patch} | 8 +---
debian/patches/series | 2 +
debian/rules | 34 +++++++------------
debian/source/format | 1 +
9 files changed, 30 insertions(+), 33 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_Makefile-am.dpatch => 01_Makefile-am.patch} (71%)
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 1c919f0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/dpatch/README.source.gz
diff --git a/debian/changelog b/debian/changelog
index dbc5ee1..f9beaea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libibumad (1.2.3-20090314-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * In debian/rules::clean clean up libtoolize and autoconf files.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 12:25:21 -0500
+
libibumad (1.2.3-20090314-1.1) unstable; urgency=high
* 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 6a05018..f51e473 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libibumad
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <[email protected]>
Uploaders: Benoit Mortier <[email protected]>, Guy Coates <[email protected]>, Mario Lang <[email protected]>
-Build-Depends: debhelper (>= 7), autotools-dev, automake, libtool, libibcommon-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), autotools-dev, automake, libtool, libibcommon-dev
+Standards-Version: 3.9.3
Section: libs
Homepage: http://openfabrics.org/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2c36db7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-# Remove man page install twice
-01_Makefile-am
diff --git a/debian/patches/01_Makefile-am.dpatch b/debian/patches/01_Makefile-am.patch
similarity index 71%
rename from debian/patches/01_Makefile-am.dpatch
rename to debian/patches/01_Makefile-am.patch
index ba382c0..821962d 100644
--- a/debian/patches/01_Makefile-am.dpatch
+++ b/debian/patches/01_Makefile-am.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile.dpatch by <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: twice man/umad_get_mad.3 in Makefile.am
+From: <[email protected]>
+Subject: twice man/umad_get_mad.3 in Makefile.am
-@DPATCH@
--- trunk/Makefile.am.orig 2009-10-23 22:24:33.000000000 +0200
+++ trunk/Makefile.am 2009-10-23 22:25:30.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed7ce4a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+# Remove man page install twice.patch
+01_Makefile-am.patch
diff --git a/debian/rules b/debian/rules
index a2ec8f1..89c52a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,13 +34,12 @@ major=2
config.status: configure
dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ # Save original files
+ cp -a configure configure.orig
+ cp -a config.h.in config.h.in.orig
+ # Copy newer versions
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
libtoolize --force --copy
aclocal
autoconf
@@ -49,7 +48,7 @@ endif
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --sysconfdir=/etc
-build: patch build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -58,31 +57,24 @@ 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
+ # Restore original files
+ [ ! -f configure.orig ] || mv configure.orig configure
+ [ ! -f config.h.in.orig ] || mv config.h.in.orig config.h.in
+ # Delete generated files
+ rm -f build-stamp aclocal.m4 config/ltmain.sh \
+ Makefile.in INSTALL
rm -f config.sub config.guess
-
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/tmp
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
