[Pkg-octave-commit] [SCM] Debian packaging for octave branch, experimental, updated. debian/3.6.3-2-9-ga58cd1e

[Sébastien Villemot]

The following commit has been merged in the experimental branch:
commit 735bb65ec96d27c6ea75c221c9125bd83567f735
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Feb 23 18:44:33 2013 +0100

    Refresh other patches

diff --git a/debian/patches/drop_version_from_pkg_function_calls b/debian/patches/drop_version_from_pkg_function_calls
index 3d6392a..810f5fe 100644
--- a/debian/patches/drop_version_from_pkg_function_calls
+++ b/debian/patches/drop_version_from_pkg_function_calls
@@ -8,12 +8,12 @@ Author: Thomas Weber <tweber at debian.org>
      src = fullfile (packdir, "src");
      octave_bindir = octave_config_info ("bindir");
 -    ver = version ();
--    mkoctfile = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver));
--    octave_config = fullfile (octave_bindir, sprintf ("octave-config-%s", ver));
+-    mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s", ver));
+-    octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s", ver));
 -    octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver));
-+    mkoctfile = fullfile (octave_bindir, "mkoctfile");
-+    octave_config = fullfile (octave_bindir, "octave-config");
++    mkoctfile_program = fullfile (octave_bindir, "mkoctfile");
++    octave_config_program = fullfile (octave_bindir, "octave-config");
 +    octave_binary = fullfile (octave_bindir, "octave");
-     cenv = {"MKOCTFILE"; mkoctfile;
-             "OCTAVE_CONFIG"; octave_config;
+     cenv = {"MKOCTFILE"; mkoctfile_program;
+             "OCTAVE_CONFIG"; octave_config_program;
              "OCTAVE"; octave_binary;
diff --git a/debian/patches/drop_versioned_binarys b/debian/patches/drop_versioned_binarys
index 2ff177b..ffa3a63 100644
--- a/debian/patches/drop_versioned_binarys
+++ b/debian/patches/drop_versioned_binarys
@@ -4,7 +4,7 @@ Forwarded: not-needed
 Author: Thomas Weber <tweber at debian.org>
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -697,7 +697,7 @@
+@@ -696,7 +696,7 @@
  	chmod a+rx $@
  endif
  
diff --git a/debian/patches/mkoctfile-mpi.diff b/debian/patches/mkoctfile-mpi.diff
index 3413a87..fd834a2 100644
--- a/debian/patches/mkoctfile-mpi.diff
+++ b/debian/patches/mkoctfile-mpi.diff
@@ -14,5 +14,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
 +: ${XTRA_CXXFLAGS=-I/usr/include/mpi %OCTAVE_CONF_XTRA_CXXFLAGS%}
  
- : ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
- : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
+ : ${AR=%OCTAVE_CONF_MKOCTFILE_AR%}
+ : ${RANLIB=%OCTAVE_CONF_MKOCTFILE_RANLIB%}
diff --git a/debian/patches/use_system_gl2ps b/debian/patches/use_system_gl2ps
index 1964564..eb381b3 100644
--- a/debian/patches/use_system_gl2ps
+++ b/debian/patches/use_system_gl2ps
@@ -6324,9 +6324,9 @@ Author: Thomas Weber <tweber at debian.org>
  OCTINTERP_API
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -102,7 +102,6 @@
-   DOCSTRINGS \
+@@ -103,7 +103,6 @@
    find-defun-files.sh \
+   gendoc.pl \
    genprops.awk \
 -  gl2ps.c \
    graphics.h.in \
@@ -6350,7 +6350,7 @@ Author: Thomas Weber <tweber at debian.org>
    zfstream.cc \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -943,6 +943,16 @@
+@@ -953,6 +953,16 @@
  AC_SUBST(GRAPHICS_CFLAGS)
  AC_SUBST(GRAPHICS_LIBS)
  

-- 
Debian packaging for octave