r11377 - in /desktop/unstable/libgnomecanvas/debian: changelog control control.in patches/01_canvasassert.patch patches/99_ltmain_as-needed.patch patches/canvasassert.patch rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Jun 9 08:34:23 UTC 2007 

Author: joss
Date: Sat Jun  9 08:34:23 2007
New Revision: 11377

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11377
Log:
* Rename canvasassert.patch to 01_canvasassert.patch.
* Pass --as-needed through LDFLAGS; require cdbs 0.4.41.
* 99_ltmain_as-needed.patch: get --as-needed to work.

Added:
    desktop/unstable/libgnomecanvas/debian/patches/01_canvasassert.patch
      - copied unchanged from r11376, desktop/unstable/libgnomecanvas/debian/patches/canvasassert.patch
    desktop/unstable/libgnomecanvas/debian/patches/99_ltmain_as-needed.patch
Removed:
    desktop/unstable/libgnomecanvas/debian/patches/canvasassert.patch
Modified:
    desktop/unstable/libgnomecanvas/debian/changelog
    desktop/unstable/libgnomecanvas/debian/control
    desktop/unstable/libgnomecanvas/debian/control.in
    desktop/unstable/libgnomecanvas/debian/rules

Modified: desktop/unstable/libgnomecanvas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvas/debian/changelog?rev=11377&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvas/debian/changelog (original)
+++ desktop/unstable/libgnomecanvas/debian/changelog Sat Jun  9 08:34:23 2007
@@ -1,4 +1,4 @@
-libgnomecanvas (2.14.0-3) UNRELEASED; urgency=low
+libgnomecanvas (2.14.0-3) unstable; urgency=low
 
   [ Loic Minier ]
   * Fix watch file.
@@ -11,7 +11,12 @@
   [ Loic Minier ]
   * Add a get-orig-source target to retrieve the upstream tarball.
 
- -- Loic Minier <lool at dooz.org>  Tue,  9 Jan 2007 14:39:19 +0100
+  [ Josselin Mouette ]
+  * Rename canvasassert.patch to 01_canvasassert.patch.
+  * Pass --as-needed through LDFLAGS; require cdbs 0.4.41.
+  * 99_ltmain_as-needed.patch: get --as-needed to work.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 09 Jun 2007 10:31:51 +0200
 
 libgnomecanvas (2.14.0-2) unstable; urgency=low
 

Modified: desktop/unstable/libgnomecanvas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvas/debian/control?rev=11377&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvas/debian/control (original)
+++ desktop/unstable/libgnomecanvas/debian/control Sat Jun  9 08:34:23 2007
@@ -2,9 +2,9 @@
 Section: devel
 Priority: optional
 Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastien Bacher <seb128 at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libart-2.0-dev (>= 2.3.16), libglade2-dev (>= 2.4.0-1), cdbs, gnome-pkg-tools (>= 0.7), gtk-doc-tools, docbook-xml
+Build-Depends: debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libart-2.0-dev (>= 2.3.16), libglade2-dev (>= 2.4.0-1), cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.7), gtk-doc-tools, docbook-xml
 
 Package: libgnomecanvas2-0
 Architecture: any

Modified: desktop/unstable/libgnomecanvas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvas/debian/control.in?rev=11377&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvas/debian/control.in (original)
+++ desktop/unstable/libgnomecanvas/debian/control.in Sat Jun  9 08:34:23 2007
@@ -4,7 +4,7 @@
 Maintainer: Ondřej Surý <ondrej at debian.org>
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libart-2.0-dev (>= 2.3.16), libglade2-dev (>= 2.4.0-1), cdbs, gnome-pkg-tools (>= 0.7), gtk-doc-tools, docbook-xml
+Build-Depends: debhelper (>= 4.1.0), libgtk2.0-dev (>= 2.8.17-1), gettext, libart-2.0-dev (>= 2.3.16), libglade2-dev (>= 2.4.0-1), cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.7), gtk-doc-tools, docbook-xml
 
 Package: libgnomecanvas2-0
 Architecture: any

Added: desktop/unstable/libgnomecanvas/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvas/debian/patches/99_ltmain_as-needed.patch?rev=11377&op=file
==============================================================================
--- desktop/unstable/libgnomecanvas/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/libgnomecanvas/debian/patches/99_ltmain_as-needed.patch Sat Jun  9 08:34:23 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: desktop/unstable/libgnomecanvas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvas/debian/rules?rev=11377&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvas/debian/rules (original)
+++ desktop/unstable/libgnomecanvas/debian/rules Sat Jun  9 08:34:23 2007
@@ -10,3 +10,6 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc
+
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+

More information about the pkg-gnome-commits mailing list