[SCM] Packaging for getfem++ branch, experimental, updated. debian/4.1.1-10-5-gb58de9b

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit b58de9b74fa1cba49dc0bb0f0c7fd89a6194eb38
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Nov 3 22:26:58 2012 +0100

    Update patches, remove applied by upstreams ones.

diff --git a/debian/patches/addgetfempath.diff b/debian/patches/addgetfempath.diff
index 05942e5..6450fbb 100644
--- a/debian/patches/addgetfempath.diff
+++ b/debian/patches/addgetfempath.diff
@@ -1,7 +1,5 @@
-Index: getfem++-4.1.1/interface/src/scilab/etc/sci_getfem.start
-===================================================================
---- getfem++-4.1.1.orig/interface/src/scilab/etc/sci_getfem.start	2010-11-30 08:27:45.000000000 +0100
-+++ getfem++-4.1.1/interface/src/scilab/etc/sci_getfem.start	2010-11-30 08:29:08.000000000 +0100
+--- a/interface/src/scilab/etc/sci_getfem.start
++++ b/interface/src/scilab/etc/sci_getfem.start
 @@ -15,6 +15,11 @@
  etc_tlbx  = getshortpathname(etc_tlbx);
  root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") );
diff --git a/debian/patches/disableXaccess.diff b/debian/patches/disableXaccess.diff
index 46bf3dd..05ae56f 100644
--- a/debian/patches/disableXaccess.diff
+++ b/debian/patches/disableXaccess.diff
@@ -1,8 +1,6 @@
-Index: getfem++-4.1.1/interface/src/scilab/Makefile.am
-===================================================================
---- getfem++-4.1.1.orig/interface/src/scilab/Makefile.am	2010-11-29 23:20:09.000000000 +0100
-+++ getfem++-4.1.1/interface/src/scilab/Makefile.am	2010-11-29 23:20:18.000000000 +0100
-@@ -395,7 +395,7 @@
+--- a/interface/src/scilab/Makefile.am
++++ b/interface/src/scilab/Makefile.am
+@@ -396,7 +396,7 @@
  .NOTPARALLEL: *
  
  all:
@@ -11,7 +9,7 @@ Index: getfem++-4.1.1/interface/src/scilab/Makefile.am
  
  install:
  	$(mkinstalldirs) $(toolboxdir)/demos
-@@ -466,4 +466,4 @@
+@@ -467,4 +467,4 @@
  	@INSTALL@ -D -m 644 -t $(toolboxdir)/ $(scilabbasedir)
  
  clean:
diff --git a/debian/patches/ld-no-add-needed.patch b/debian/patches/ld-no-add-needed.patch
index 0e2f134..c1296a2 100644
--- a/debian/patches/ld-no-add-needed.patch
+++ b/debian/patches/ld-no-add-needed.patch
@@ -6,9 +6,9 @@ Last-Update: 2012-01-18
 @@ -0,0 +1,44 @@
 --- a/tests/Makefile.in
 +++ b/tests/Makefile.in
-@@ -562,7 +562,7 @@
- wave_equation_SOURCES = wave_equation.cc
- cyl_slicer_SOURCES = cyl_slicer.cc
+@@ -584,7 +584,7 @@
+ test_continuation_SOURCES = test_continuation.cc
+ test_large_sliding_contact_SOURCES = test_large_sliding_contact.cc
  INCLUDES = -I$(top_srcdir)/src -I../src
 -LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS)
 +LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
@@ -17,7 +17,7 @@ Last-Update: 2012-01-18
  	dynamic_tas.pl                     			\
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -99,7 +99,7 @@
+@@ -105,7 +105,7 @@
  
  SUPLDFLAGS = @SUPLDFLAGS@
  INCLUDES = -I$(top_srcdir)/src -I../src
@@ -25,10 +25,10 @@ Last-Update: 2012-01-18
 +LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
  
  TESTS = \
- 	$(top_srcdir)/tests/dynamic_array.pl           \
+ 	$(top_srcdir)/tests/dynamic_array.pl              \
 --- a/tests-2.0/Makefile.in
 +++ b/tests-2.0/Makefile.in
-@@ -481,7 +481,7 @@
+@@ -484,7 +484,7 @@
  dynamic_friction_SOURCES = dynamic_friction.cc
  bilaplacian_SOURCES = bilaplacian.cc
  INCLUDES = -I$(top_srcdir)/src -I../src
diff --git a/debian/patches/series b/debian/patches/series
index 50598df..691ef81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-fix-mumps-checks-configure.patch
 disableXaccess.diff
 addgetfempath.diff
 ld-no-add-needed.patch
-fix-gcc-4.7-ftbfs.patch
-fix-gcc-4.7-ftbfs_part2.patch

-- 
Packaging for getfem++