[Pkg-ofed-commits] [libmlx4] 06/17: Import Debian patch 1.0.2-1

[Ana Beatriz Guerrero López]

This is an automated email from the git hooks/post-receive script.

ana pushed a commit to branch master
in repository libmlx4.

commit e8c3ce62b018510ca493e7c2381fd68314aa4a70
Author: Roland Dreier <roland at digitalvampire.org>
Date:   Wed Jul 6 13:32:18 2011 -0700

    Import Debian patch 1.0.2-1
---
 debian/changelog                             | 18 ++++++++++++++++++
 debian/compat                                |  2 +-
 debian/control                               | 11 ++++++-----
 debian/libmlx4-1.install                     |  2 +-
 debian/patches/driver-plugin-directory.patch | 10 ++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 | 10 ++++++----
 debian/source/format                         |  1 +
 debian/watch                                 |  3 +++
 9 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 673b74e..801ef23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+libmlx4 (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fix potential problems running under Valgrind.
+    - Add support for resize CQ operation.
+    - Fix other minor bugs.
+  * Update maintainer and set DM-Upload-Allowed to yes.  (Closes: #632108)
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Acknowledge NMU (Closes: #621664).
+  * Change build system from cdbs to debhelper 7.
+  * Use libibverbs 1.1.3 feature to move plugin to /usr/lib/libibverbs
+    to fix multiple problems with a not-exactly-shlib in /usr/lib.
+  * Add debian/watch file.
+  * Move -dbg package to section debug.
+  * Update to Standards-Version: 3.9.2.
+
+ -- Roland Dreier <roland at digitalvampire.org>  Wed, 06 Jul 2011 13:32:18 -0700
+
 libmlx4 (1.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index d6f3ce7..0f30c86 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: libmlx4
 Priority: extra
-Maintainer: Roland Dreier <rolandd at cisco.com>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), libtool, libibverbs-dev (>= 1.0)
-Standards-Version: 3.7.3
+Maintainer: Roland Dreier <roland at digitalvampire.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), libibverbs-dev (>= 1.0)
+Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.openfabrics.org/
 
@@ -10,7 +11,7 @@ Package: libmlx4-1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A userspace driver for Mellanox ConnectX InfiniBand HCAs
+Description: Userspace driver for Mellanox ConnectX InfiniBand HCAs
  libmlx4 is a device-specific driver for Mellanox ConnectX InfiniBand
  host channel adapters (HCAs) for the libibverbs library.  This allows
  userspace processes to access Mellanox HCA hardware directly with
@@ -32,7 +33,7 @@ Description: Development files for the libmlx4 driver
  directly to an application, which may be useful for debugging.
 
 Package: libmlx4-1-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, libmlx4-1 (= ${binary:Version})
diff --git a/debian/libmlx4-1.install b/debian/libmlx4-1.install
index a64e17d..8cab406 100644
--- a/debian/libmlx4-1.install
+++ b/debian/libmlx4-1.install
@@ -1,2 +1,2 @@
-usr/lib/libmlx4-rdmav2.so
+usr/lib/libmlx4-rdmav2.so		/usr/lib/libibverbs/
 etc/libibverbs.d/mlx4.driver
diff --git a/debian/patches/driver-plugin-directory.patch b/debian/patches/driver-plugin-directory.patch
new file mode 100644
index 0000000..fd73a73
--- /dev/null
+++ b/debian/patches/driver-plugin-directory.patch
@@ -0,0 +1,10 @@
+Description: Tell libibverbs to look in /usr/lib/libibverbs for plugin library
+Author: Roland Dreier <roland at digitalvampire.org>
+
+Index: libmlx4.git/mlx4.driver
+===================================================================
+--- libmlx4.git.orig/mlx4.driver	2011-07-06 01:27:34.521058451 -0700
++++ libmlx4.git/mlx4.driver	2011-07-06 01:27:47.051074172 -0700
+@@ -1 +1 @@
+-driver mlx4
++driver /usr/lib/libibverbs/libmlx4
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..213f49e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+driver-plugin-directory.patch
diff --git a/debian/rules b/debian/rules
index 3e70bc3..b0252a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_AUTO_UPDATE_LIBTOOL := post
+%:
+	dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+override_dh_strip:
+	dh_strip --dbg-package=libmlx4-1-dbg
+
+override_dh_makeshlibs:
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)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..06bae51
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/-rc/~rc/" \
+  http://www.openfabrics.org/downloads/mlx4/libmlx4-(.+)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libmlx4.git