[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2

[Thomas Weber]

The following commit has been merged in the master branch:
commit e553e9841b107cbf157bafc8d386576d23dfbaa9
Author: Thomas Weber <tweber at debian.org>
Date:   Tue Nov 15 19:27:06 2011 +0100

    New patch: drop_version_from_pkg_function_calls

diff --git a/debian/patches/drop_version_from_pkg_function_calls b/debian/patches/drop_version_from_pkg_function_calls
new file mode 100644
index 0000000..6d813b8
--- /dev/null
+++ b/debian/patches/drop_version_from_pkg_function_calls
@@ -0,0 +1,19 @@
+Description: Call the octave binaries by their name without version
+Forwarded: not-needed
+Author: Thomas Weber <tweber at debian.org>
+--- a/scripts/pkg/pkg.m
++++ b/scripts/pkg/pkg.m
+@@ -1302,10 +1302,9 @@
+   if (exist (fullfile (packdir, "src"), "dir"))
+     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));
+-    octave_binary = fullfile (octave_bindir, sprintf ("octave-%s", ver));
++    mkoctfile = fullfile (octave_bindir, "mkoctfile");
++    octave_config = fullfile (octave_bindir, "octave-config");
++    octave_binary = fullfile (octave_bindir, "octave");
+     cenv = {"MKOCTFILE"; mkoctfile;
+             "OCTAVE_CONFIG"; octave_config;
+             "OCTAVE"; octave_binary;
diff --git a/debian/patches/series b/debian/patches/series
index f6a6b5a..924c30a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-no_pdf_in_print.diff
-dont_set_helvetica-3.1.diff
-normal-markersize.diff
-include_mpi_headers
+drop_version_from_pkg_function_calls

-- 
Debian packaging for octave