r21268 - in /desktop/unstable/anjuta/debian: changelog control control.in patches/99_ltmain_as-needed.patch patches/series rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sun Sep 6 22:43:39 UTC 2009 

Author: pochu
Date: Sun Sep  6 22:43:38 2009
New Revision: 21268

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21268
Log:
* debian/patches/99_ltmain_as-needed.patch,
  debian/rules:
  + Build with -Wl,--as-needed to avoid uselessly linking against libssl.
    Closes: #539384.
* Standards-Version is 3.8.3, no changes needed.
* Temporarily build depend on libsasl2-dev, libneon27-gnutls-dev and
  libserf-0-0-dev to workaround #544877.

Added:
    desktop/unstable/anjuta/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/unstable/anjuta/debian/changelog
    desktop/unstable/anjuta/debian/control
    desktop/unstable/anjuta/debian/control.in
    desktop/unstable/anjuta/debian/patches/series
    desktop/unstable/anjuta/debian/rules

Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=21268&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Sun Sep  6 22:43:38 2009
@@ -1,4 +1,4 @@
-anjuta (2:2.26.2.2-2) UNRELEASED; urgency=low
+anjuta (2:2.26.2.2-2) unstable; urgency=low
 
   * debian/patches/02_mips_language_c_defined.patch: New patch, rename
     LANGUAGE_* to ANJUTA_LANGUAGE_* because LANGUAGE_C is a built-in in
@@ -8,8 +8,15 @@
     + Removed, libgda4 is now in the archive.
   * Build depend on libgda-4.0-dev to build the symbol browser plugin.
     Closes: #535240.
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 01 Sep 2009 15:16:04 +0200
+  * debian/patches/99_ltmain_as-needed.patch,
+    debian/rules:
+    + Build with -Wl,--as-needed to avoid uselessly linking against libssl.
+      Closes: #539384.
+  * Standards-Version is 3.8.3, no changes needed.
+  * Temporarily build depend on libsasl2-dev, libneon27-gnutls-dev and
+    libserf-0-0-dev to workaround #544877.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 06 Sep 2009 22:30:22 +0200
 
 anjuta (2:2.26.2.2-1) unstable; urgency=low
 

Modified: desktop/unstable/anjuta/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/control?rev=21268&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/control [utf-8] (original)
+++ desktop/unstable/anjuta/debian/control [utf-8] Sun Sep  6 22:43:38 2009
@@ -22,8 +22,10 @@
                libgdl-1-dev (>= 2.26.0),
                libgladeui-1-dev (>= 3.6.0),
                libgraphviz-dev (>= 1.0),
-               libneon27-dev (>= 0.28.2),
+               libneon27-gnutls-dev (>= 0.28.2),
                libsvn-dev (>= 1.5.0),
+# Workaround for #544877
+ libsasl2-dev, libneon27-gnutls-dev, libserf-0-0-dev,
                libgtksourceview2.0-dev (>= 2.4.0),
                binutils-dev (>= 2.15.92),
                libwnck-dev (>= 2.12),
@@ -38,7 +40,7 @@
                gnome-pkg-tools (>= 0.11)
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk2.0-doc
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.anjuta.org
 
 Package: anjuta

Modified: desktop/unstable/anjuta/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/control.in?rev=21268&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/control.in [utf-8] (original)
+++ desktop/unstable/anjuta/debian/control.in [utf-8] Sun Sep  6 22:43:38 2009
@@ -22,8 +22,10 @@
                libgdl-1-dev (>= 2.26.0),
                libgladeui-1-dev (>= 3.6.0),
                libgraphviz-dev (>= 1.0),
-               libneon27-dev (>= 0.28.2),
+               libneon27-gnutls-dev (>= 0.28.2),
                libsvn-dev (>= 1.5.0),
+# Workaround for #544877
+ libsasl2-dev, libneon27-gnutls-dev, libserf-0-0-dev,
                libgtksourceview2.0-dev (>= 2.4.0),
                binutils-dev (>= 2.15.92),
                libwnck-dev (>= 2.12),
@@ -38,7 +40,7 @@
                gnome-pkg-tools (>= 0.11)
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk2.0-doc
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.anjuta.org
 
 Package: anjuta

Added: desktop/unstable/anjuta/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/99_ltmain_as-needed.patch?rev=21268&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/anjuta/debian/patches/99_ltmain_as-needed.patch [utf-8] Sun Sep  6 22:43:38 2009
@@ -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|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=21268&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Sun Sep  6 22:43:38 2009
@@ -1,1 +1,2 @@
 02_mips_language_c_defined.patch
+99_ltmain_as-needed.patch

Modified: desktop/unstable/anjuta/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/rules?rev=21268&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/rules [utf-8] (original)
+++ desktop/unstable/anjuta/debian/rules [utf-8] Sun Sep  6 22:43:38 2009
@@ -7,6 +7,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-plugin-valgrind

More information about the pkg-gnome-commits mailing list