r11435 - in /packages/unstable/nemiver/debian: changelog nemiver.install patches/ patches/99_ltmain_as-needed.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jun 10 12:12:50 2007
New Revision: 11435

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11435
Log:
* Really clean .a and .la files.
* rules: pass -z defs and --as-needed to ld to strip useless
  dependencies.
* Use simple-patchsys snippet.
* 99_ltmain_as-needed.patch: our standard patch to ltmain.sh to make
  --as-needed work with shared objects.
* Document why --with-pic is here.
* Move libnemivercommon, which is a private library, to a private 
  directory and pass a rpath globally.

Added:
    packages/unstable/nemiver/debian/patches/
    packages/unstable/nemiver/debian/patches/99_ltmain_as-needed.patch
Modified:
    packages/unstable/nemiver/debian/changelog
    packages/unstable/nemiver/debian/nemiver.install
    packages/unstable/nemiver/debian/rules

Modified: packages/unstable/nemiver/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/changelog?rev=11435&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/changelog (original)
+++ packages/unstable/nemiver/debian/changelog Sun Jun 10 12:12:50 2007
@@ -16,8 +16,17 @@
   [ Josselin Mouette ]
   * Pass --no-act to dh_makeshlibs to avoid generating a shlibs file.
   * Really use ${binary:Version} for nemiver-dbg.
+  * Really clean .a and .la files.
+  * rules: pass -z defs and --as-needed to ld to strip useless
+    dependencies.
+  * Use simple-patchsys snippet.
+  * 99_ltmain_as-needed.patch: our standard patch to ltmain.sh to make
+    --as-needed work with shared objects.
+  * Document why --with-pic is here.
+  * Move libnemivercommon, which is a private library, to a private 
+    directory and pass a rpath globally.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 10 Jun 2007 13:20:14 +0200
+ -- Josselin Mouette <joss at debian.org>  Sun, 10 Jun 2007 14:11:50 +0200
 
 nemiver (0.4.0~svnr486-0.2) unstable; urgency=low
 

Modified: packages/unstable/nemiver/debian/nemiver.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/nemiver.install?rev=11435&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/nemiver.install (original)
+++ packages/unstable/nemiver/debian/nemiver.install Sun Jun 10 12:12:50 2007
@@ -1,7 +1,7 @@
+debian/tmp/etc/gconf
 debian/tmp/usr/share
 debian/tmp/usr/lib/nemiver/config
-debian/tmp/usr/lib/nemiver/modules
+debian/tmp/usr/lib/nemiver/modules/*.so
 debian/tmp/usr/lib/nemiver/plugins
-debian/tmp/usr/lib/libnemivercommon.so.0.0.0
-debian/tmp/usr/lib/libnemivercommon.so.0
+debian/tmp/usr/lib/libnemivercommon.so.* /usr/lib/nemiver
 debian/tmp/usr/bin/nemiver

Added: packages/unstable/nemiver/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/patches/99_ltmain_as-needed.patch?rev=11435&op=file
==============================================================================
--- packages/unstable/nemiver/debian/patches/99_ltmain_as-needed.patch (added)
+++ packages/unstable/nemiver/debian/patches/99_ltmain_as-needed.patch Sun Jun 10 12:12:50 2007
@@ -1,0 +1,32 @@
+Index: nautilus-2.18.1/ltmain.sh
+===================================================================
+--- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
++++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
+@@ -1784,6 +1784,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++      
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2124,6 +2129,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

Modified: packages/unstable/nemiver/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nemiver/debian/rules?rev=11435&op=diff
==============================================================================
--- packages/unstable/nemiver/debian/rules (original)
+++ packages/unstable/nemiver/debian/rules Sun Jun 10 12:12:50 2007
@@ -3,14 +3,22 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS +=--with-pic
-DEB_SHLIBDEPS_LIBRARY_nemiver += libnemivercommon.so.0.0.0
-DEB_SHLIBDEPS_INCLUDE_nemiver += debian/nemiver/usr/lib
+# Because there is a convenience library that is only built statically 
+# but linked in shared objects, it should be built with -fPIC
+# It should be fixed upstream later.
+DEB_CONFIGURE_EXTRA_FLAGS += --with-pic
+
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
 
-binary-install/nemiver::
-	-find debian/tmp/usr/lib -type f -name "*.a" -exec rm {} \;
-	-find debian/tmp/usr/lib -type f -name "*.la" -exec rm {} \;
+# Currently set the rpath globally to avoid having libnemivercommon in 
+# /usr/lib while this private library isn't properly versioned.
+# It should also be fixed upstream later.
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -Wl,-rpath,/usr/lib/nemiver
+
+binary-post-install/nemiver::
+	-find debian/nemiver/usr/lib -type f -name "*.a" -exec rm {} \;
+	-find debian/nemiver/usr/lib -type f -name "*.la" -exec rm {} \;