[Pkg-octave-commit] [octave] 03/05: Refresh patches.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit 72091e01c906becff64b52fa0f3c8b8f3f17899f
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Aug 13 20:20:31 2014 +0200

    Refresh patches.
    
    Git-Dch: Ignore
---
 debian/patches/always-build-octave-jar.patch | 6 +++---
 debian/patches/mkoctfile-mpi.diff            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/always-build-octave-jar.patch b/debian/patches/always-build-octave-jar.patch
index e3edfdb..e7a57cf 100644
--- a/debian/patches/always-build-octave-jar.patch
+++ b/debian/patches/always-build-octave-jar.patch
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  FCN_FILE_DIRS += java
  
  java_FCN_FILES = \
-@@ -14,13 +17,10 @@ PKG_ADD_FILES += java/PKG_ADD
+@@ -16,13 +19,10 @@ PKG_ADD_FILES += java/PKG_ADD
  
  DIRSTAMP_FILES += java/$(octave_dirstamp)
  
@@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  JAVA_SRC = \
    $(org_octave_dir)/ClassHelper.java \
    $(org_octave_dir)/OctClassLoader.java \
-@@ -31,7 +31,6 @@ JAVA_SRC = \
+@@ -33,7 +33,6 @@ JAVA_SRC = \
    $(org_octave_dir)/DlgListener.java \
    $(org_octave_dir)/TeXtranslator.java \
    $(org_octave_dir)/TeXcode.java
@@ -37,7 +37,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  JAVA_CLASSES = $(JAVA_SRC:.java=.class)
  
-@@ -61,11 +60,9 @@ java/images.stamp: $(srcdir_java_JAVA_IM
+@@ -63,11 +62,9 @@ java/images.stamp: $(srcdir_java_JAVA_IM
  	fi
  	touch $@
  
diff --git a/debian/patches/mkoctfile-mpi.diff b/debian/patches/mkoctfile-mpi.diff
index 88a531d..e6243c7 100644
--- a/debian/patches/mkoctfile-mpi.diff
+++ b/debian/patches/mkoctfile-mpi.diff
@@ -7,7 +7,7 @@ Last-Update: 2012-08-18
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/mkoctfile.in.cc
 +++ b/src/mkoctfile.in.cc
-@@ -143,7 +143,8 @@ initialize (void)
+@@ -159,7 +159,8 @@ initialize (void)
    vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
    vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
    vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS",

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git