Update Debian build

Use DEB_AUTO_UPDATE_LIBTOOL rather than manual rerunning autotools to
avoid setting RPATH.  Remove DEB_DH_STRIP_ARGS since cdbs should
handle this automatically at debhelper compat level 5.  Let cdbs
generate build-deps automatically (move control to control.in).

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/debian/changelog b/debian/changelog
index 4041b6bfa0cf12b8d5d24099a2415572b151aa15..48da3c7763dd839713fc0c2a779ebf6c1f1c68a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,9 @@ libibverbs (1.1-1) unstable; urgency=low
     - New method of finding and loading device-specific drivers.
     - Add basic support for iWARP devices.
     - Provide compatible ABI for applications linked against libibverbs 1.0.
-  * Rerun autotools to avoid setting RPATH in binaries on amd64.
+  * Update libtool during build to avoid setting RPATH in binaries on amd64.
 
- -- Roland Dreier <rolandd@cisco.com>  Thu, 12 Apr 2007 11:49:14 -0700
+ -- Roland Dreier <rolandd@cisco.com>  Sat, 28 Apr 2007 14:15:29 -0700
 
 libibverbs (1.0.4-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index d9f9a06..0000000
--- a/debian/control
+++ /dev/null
@@ -1,79 +0,0 @@
-Source: libibverbs
-Priority: extra
-Maintainer: Roland Dreier <rolandd@cisco.com>
-Build-Depends: cdbs (>= 0.4.25-1), debhelper (>= 5), autotools-dev
-Standards-Version: 3.7.2
-Section: libs
-
-Package: libibverbs1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Description: A library for direct userspace use of InfiniBand
- libibverbs is a library that allows userspace processes to use
- InfiniBand "verbs" as described in the InfiniBand Architecture
- Specification.  InfiniBand is a high-throughput, low-latency
- networking technology.  InfiniBand host channel adapters (HCAs)
- commonly support direct hardware access from userspace (kernel
- bypass), and libibverbs supports this when available.
- .
- For this library to be useful, a device-specific plug-in module
- should also be installed.
- .
- This package contains the shared library.
- .
-  Homepage: http://www.openfabrics.org/
-
-Package: libibverbs-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, libibverbs1 (= ${Source-Version})
-Description: Development files for the libibverbs library
- libibverbs is a library that allows userspace processes to use
- InfiniBand "verbs" as described in the InfiniBand Architecture
- Specification.  InfiniBand is a high-throughput, low-latency
- networking technology.  InfiniBand host channel adapters (HCAs)
- commonly support direct hardware access from userspace (kernel
- bypass), and libibverbs supports this when available.
- .
- This package is needed to compile programs against libibverbs1.
- It contains the header files and static libraries (optionally)
- needed for compiling.
- .
-  Homepage: http://www.openfabrics.org/
-
-Package: libibverbs1-dbg
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, libibverbs1 (= ${Source-Version})
-Description: Debugging symbols for the libibverbs library
- libibverbs is a library that allows userspace processes to use
- InfiniBand "verbs" as described in the InfiniBand Architecture
- Specification.  InfiniBand is a high-throughput, low-latency
- networking technology.  InfiniBand host channel adapters (HCAs)
- commonly support direct hardware access from userspace (kernel
- bypass), and libibverbs supports this when available.
- .
- This package contains the debugging symbols associated with
- libibverbs1. They will automatically be used by gdb for debugging
- libibverbs-related issues.
- .
-  Homepage: http://www.openfabrics.org/
-
-Package: ibverbs-utils
-Section: net
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Examples for the libibverbs library
- libibverbs is a library that allows userspace processes to use
- InfiniBand "verbs" as described in the InfiniBand Architecture
- Specification.  InfiniBand is a high-throughput, low-latency
- networking technology.  InfiniBand host channel adapters (HCAs)
- commonly support direct hardware access from userspace (kernel
- bypass), and libibverbs supports this when available.
- .
- This package contains useful libibverbs1 example programs such as
- ibv_devinfo, which displays information about InfiniBand devices.
- .
-  Homepage: http://www.openfabrics.org/

diff --git a/debian/control.in b/debian/control.in
new file mode 100644 (file)
index 0000000..867f021
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,79 @@
+Source: libibverbs
+Priority: extra
+Maintainer: Roland Dreier <rolandd@cisco.com>
+Build-Depends: @cdbs@
+Standards-Version: 3.7.2
+Section: libs
+
+Package: libibverbs1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Description: A library for direct userspace use of InfiniBand
+ libibverbs is a library that allows userspace processes to use
+ InfiniBand "verbs" as described in the InfiniBand Architecture
+ Specification.  InfiniBand is a high-throughput, low-latency
+ networking technology.  InfiniBand host channel adapters (HCAs)
+ commonly support direct hardware access from userspace (kernel
+ bypass), and libibverbs supports this when available.
+ .
+ For this library to be useful, a device-specific plug-in module
+ should also be installed.
+ .
+ This package contains the shared library.
+ .
+  Homepage: http://www.openfabrics.org/
+
+Package: libibverbs-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libibverbs1 (= ${Source-Version})
+Description: Development files for the libibverbs library
+ libibverbs is a library that allows userspace processes to use
+ InfiniBand "verbs" as described in the InfiniBand Architecture
+ Specification.  InfiniBand is a high-throughput, low-latency
+ networking technology.  InfiniBand host channel adapters (HCAs)
+ commonly support direct hardware access from userspace (kernel
+ bypass), and libibverbs supports this when available.
+ .
+ This package is needed to compile programs against libibverbs1.
+ It contains the header files and static libraries (optionally)
+ needed for compiling.
+ .
+  Homepage: http://www.openfabrics.org/
+
+Package: libibverbs1-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, libibverbs1 (= ${Source-Version})
+Description: Debugging symbols for the libibverbs library
+ libibverbs is a library that allows userspace processes to use
+ InfiniBand "verbs" as described in the InfiniBand Architecture
+ Specification.  InfiniBand is a high-throughput, low-latency
+ networking technology.  InfiniBand host channel adapters (HCAs)
+ commonly support direct hardware access from userspace (kernel
+ bypass), and libibverbs supports this when available.
+ .
+ This package contains the debugging symbols associated with
+ libibverbs1. They will automatically be used by gdb for debugging
+ libibverbs-related issues.
+ .
+  Homepage: http://www.openfabrics.org/
+
+Package: ibverbs-utils
+Section: net
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Examples for the libibverbs library
+ libibverbs is a library that allows userspace processes to use
+ InfiniBand "verbs" as described in the InfiniBand Architecture
+ Specification.  InfiniBand is a high-throughput, low-latency
+ networking technology.  InfiniBand host channel adapters (HCAs)
+ commonly support direct hardware access from userspace (kernel
+ bypass), and libibverbs supports this when available.
+ .
+ This package contains useful libibverbs1 example programs such as
+ ibv_devinfo, which displays information about InfiniBand devices.
+ .
+  Homepage: http://www.openfabrics.org/

diff --git a/debian/rules b/debian/rules
index 01b7505c5883065d7bc04a84e9e0a69de1675b61..3e70bc38f9078bdb8704d62f60ce472fd8efbea9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_DH_STRIP_ARGS := --dbg-package=libibverbs1-dbg
+DEB_AUTO_UPDATE_LIBTOOL := post
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk