Change Debian build system from cdbs to debhelper 7

Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/debian/changelog b/debian/changelog
index ae364f32a799e12354c1acfbcdb7587575a7792a..b13c0fd97dda7a88d9ab96ec8686ddd238a9596f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libmlx4 (1.0.1-2) UNRELEASED; urgency=low
   * Update maintainer and set DM-Upload-Allowed to yes.  (Closes: #632108)
   * Switch to dpkg-source 3.0 (quilt) format.
   * Don't ship .la files.  (Closes: #621664)
+  * Change build system from cdbs to debhelper 7.
 
- -- Roland Dreier <roland@localhost>  Wed, 06 Jul 2011 01:17:18 -0700
+ -- Roland Dreier <roland@digitalvampire.org>  Wed, 06 Jul 2011 01:20:43 -0700
 
 libmlx4 (1.0.1-1) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..56277f3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,48 @@
+Source: libmlx4
+Priority: extra
+Maintainer: Roland Dreier <roland@digitalvampire.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), libibverbs-dev (>= 1.0)
+Standards-Version: 3.8.2
+Section: libs
+Homepage: http://www.openfabrics.org/
+
+Package: libmlx4-1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ low latency and low overhead.
+ .
+ This package contains the loadable plug-in.
+
+Package: libmlx4-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libmlx4-1 (= ${binary:Version})
+Description: Development files for the libmlx4 driver
+ 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
+ low latency and low overhead.
+ .
+ This package contains static versions of libmlx4 that may be linked
+ directly to an application, which may be useful for debugging.
+
+Package: libmlx4-1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, libmlx4-1 (= ${binary:Version})
+Description: Debugging symbols for the libmlx4 driver
+ 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
+ low latency and low overhead.
+ .
+ This package contains the debugging symbols associated with
+ libmlx4-1. They will automatically be used by gdb for debugging
+ libmlx4-related issues.

diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644 (file)
index 55018b3..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,48 +0,0 @@
-Source: libmlx4
-Priority: extra
-Maintainer: Roland Dreier <roland@digitalvampire.org>
-DM-Upload-Allowed: yes
-Build-Depends: @cdbs@, libibverbs-dev (>= 1.0)
-Standards-Version: 3.8.2
-Section: libs
-Homepage: http://www.openfabrics.org/
-
-Package: libmlx4-1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-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
- low latency and low overhead.
- .
- This package contains the loadable plug-in.
-
-Package: libmlx4-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, libmlx4-1 (= ${binary:Version})
-Description: Development files for the libmlx4 driver
- 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
- low latency and low overhead.
- .
- This package contains static versions of libmlx4 that may be linked
- directly to an application, which may be useful for debugging.
-
-Package: libmlx4-1-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, libmlx4-1 (= ${binary:Version})
-Description: Debugging symbols for the libmlx4 driver
- 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
- low latency and low overhead.
- .
- This package contains the debugging symbols associated with
- libmlx4-1. They will automatically be used by gdb for debugging
- libmlx4-related issues.

diff --git a/debian/rules b/debian/rules
index 3e70bc38f9078bdb8704d62f60ce472fd8efbea9..b0252a05c9980cab486317a2d3bb2686c1e31d75 100755 (executable)
--- 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: