r44065 - in /packages/code-aster/metis-edf/trunk/debian: changelog patches/Makefile.patch patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Nov 27 21:50:00 2011
New Revision: 44065

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44065
Log:
metis-edf (4.1-2-2) unstable; urgency=low

  * Team upload.
  * FTBFS - missing link at math fixed (Closes: #650180)
  * FTBFS with -Werror=format-security fixed (Closes: #650178)
    Thanks to Leo Iannacone for the two FTBFS fixes.

Modified:
    packages/code-aster/metis-edf/trunk/debian/changelog
    packages/code-aster/metis-edf/trunk/debian/patches/Makefile.patch
    packages/code-aster/metis-edf/trunk/debian/patches/series

Modified: packages/code-aster/metis-edf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/metis-edf/trunk/debian/changelog?rev=44065&op=diff
==============================================================================
--- packages/code-aster/metis-edf/trunk/debian/changelog (original)
+++ packages/code-aster/metis-edf/trunk/debian/changelog Sun Nov 27 21:50:00 2011
@@ -1,3 +1,12 @@
+metis-edf (4.1-2-2) unstable; urgency=low
+
+  * Team upload.
+  * FTBFS - missing link at math fixed (Closes: #650180)
+  * FTBFS with -Werror=format-security fixed (Closes: #650178)
+    Thanks to Leo Iannacone for the two FTBFS fixes.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 27 Nov 2011 22:38:04 +0100
+
 metis-edf (4.1-2-1) unstable; urgency=low
 
   * Initial release (Closes: #578054)

Modified: packages/code-aster/metis-edf/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/metis-edf/trunk/debian/patches/Makefile.patch?rev=44065&op=diff
==============================================================================
--- packages/code-aster/metis-edf/trunk/debian/patches/Makefile.patch (original)
+++ packages/code-aster/metis-edf/trunk/debian/patches/Makefile.patch Sun Nov 27 21:50:00 2011
@@ -1,7 +1,5 @@
-Index: metis-edf-4.1/Makefile
-===================================================================
---- metis-edf-4.1.orig/Makefile	2010-03-26 16:08:05.000000000 +0100
-+++ metis-edf-4.1/Makefile	2010-03-26 16:08:05.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -5,29 +5,21 @@
  SUBDIRS=Lib Programs
  CONFDIR=./CONFIG
@@ -44,10 +42,8 @@
 +	echo "Creating Makefile.in"
  	sh $(CONFDIR)/configure
  
-Index: metis-edf-4.1/Lib/Makefile
-===================================================================
---- metis-edf-4.1.orig/Lib/Makefile	2010-03-26 16:08:05.000000000 +0100
-+++ metis-edf-4.1/Lib/Makefile	2010-03-26 16:10:39.000000000 +0100
+--- a/Lib/Makefile
++++ b/Lib/Makefile
 @@ -2,7 +2,6 @@
  
  INCLUDES = -I.
@@ -72,7 +68,7 @@
  	$(AR) $@ $(OBJS)
  
 +../libmetis-edf.so: $(OBJS)
-+	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,-soname,libmetis-edf.so.4.1
++	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,-soname,libmetis-edf.so.4.1 -lm
 +	(cd .. && mv libmetis-edf.so libmetis-edf.so.4.1)
 +	(cd .. && ln -s libmetis-edf.so.4.1 libmetis-edf.so.4)
 +	(cd .. && ln -s libmetis-edf.so.4 libmetis-edf.so)
@@ -83,10 +79,8 @@
  distclean:
 -	rm -f *.o ; rm -f ../libmetis.a
 +	rm -f *.o ; rm -f ../libmetis.a ../libmetis.so*
-Index: metis-edf-4.1/Test/Makefile
-===================================================================
---- metis-edf-4.1.orig/Test/Makefile	2010-03-26 16:08:05.000000000 +0100
-+++ metis-edf-4.1/Test/Makefile	2010-03-26 16:08:05.000000000 +0100
+--- a/Test/Makefile
++++ b/Test/Makefile
 @@ -4,12 +4,12 @@
  
  vers_check:
@@ -102,10 +96,8 @@
  	@echo " "
  
  clean:
-Index: metis-edf-4.1/Programs/Makefile
-===================================================================
---- metis-edf-4.1.orig/Programs/Makefile	2010-03-26 16:08:05.000000000 +0100
-+++ metis-edf-4.1/Programs/Makefile	2010-03-26 16:08:05.000000000 +0100
+--- a/Programs/Makefile
++++ b/Programs/Makefile
 @@ -3,10 +3,8 @@
  BINDIR = ..
  

Modified: packages/code-aster/metis-edf/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/metis-edf/trunk/debian/patches/series?rev=44065&op=diff
==============================================================================
--- packages/code-aster/metis-edf/trunk/debian/patches/series (original)
+++ packages/code-aster/metis-edf/trunk/debian/patches/series Sun Nov 27 21:50:00 2011
@@ -1,2 +1,3 @@
 configure.patch
 Makefile.patch
+format-security.diff