debian: some lintian fixes

Note that I'm moving some library SONAME version backwards!
Otherwise we'd have to rename libceph to libceph1, etc.  And
that's lame.

diff --git a/debian/libceph-dev.install b/debian/libceph-dev.install
index 9b7f55a15ac0fe74d3030d436fdd677efd518dec..56d50b92fa23938112711f328cefe2bf1b9d1956 100644 (file)
--- a/debian/libceph-dev.install
+++ b/debian/libceph-dev.install
@@ -1,3 +1,4 @@
+/usr/lib/libceph.so
 /usr/lib/libceph.a
 /usr/lib/libceph.la
 /usr/include/ceph/libceph.h

diff --git a/debian/libceph.install b/debian/libceph.install
index 18b2af16b549c36b569a007cecf59d1d9e4aa87c..de0173ec5c3e4657f78655bd6d14f2e324f97284 100644 (file)
--- a/debian/libceph.install
+++ b/debian/libceph.install
@@ -1,2 +1,2 @@
-/usr/lib/libceph.so*
+/usr/lib/libceph.so.*
 

diff --git a/debian/libceph.postinst b/debian/libceph.postinst
new file mode 100644 (file)
index 0000000..df6b9fc
--- /dev/null
+++ b/debian/libceph.postinst
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+       ldconfig
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/libcrush-dev.install b/debian/libcrush-dev.install
index 542017a969b1045c3acd15fa4be5b043bc3dfbad..63e47212f473a05534174a563c6c9ac916e1edaa 100644 (file)
--- a/debian/libcrush-dev.install
+++ b/debian/libcrush-dev.install
@@ -1,3 +1,4 @@
+/usr/lib/libcrush.so
 /usr/lib/libcrush.a
 /usr/lib/libcrush.la
 /usr/include/crush/hash.h

diff --git a/debian/libcrush.install b/debian/libcrush.install
index 441285c783fb0026f026cdeb640b6bf3f4f4c8be..8954117f957fdcefe68e200952270b2b0d16732d 100644 (file)
--- a/debian/libcrush.install
+++ b/debian/libcrush.install
@@ -1,2 +1,2 @@
-/usr/lib/libcrush.so*
+/usr/lib/libcrush.so.*
 

diff --git a/debian/libcrush.postinst b/debian/libcrush.postinst
new file mode 100644 (file)
index 0000000..df6b9fc
--- /dev/null
+++ b/debian/libcrush.postinst
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+       ldconfig
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/librados-dev.install b/debian/librados-dev.install
index 6b840a8c23781ea507af99be69c6bd4252105f5d..dd306ff761214456fdd1c8a2db8cc3cd0f836588 100644 (file)
--- a/debian/librados-dev.install
+++ b/debian/librados-dev.install
@@ -1,3 +1,4 @@
+/usr/lib/librados.so
 /usr/lib/librados.a
 /usr/lib/librados.la
 /usr/include/rados/librados.h
\ No newline at end of file

diff --git a/debian/librados.install b/debian/librados.install
index eca2637d461a1a7eaf5872c213c9f6952c32adff..49e2fd5e2d60b20f6a2e1bff3bd743fd418d7ac0 100644 (file)
--- a/debian/librados.install
+++ b/debian/librados.install
@@ -1,2 +1,2 @@
-/usr/lib/librados.so*
+/usr/lib/librados.so.*
 

diff --git a/debian/librados.postinst b/debian/librados.postinst
new file mode 100644 (file)
index 0000000..df6b9fc
--- /dev/null
+++ b/debian/librados.postinst
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+       ldconfig
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/rules b/debian/rules
index 774ae04fbac0d87ea609a48910057ee261111d6d..6bc0aa220f02214d0419ba3b5823b7e66c1af5c4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install
        dh_compress
        dh_fixperms
 #      dh_perl
-#      dh_makeshlibs
+       dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol

diff --git a/src/Makefile.am b/src/Makefile.am
index 9bf20b16d28083c3b5f29b8b27b42ea00e580dd7..4577971280a2ac866d17088d6e1f86e6b8bad62a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,7 +111,7 @@ libceph_la_SOURCES = \
        ${libosdc_a_SOURCES}
 libceph_la_CFLAGS = ${AM_CFLAGS}
 libceph_la_CXXFLAGS= ${AM_CXXFLAGS}
-libceph_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'ceph_.*'
+libceph_la_LDFLAGS = -version-info 0:0:0 -export-symbols-regex 'ceph_.*'
 lib_LTLIBRARIES += libceph.la
 
 testceph_SOURCES = client/testceph.cc
@@ -135,7 +135,7 @@ librados_SOURCES = \
 librados_la_SOURCES = ${librados_SOURCES}
 librados_la_CFLAGS = ${AM_CFLAGS}
 librados_la_CXXFLAGS = ${AM_CXXFLAGS}
-librados_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'rados_.*'
+librados_la_LDFLAGS = -version-info 0:0:0 -export-symbols-regex 'rados_.*'
 lib_LTLIBRARIES += librados.la
 librados_a_SOURCES = ${librados_SOURCES}
 librados_a_CFLAGS = ${AM_CFLAGS}
@@ -202,7 +202,7 @@ libhadoopcephfs_la_SOURCES = client/hadoop/CephFSInterface.cc
 libhadoopcephfs_la_LIBADD = libceph.la libcrush.la
 libhadoopcephfs_la_CFLAGS = ${AM_CFLAGS}
 libhadoopcephfs_la_CXXFLAGS = ${AM_CXXFLAGS}
-libhadoopcephfs_la_LDFLAGS = -version-info 1:0:0 -export-symbols-regex 'hadoopcephfs_.*'
+libhadoopcephfs_la_LDFLAGS = -version-info 0:0:0 -export-symbols-regex 'hadoopcephfs_.*'
 lib_LTLIBRARIES += libhadoopcephfs.la
 endif