Package: ibutils
Followup-For: Bug #664426

Hi Benoit,

Here are some more fixes to the original message. Alternatively you
can download the archive from Debian with all the changes.

Jari

>From ac697f9e781a343bcaab9206dac8f492ac0b0ea4 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 4 Apr 2012 12:59:31 +0300
Subject: [PATCH] nmu
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
 debian/changelog                  |   12 +++++++++---
 debian/libibdm-dev.install        |    2 +-
 debian/libibdm1.lintian-overrides |    4 ++--
 debian/rules                      |    9 +++++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d50a630..55a616c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
 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".
+  * Non-maintainer upload; ACKed by the maintainer, see #664426.
+  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+    (Closes: #664426).
   * 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.
+  * Add build-arch and build-indep targets.
+  * Fix unused-override (Lintian) by adjusting paths in debian/*-overrides.
+  * Fix non-empty-dependency_libs-in-la-file by not installing *.la files;
+    no reverse depends on them exist. For more information, see
+    http://wiki.debian.org/ReleaseGoals/LAFileRemoval
 
- -- Jari Aalto <jari.aa...@cante.net>  Wed, 29 Feb 2012 12:21:58 -0500
+ -- Jari Aalto <jari.aa...@cante.net>  Wed, 04 Apr 2012 12:36:59 +0300
 
 ibutils (1.2-OFED-1.4.2-1.1) unstable; urgency=medium
 
diff --git a/debian/libibdm-dev.install b/debian/libibdm-dev.install
index 3d2e10e..e7a3896 100644
--- a/debian/libibdm-dev.install
+++ b/debian/libibdm-dev.install
@@ -1,4 +1,4 @@
 usr/include
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/lib*.la
+
diff --git a/debian/libibdm1.lintian-overrides b/debian/libibdm1.lintian-overrides
index 6e4e097..b65c198 100644
--- a/debian/libibdm1.lintian-overrides
+++ b/debian/libibdm1.lintian-overrides
@@ -1,3 +1,3 @@
-libibdm1: executable-not-elf-or-script ./usr/lib/ibdm1.2/ibnl/MTS3610.ibnl
-libibdm1: executable-not-elf-or-script ./usr/lib/ibdm1.2/ibnl/MTS3600.ibnl
+libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3610.ibnl
+libibdm1: executable-not-elf-or-script usr/lib/ibdm1.2/ibnl/MTS3600.ibnl
 
diff --git a/debian/rules b/debian/rules
index 4d06856..07757f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,9 @@ config.status: configure
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
 	 --sysconfdir=/etc  --with-graphviz-lib=/usr/lib/graphbiz/tcl
 
+build-arch: build
+build-indep: build
+
 build: build-stamp
 
 build-stamp:  config.status 
@@ -45,9 +48,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config.guess config.sub
-	find . -type d \
-		-name .deps \
-		-o -name .libs \
+	find . -type d -name .libs \
 		| xargs --no-run-if-empty rm -rf
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) clean
@@ -74,7 +75,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_prep
+	dh_prep	 
 	dh_installdirs
 
 	# Add here commands to install the package into debian/ibutils.
-- 
1.7.9.1

Reply via email to