[Pkg-ceph-commits] [ceph] 01/01: exclude jni libraries in libcephfs-jni to avoid pointless ldconfig calls in maintainer scripts

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository ceph.

commit 0d2d51edeed3ebd258ca272d33af7d94d6c46b8b
Author: James Page <james.page at ubuntu.com>
Date:   Thu Sep 19 10:55:11 2013 +0100

     exclude jni libraries in libcephfs-jni to avoid pointless ldconfig calls in maintainer scripts
---
 debian/changelog |   17 +++++++++--------
 debian/rules     |    7 ++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d3a727..197cd75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,18 +6,17 @@ ceph (0.67.3-1) UNRELEASED; urgency=low
   * Sync with Ubuntu.
 
   [ James Page ]
-  * debian/control,rules,libcephfs-{java,jni}: Enable Java CephFS library,
+  * d/control,rules,libcephfs-{java,jni}: Enable Java CephFS library,
     add new BD's on javahelper and default-jdk, add dbg package.
-  * debian/control: Add new BD on libboost-thread-dev for RADOS Gateway
+  * d/control: Add new BD on libboost-thread-dev for RADOS Gateway
     keystone integration.
-  * debian/{control,obsync.install}: Drop obsync package inline with
+  * d/{control,obsync.install}: Drop obsync package inline with
     upstream.
-  * debian/librbd-dev.install: Pickup new features.h file.
-  * Remove manual calls to ldconfig (LP: #1017978):
-    - debian/lib{rados2|rbd1|cephfs1}.post*: Dropped - all these do is call
+  * d/librbd-dev.install: Pickup new features.h file.
+  * Remove manual calls to ldconfig:
+    - d/lib{rados2|rbd1|cephfs1}.post*: Dropped - all these do is call
       ldconfig which will automatically be done. 
-    - debian/rules: Let dh_makeshlibs do its magic with postinst/postrm
-      scripts but ensure that the .so's in ceph package are excluded.
+    - d/rules: Let dh_makeshlibs do its magic with postinst/postrm.
   * d/tests/*: Added autopkgtests for librbd, librados, python-ceph
     and the ceph CLI.
   * d/control: Fix versions of librbd1, librados2 and libcephfs1 for
@@ -26,6 +25,8 @@ ceph (0.67.3-1) UNRELEASED; urgency=low
     (Closes: #722957).
   * d/rules: Drop --upstart-only from dh_installinit calls for upstart
     configurations; this is deprecated in Ubuntu and not support in Debian.
+  * d/rules: Exclude jni package from shlibs generation to avoid pointless
+    ldconfig calls in maintainer scripts.
 
   [ Bastian Blank ]
   * Use debhelper 9.
diff --git a/debian/rules b/debian/rules
index 2222589..5c3acc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,4 +89,9 @@ override_dh_strip:
 	dh_strip -plibrados-dev
 	dh_strip -plibcephfs-jni --dbg-package=libcephfs-jni-dbg
 
-.PHONY: override_dh_auto_configure override_dh_installinit override_dh_strip
+override_dh_makeshlibs:
+	# exclude jni libraries in libcephfs-jni to avoid pointless ldconfig
+	# calls in maintainer scripts
+	dh_makeshlibs -X/usr/lib/jni
+
+.PHONY: override_dh_auto_configure override_dh_installinit override_dh_strip override_dh_makeshlibs

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git