[Pkg-cli-libs-commits] r3482 - in /packages/gtk-sharp2/trunk/debian: changelog patches/00list patches/99_ltmain_as-needed.dpatch rules

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue Dec  4 12:46:56 2007
New Revision: 3482

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3482
Log:
* debian/rules:
  + Actually pass CFLAGS and LDFLAGS to configure
  + Use --as-needed when linking to get less dependencies.
* debian/patches/99_ltmain_as-needed.dpatch:
  + Patch used in many Gnome package to reorder the linking
    parameters so --as-needed is actually used.

Added:
    packages/gtk-sharp2/trunk/debian/patches/99_ltmain_as-needed.dpatch
Modified:
    packages/gtk-sharp2/trunk/debian/changelog
    packages/gtk-sharp2/trunk/debian/patches/00list
    packages/gtk-sharp2/trunk/debian/rules

Modified: packages/gtk-sharp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/changelog?rev=3482&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/changelog (original)
+++ packages/gtk-sharp2/trunk/debian/changelog Tue Dec  4 12:46:56 2007
@@ -1,8 +1,13 @@
-gtk-sharp2 (2.10.2-2) UNRELEASED; urgency=low
-
-  * Not released yet
-
- -- Mirco Bauer <meebey at debian.org>  Mon, 26 Nov 2007 00:26:59 +0100
+gtk-sharp2 (2.10.2-3) unstable; urgency=low
+
+  * debian/rules:
+    + Actually pass CFLAGS and LDFLAGS to configure
+    + Use --as-needed when linking to get less dependencies.
+  * debian/patches/99_ltmain_as-needed.dpatch:
+    + Patch used in many Gnome package to reorder the linking
+      parameters so --as-needed is actually used.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 04 Dec 2007 13:26:50 +0100
 
 gtk-sharp2 (2.10.2-1) unstable; urgency=low
 

Modified: packages/gtk-sharp2/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/patches/00list?rev=3482&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/patches/00list (original)
+++ packages/gtk-sharp2/trunk/debian/patches/00list Tue Dec  4 12:46:56 2007
@@ -1,2 +1,3 @@
 01_glue-locations
 02_missing_dllmaps
+99_ltmain_as-needed.dpatch

Added: packages/gtk-sharp2/trunk/debian/patches/99_ltmain_as-needed.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/patches/99_ltmain_as-needed.dpatch?rev=3482&op=file
==============================================================================
--- packages/gtk-sharp2/trunk/debian/patches/99_ltmain_as-needed.dpatch (added)
+++ packages/gtk-sharp2/trunk/debian/patches/99_ltmain_as-needed.dpatch Tue Dec  4 12:46:56 2007
@@ -1,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+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/gtk-sharp2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/trunk/debian/rules?rev=3482&op=diff
==============================================================================
--- packages/gtk-sharp2/trunk/debian/rules (original)
+++ packages/gtk-sharp2/trunk/debian/rules Tue Dec  4 12:46:56 2007
@@ -6,13 +6,16 @@
 
 include /usr/share/dpatch/dpatch.make
 
+CFLAGS ?= -O2 -Wall -g
+LDFLAGS += -Wl,--as-needed
+
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 
 config: config-stamp
 config-stamp: patch-stamp
 	dh_testdir
-	./configure --prefix=/usr RUNTIME=/usr/bin/cli
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"./configure --prefix=/usr RUNTIME=/usr/bin/cli
 	touch config-stamp
 
 build-indep: build-indep-stamp