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

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Oct  8 10:57:27 2014
New Revision: 43420

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43420
Log:
Revert ricotz changes as they fail to build.


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

Modified: desktop/unstable/libgweather/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/changelog?rev=43420&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/changelog	[utf-8] Wed Oct  8 10:57:27 2014
@@ -1,13 +1,10 @@
 libgweather (3.14.0-2) UNRELEASED; urgency=medium
-
-  [ Rico Tzschichholz ]
-  * Use dh-autoreconf in favour of patching ltmain.sh
 
   [ Andreas Henriksson ]
   * Install gir1.2-gweather-3.0 files in multi-arch path (Closes: #764446)
     - previous attempt at trying to avoid m-a installed things in wrong dir.
 
- -- Rico Tzschichholz <ricotz at ubuntu.com>  Mon, 29 Sep 2014 09:48:54 +0200
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 08 Oct 2014 12:54:35 +0200
 
 libgweather (3.14.0-1) unstable; urgency=medium
 

Modified: desktop/unstable/libgweather/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control?rev=43420&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/control	[utf-8] Wed Oct  8 10:57:27 2014
@@ -10,7 +10,6 @@
 Build-Depends: debhelper (>= 8),
                autotools-dev,
                cdbs (>= 0.4.73),
-               dh-autoreconf,
                gnome-common,
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),

Modified: desktop/unstable/libgweather/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control.in?rev=43420&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/control.in	[utf-8] Wed Oct  8 10:57:27 2014
@@ -6,7 +6,6 @@
 Build-Depends: debhelper (>= 8),
                autotools-dev,
                cdbs (>= 0.4.73),
-               dh-autoreconf,
                gnome-common,
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),

Added: desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch?rev=43420&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch	(added)
+++ desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch	[utf-8] Wed Oct  8 10:57:27 2014
@@ -0,0 +1,30 @@
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -5800,6 +5800,11 @@
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++      
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -6160,6 +6165,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|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	  if test "$linkmode,$pass" = "prog,link"; then

Modified: desktop/unstable/libgweather/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/series?rev=43420&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/patches/series	[utf-8] Wed Oct  8 10:57:27 2014
@@ -0,0 +1 @@
+99_ltmain_as-needed.patch

Modified: desktop/unstable/libgweather/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/rules?rev=43420&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/rules	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/rules	[utf-8] Wed Oct  8 10:57:27 2014
@@ -2,7 +2,6 @@
 
 DEB_BUILDDIR = debian/build
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk