[getfem] 03/05: Refresh patches.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository getfem.

commit ef396dcbc62ccfce31c9efe34b48d2daf900795a
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Nov 2 19:45:34 2013 +0100

    Refresh patches.
---
 debian/patches/01_link_boost-system.patch |    4 ++--
 debian/patches/03_disableXaccess.diff     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/01_link_boost-system.patch b/debian/patches/01_link_boost-system.patch
index f6ca496..7f9973d 100644
--- a/debian/patches/01_link_boost-system.patch
+++ b/debian/patches/01_link_boost-system.patch
@@ -1,6 +1,6 @@
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -219,7 +219,7 @@
+@@ -232,7 +232,7 @@
  lib_LTLIBRARIES = libgetfem.la
  libgetfem_la_SOURCES = $(SRC)
  libgetfem_la_LDFLAGS = ${LIBTOOL_VERSION_INFO}
@@ -30,4 +30,4 @@
 +LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) -lboost_system
  
  TESTS = \
- 	$(abs_top_srcdir)/tests/dynamic_array.pl              \
+ <<<<<<< HEAD
diff --git a/debian/patches/03_disableXaccess.diff b/debian/patches/03_disableXaccess.diff
index 05ae56f..995edb1 100644
--- a/debian/patches/03_disableXaccess.diff
+++ b/debian/patches/03_disableXaccess.diff
@@ -1,6 +1,6 @@
 --- a/interface/src/scilab/Makefile.am
 +++ b/interface/src/scilab/Makefile.am
-@@ -396,7 +396,7 @@
+@@ -399,7 +399,7 @@
  .NOTPARALLEL: *
  
  all:
@@ -9,7 +9,7 @@
  
  install:
  	$(mkinstalldirs) $(toolboxdir)/demos
-@@ -467,4 +467,4 @@
+@@ -470,4 +470,4 @@
  	@INSTALL@ -D -m 644 -t $(toolboxdir)/ $(scilabbasedir)
  
  clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getfem.git