r17895 - in /desktop/experimental/seahorse/debian: changelog control control.in patches/99_ltmain_as-needed.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Dec  9 21:35:04 2008
New Revision: 17895

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17895
Log:
* Remove seahorse’s recommends on itself.
* 99_ltmain_as-needed.patch: make --as-needed work with libraries.

Added:
    desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch   (contents, props changed)
      - copied, changed from r17893, desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/experimental/seahorse/debian/changelog
    desktop/experimental/seahorse/debian/control
    desktop/experimental/seahorse/debian/control.in
    desktop/experimental/seahorse/debian/patches/series

Modified: desktop/experimental/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/changelog?rev=17895&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/changelog (original)
+++ desktop/experimental/seahorse/debian/changelog Tue Dec  9 21:35:04 2008
@@ -1,5 +1,6 @@
-seahorse (2.24.1-1) unstable; urgency=low
-
+seahorse (2.24.1-1) experimental; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
   * New upstream release.
     - Update build dependencies.
     - Recommend gvfs as it's needed to launch the help.
@@ -25,7 +26,11 @@
        Also, remove the conffile on upgrades. Taken from Ubuntu.
    * Enable PKCS#11 support. Build-dep on libgp11-dev.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 09 Dec 2008 13:04:59 +0100
+  [ Josselin Mouette ]
+  * Remove seahorse’s recommends on itself.
+  * 99_ltmain_as-needed.patch: make --as-needed work with libraries.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 09 Dec 2008 22:23:19 +0100
 
 seahorse (2.22.3-2) unstable; urgency=low
 

Modified: desktop/experimental/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/control?rev=17895&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/control (original)
+++ desktop/experimental/seahorse/debian/control Tue Dec  9 21:35:04 2008
@@ -32,8 +32,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnupg (>= 1.4.7)
-Recommends: openssh-client,
-            seahorse
+Recommends: openssh-client
 Suggests: seahorse-plugins
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the Gnu Privacy Guard program -

Modified: desktop/experimental/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/control.in?rev=17895&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/control.in (original)
+++ desktop/experimental/seahorse/debian/control.in Tue Dec  9 21:35:04 2008
@@ -32,8 +32,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnupg (>= 1.4.7)
-Recommends: openssh-client,
-            seahorse
+Recommends: openssh-client
 Suggests: seahorse-plugins
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the Gnu Privacy Guard program -

Copied: desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch (from r17893, desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch?rev=17895&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch Tue Dec  9 21:35:04 2008
@@ -1,7 +1,9 @@
---- a/ltmain.sh	2007-10-09 07:38:25.000000000 +0200
-+++ b/ltmain.sh	2007-10-09 07:39:25.000000000 +0200
-@@ -1794,6 +1794,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+Index: seahorse-2.24.1/ltmain.sh
+===================================================================
+--- seahorse-2.24.1.orig/ltmain.sh	2008-10-19 10:58:10.000000000 +0200
++++ seahorse-2.24.1/ltmain.sh	2008-12-09 22:20:26.389215248 +0100
+@@ -4189,6 +4189,11 @@ func_mode_link ()
+ 	arg=$func_stripname_result
  	;;
  
 +      -Wl,--as-needed)
@@ -10,9 +12,9 @@
 +	;;
 +
        -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2137,6 +2142,15 @@
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -4543,6 +4548,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in

Propchange: desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: desktop/experimental/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/series?rev=17895&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/patches/series (original)
+++ desktop/experimental/seahorse/debian/patches/series Tue Dec  9 21:35:04 2008
@@ -1,2 +1,3 @@
 08_force_ssh.patch
 90_autoconf.patch
+99_ltmain_as-needed.patch