r34867 - in /desktop/experimental/seahorse/debian: changelog patches/99_ltmain_as-needed.patch

[jordi at users.alioth.debian.org]

Author: jordi
Date: Mon May 14 23:14:02 2012
New Revision: 34867

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34867
Log:
Refresh 99_ltmain_as-needed.patch with copy from dh-autoreconf.

Modified:
    desktop/experimental/seahorse/debian/changelog
    desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/experimental/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/changelog?rev=34867&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/changelog [utf-8] (original)
+++ desktop/experimental/seahorse/debian/changelog [utf-8] Mon May 14 23:14:02 2012
@@ -1,14 +1,15 @@
 seahorse (3.4.1-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release.
+  * debian/control.in:
+    - Bump libgcr & libgck build-depends
+    - Depend on gcr for gsettings schema
 
   [ Jordi Mallach ]
   * Don't suggest seahorse-plugins.
   * Bump Standards-Version to 3.9.3, no changes needed.
-
-  [ Jeremy Bicha ]
-  * New upstream release.
-  * debian/control.in:
-    - Bump libgcr & libgck build-depends
-    - Depend on gcr for gsettings schema
+  * Refresh 99_ltmain_as-needed.patch with copy from dh-autoreconf.
 
  -- Jordi Mallach <jordi at debian.org>  Tue, 15 May 2012 01:08:48 +0200
 

Modified: desktop/experimental/seahorse/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=34867&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/seahorse/debian/patches/99_ltmain_as-needed.patch [utf-8] Mon May 14 23:14:02 2012
@@ -1,12 +1,13 @@
-Index: seahorse-3.2.2/ltmain.sh
-===================================================================
---- seahorse-3.2.2.orig/ltmain.sh	2011-11-14 11:51:38.000000000 +0100
-+++ seahorse-3.2.2/ltmain.sh	2011-11-18 00:10:27.035522119 +0100
-@@ -5787,6 +5787,11 @@
+Bug-Debian: http://bugs.debian.org/347650
+Last-Update: 2011-06-14
+
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5800,6 +5800,11 @@ func_mode_link ()
  	arg=$func_stripname_result
  	;;
  
-+      -Wl,--as-needed)
++      -Wl,--as-needed|-Wl,--no-as-needed)
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
@@ -14,11 +15,11 @@
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -6147,6 +6152,15 @@
+@@ -6163,6 +6168,15 @@ func_mode_link ()
  	lib=
  	found=no
  	case $deplib in
-+	-Wl,--as-needed)
++	-Wl,--as-needed|-Wl,--no-as-needed)
 +	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -27,6 +28,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
  	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"