Rename Debian package back to libibverbs1

Since commit fd448acc ("Add ABI compatibility for apps linked against
libibverbs 1.0") makes libibverbs 1.1 binary compatible with
applications linked against libibverbs 1.0 and the soname of the
library remains at 1, change the Debian package back to libibverbs1
instead of bumping it to libibverbs2.

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

diff --git a/Makefile.am b/Makefile.am
index 4c7ce9bf55db0d27b9c863dfa055a0d537f22475..92f3e492c382aa656bdb4b962e77af81909b84e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,8 +43,8 @@ man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1 \
     man/ibv_srq_pingpong.1
 
 DEBIAN = debian/changelog debian/compat debian/control debian/copyright \
-    debian/ibverbs-utils.install debian/libibverbs2.install \
-    debian/libibverbs2.postinst debian/libibverbs-dev.install \
+    debian/ibverbs-utils.install debian/libibverbs1.install \
+    debian/libibverbs1.postinst debian/libibverbs-dev.install \
     debian/rules
 
 EXTRA_DIST = include/infiniband/driver.h include/infiniband/kern-abi.h \

diff --git a/debian/control b/debian/control
index e671aaa51e9fe8a4a9aa6a5b109e7827729ecf73..d9f9a06ab486d55876b2b446a72a1face6108868 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Build-Depends: cdbs (>= 0.4.25-1), debhelper (>= 5), autotools-dev
 Standards-Version: 3.7.2
 Section: libs
 
-Package: libibverbs2
+Package: libibverbs1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
@@ -27,7 +27,7 @@ Description: A library for direct userspace use of InfiniBand
 Package: libibverbs-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libibverbs2 (= ${Source-Version})
+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
@@ -36,17 +36,17 @@ Description: Development files for the libibverbs library
  commonly support direct hardware access from userspace (kernel
  bypass), and libibverbs supports this when available.
  .
- This package is needed to compile programs against libibverbs2.
+ 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: libibverbs2-dbg
+Package: libibverbs1-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, libibverbs2 (= ${Source-Version})
+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
@@ -56,7 +56,7 @@ Description: Debugging symbols for the libibverbs library
  bypass), and libibverbs supports this when available.
  .
  This package contains the debugging symbols associated with
- libibverbs2. They will automatically be used by gdb for debugging
+ libibverbs1. They will automatically be used by gdb for debugging
  libibverbs-related issues.
  .
   Homepage: http://www.openfabrics.org/
@@ -73,7 +73,7 @@ Description: Examples for the libibverbs library
  commonly support direct hardware access from userspace (kernel
  bypass), and libibverbs supports this when available.
  .
- This package contains useful libibverbs2 example programs such as
+ 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/libibverbs1.install b/debian/libibverbs1.install
new file mode 100644 (file)
index 0000000..0f3523d
--- /dev/null
+++ b/debian/libibverbs1.install
@@ -0,0 +1 @@
+usr/lib/libibverbs*.so.*

diff --git a/debian/libibverbs1.postinst b/debian/libibverbs1.postinst
new file mode 100644 (file)
index 0000000..f7d2ee6
--- /dev/null
+++ b/debian/libibverbs1.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+# postinst script for libibverbs1
+
+set -e
+
+if [ "$1" != configure ]; then
+    exit 0
+fi
+
+getent group rdma > /dev/null 2>&1 || addgroup --system --quiet rdma
+
+#DEBHELPER#

diff --git a/debian/libibverbs2.install b/debian/libibverbs2.install
deleted file mode 100644 (file)
index 0f3523d..0000000
--- a/debian/libibverbs2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libibverbs*.so.*

diff --git a/debian/libibverbs2.postinst b/debian/libibverbs2.postinst
deleted file mode 100644 (file)
index f7d2ee6..0000000
--- a/debian/libibverbs2.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# postinst script for libibverbs1
-
-set -e
-
-if [ "$1" != configure ]; then
-    exit 0
-fi
-
-getent group rdma > /dev/null 2>&1 || addgroup --system --quiet rdma
-
-#DEBHELPER#