r32911 - in /desktop/experimental/file-roller/debian: changelog control control.in patches/99_ltmain_as-needed.patch

[jordi at users.alioth.debian.org]

Author: jordi
Date: Fri Mar  9 18:50:29 2012
New Revision: 32911

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32911
Log:
* New upstream release.
* Refresh 99_ltmain_as-needed.patch with newer copy in dh-autoreconf.
* Update to Standards-Version 3.9.3, no changes needed.

Modified:
    desktop/experimental/file-roller/debian/changelog
    desktop/experimental/file-roller/debian/control
    desktop/experimental/file-roller/debian/control.in
    desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/experimental/file-roller/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/changelog?rev=32911&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/changelog [utf-8] (original)
+++ desktop/experimental/file-roller/debian/changelog [utf-8] Fri Mar  9 18:50:29 2012
@@ -1,3 +1,11 @@
+file-roller (3.3.91-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh 99_ltmain_as-needed.patch with newer copy in dh-autoreconf.
+  * Update to Standards-Version 3.9.3, no changes needed.
+
+ -- Jordi Mallach <jordi at debian.org>  Fri, 09 Mar 2012 19:32:38 +0100
+
 file-roller (3.2.2-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/experimental/file-roller/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control?rev=32911&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control [utf-8] (original)
+++ desktop/experimental/file-roller/debian/control [utf-8] Fri Mar  9 18:50:29 2012
@@ -19,7 +19,7 @@
                intltool (>= 0.40.0),
                scrollkeeper,
                gnome-doc-utils (>= 0.3.2)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/file-roller
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/file-roller
 Homepage: http://fileroller.sourceforge.net/

Modified: desktop/experimental/file-roller/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/control.in?rev=32911&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/control.in [utf-8] (original)
+++ desktop/experimental/file-roller/debian/control.in [utf-8] Fri Mar  9 18:50:29 2012
@@ -14,7 +14,7 @@
                intltool (>= 0.40.0),
                scrollkeeper,
                gnome-doc-utils (>= 0.3.2)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/file-roller
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/file-roller
 Homepage: http://fileroller.sourceforge.net/

Modified: desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch?rev=32911&op=diff
==============================================================================
--- desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/file-roller/debian/patches/99_ltmain_as-needed.patch [utf-8] Fri Mar  9 18:50:29 2012
@@ -1,12 +1,13 @@
-Index: file-roller-3.2.2/ltmain.sh
-===================================================================
---- file-roller-3.2.2.orig/ltmain.sh	2011-10-10 11:17:49.000000000 +0200
-+++ file-roller-3.2.2/ltmain.sh	2011-11-17 22:47:02.615098499 +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"