Merge lp:~allison/ubuntu/precise/magics++/fix-misapplied-patch-and-linking into lp:ubuntu/precise/magics++

[Allison Randal]

Fix Precise FTBFS, update patch that no longer cleanly applied, and fix linking issues from --no-add-needed.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/as-needed.patch'
--- debian/as-needed.patch	2011-09-13 13:45:47 +0000
+++ debian/as-needed.patch	2011-12-13 08:32:27 +0000
@@ -3,12 +3,12 @@
  Note that this patch is applied by ./debian/rules AFTER autoreconf is run; 
  it cannot be applied in ./debian/patches
 Bug-Debian: http://bugs.debian.org/347650
-Last-Updated: 2011-09-13
+Last-Updated: 2011-12-05
 Forwarded: no
 
---- ltmain.sh.orig	2011-09-13 10:05:45.000000000 +0100
-+++ ltmain.sh 	        2011-09-13 10:22:40.000000000 +0100
-@@ -5500,6 +5500,11 @@
+--- ltmain.sh.orig	2011-12-05 23:13:53.614777184 +0000
++++ ltmain.sh	2011-12-05 23:21:58.310794860 +0000
+@@ -5512,6 +5512,11 @@
  	continue
  	;;
  
@@ -20,19 +20,19 @@
        -export-symbols | -export-symbols-regex)
  	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
  	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-@@ -6150,6 +6155,15 @@
+@@ -6163,6 +6168,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)
++	-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
- 	    compile_deplibs="$deplib $compile_deplibs"

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-20 10:40:35 +0000
+++ debian/changelog	2011-12-13 08:32:27 +0000
@@ -1,3 +1,14 @@
+magics++ (2.12.9-5ubuntu1) precise; urgency=low
+
+  * Update debian/as-needed.patch so it applies to changed
+    config/ltmain.sh.
+  * debian/rules: Add "-lm -lquadmath -lgfortran" to LIBS in configure
+    line to directly link libraries that are needed. 
+  * Add debian/patches/fix_libemos_link.patch to link
+    "-lquadmath -lgfortran".
+
+ -- Allison Randal <[e-mail]>  Mon, 12 Dec 2011 23:18:31 -0800
+
 magics++ (2.12.9-5) unstable; urgency=low
 
   * Recommends: pkg-config in -dev package.

=== added file 'debian/patches/fix_libemos_link.patch'
--- debian/patches/fix_libemos_link.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_libemos_link.patch	2011-12-13 08:32:27 +0000
@@ -0,0 +1,13 @@
+Index: ftbfs-precise-trois/configure.ac
+===================================================================
+--- ftbfs-precise-trois.orig/configure.ac	2011-12-13 07:14:42.578672000 +0000
++++ ftbfs-precise-trois/configure.ac	2011-12-13 07:16:57.793889070 +0000
+@@ -768,7 +768,7 @@
+ AC_SUBST(cairo)
+ 
+ # Add dynamic libs needed by Debian
+-LIBS="$CAIRO_LIBS $LIBS -lemosR64 -lgrib_api -lterralib -lstdc++ -lm $NETCDF_LIBS"
++LIBS="$CAIRO_LIBS $LIBS -lemosR64 -lgrib_api -lterralib -lstdc++ -lm -lquadmath -lgfortran $NETCDF_LIBS"
+ LDFLAGS="$CAIRO_LDFLAGS $LDFLAGS -Wl,--as-needed"
+ 
+ # Autoheader

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-13 13:45:47 +0000
+++ debian/patches/series	2011-12-13 08:32:27 +0000
@@ -4,3 +4,4 @@
 enable_static.patch
 debian-changes-2.12.9-2
 debian-changes-2.12.9-3
+fix_libemos_link.patch

=== modified file 'debian/rules'
--- debian/rules	2011-09-24 15:05:00 +0000
+++ debian/rules	2011-12-13 08:32:27 +0000
@@ -37,7 +37,7 @@
 	dh_auto_configure -- \
 		--enable-bufr --enable-static --enable-cairo --with-emos-libraries=/usr/lib \
 		--with-terralib=/usr  --enable-python \
-		LDFLAGS="-L$(shell pwd)/src/.libs -Wl,--as-needed"  LIBS=" -lX11 -lpng12 -lz"
+		LDFLAGS="-L$(shell pwd)/src/.libs -Wl,--as-needed"  LIBS=" -lX11 -lm -lquadmath -lgfortran -lpng12 -lz"
 
 override_dh_auto_test check:
 	echo "Tests disabled; see README-testfailures.txt for details"