From: Sage Weil Date: Wed, 28 Oct 2009 17:10:52 +0000 (-0700) Subject: debian: some lintian fixes X-Git-Tag: v0.18~171^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd41a8dfddfbf20de9be6336a55ffafe844b404d;p=ceph.git 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 9b7f55a15ac0..56d50b92fa23 100644 --- 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 18b2af16b549..de0173ec5c3e 100644 --- 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 index 000000000000..df6b9fcb3dbd --- /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: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# 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 542017a969b1..63e47212f473 100644 --- 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 441285c783fb..8954117f957f 100644 --- 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 index 000000000000..df6b9fcb3dbd --- /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: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# 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 6b840a8c2378..dd306ff76121 100644 --- 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 eca2637d461a..49e2fd5e2d60 100644 --- 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 index 000000000000..df6b9fcb3dbd --- /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: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# 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 774ae04fbac0..6bc0aa220f02 100755 --- 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 9bf20b16d280..4577971280a2 100644 --- 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