[Pkg-octave-commit] [octave] 05/06: Consolidate all patches relative to dropping version numbers in binaries.
Sébastien Villemot
sebastien at moszumanska.debian.org
Sun Dec 22 15:23:33 UTC 2013
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository octave.
commit 6a8692456d384d54a155e9f3c3c1838f38ea546b
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sun Dec 22 13:33:29 2013 +0100
Consolidate all patches relative to dropping version numbers in binaries.
The new consolidated patch is drop_versioned_binaries.diff.
Also drops versions numbers in calls from src/main.in.cc.
---
.../drop_version_from_mkoctfile_function_call | 14 -----
.../patches/drop_version_from_pkg_function_calls | 18 ------
debian/patches/drop_versioned_binaries.diff | 73 ++++++++++++++++++++++
debian/patches/drop_versioned_binarys | 15 -----
debian/patches/series | 4 +-
5 files changed, 74 insertions(+), 50 deletions(-)
diff --git a/debian/patches/drop_version_from_mkoctfile_function_call b/debian/patches/drop_version_from_mkoctfile_function_call
deleted file mode 100644
index 9e6f874..0000000
--- a/debian/patches/drop_version_from_mkoctfile_function_call
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Call the mkoctfile binary by its name without version
-Forwarded: not-needed
-Author: Sébastien Villemot <sebastien.villemot at ens.fr>
---- a/scripts/miscellaneous/mkoctfile.m
-+++ b/scripts/miscellaneous/mkoctfile.m
-@@ -145,7 +145,7 @@
- bindir = octave_config_info ("bindir");
- ext = octave_config_info ("EXEEXT");
-
-- shell_script = fullfile (bindir, sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext));
-+ shell_script = fullfile (bindir, "mkoctfile");
-
- if (! exist (shell_script, "file"))
- __gripe_missing_component__ ("mkoctfile", "mkoctfile");
diff --git a/debian/patches/drop_version_from_pkg_function_calls b/debian/patches/drop_version_from_pkg_function_calls
deleted file mode 100644
index 2dc48c8..0000000
--- a/debian/patches/drop_version_from_pkg_function_calls
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Call the octave binaries by their name without version
-Forwarded: not-needed
-Author: Thomas Weber <tweber at debian.org>
---- a/scripts/pkg/private/configure_make.m
-+++ b/scripts/pkg/private/configure_make.m
-@@ -29,9 +29,9 @@
- octave_bindir = octave_config_info ("bindir");
- ver = version ();
- ext = octave_config_info ("EXEEXT");
-- mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext));
-- octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext));
-- octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext));
-+ mkoctfile_program = fullfile (octave_bindir, "mkoctfile");
-+ octave_config_program = fullfile (octave_bindir, "octave-config");
-+ octave_binary = fullfile (octave_bindir, "octave");
- cenv = {"MKOCTFILE"; mkoctfile_program;
- "OCTAVE_CONFIG"; octave_config_program;
- "OCTAVE"; octave_binary;
diff --git a/debian/patches/drop_versioned_binaries.diff b/debian/patches/drop_versioned_binaries.diff
new file mode 100644
index 0000000..2f16e27
--- /dev/null
+++ b/debian/patches/drop_versioned_binaries.diff
@@ -0,0 +1,73 @@
+Description: Don't install binarys with a version in them
+ We don't need them.
+Forwarded: not-needed
+Author: Thomas Weber <tweber at debian.org>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -164,7 +164,7 @@
+ main.cc: main.in.cc Makefile
+ @$(do_subst_default_vals)
+
+-install-exec-hook: make-version-links
++install-exec-hook:
+
+ uninstall-local: remove-version-links
+
+--- a/src/main.in.cc
++++ b/src/main.in.cc
+@@ -595,7 +595,7 @@
+ std::string octave_bindir = get_octave_bindir ();
+
+ std::string file
+- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;;
++ = octave_bindir + dir_sep_char + "octave-cli";;
+
+ char **new_argv = new char * [argc + 1];
+
+@@ -611,9 +611,9 @@
+ gui_libs = true;
+ file = octave_bindir + dir_sep_char;
+ #if defined (HAVE_OCTAVE_GUI)
+- file += "octave-gui-" OCTAVE_VERSION;
++ file += "octave-gui";
+ #else
+- file += "octave-cli-" OCTAVE_VERSION;
++ file += "octave-cli";
+ #endif
+ new_argv[k++] = argv[i];
+ }
+@@ -658,7 +658,7 @@
+ start_gui = false;
+ gui_libs = false;
+
+- file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
++ file = octave_bindir + dir_sep_char + "octave-cli";
+
+ if (warn_display)
+ {
+--- a/scripts/miscellaneous/mkoctfile.m
++++ b/scripts/miscellaneous/mkoctfile.m
+@@ -145,7 +145,7 @@
+ bindir = octave_config_info ("bindir");
+ ext = octave_config_info ("EXEEXT");
+
+- shell_script = fullfile (bindir, sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext));
++ shell_script = fullfile (bindir, "mkoctfile");
+
+ if (! exist (shell_script, "file"))
+ __gripe_missing_component__ ("mkoctfile", "mkoctfile");
+--- a/scripts/pkg/private/configure_make.m
++++ b/scripts/pkg/private/configure_make.m
+@@ -29,9 +29,9 @@
+ octave_bindir = octave_config_info ("bindir");
+ ver = version ();
+ ext = octave_config_info ("EXEEXT");
+- mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext));
+- octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext));
+- octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext));
++ mkoctfile_program = fullfile (octave_bindir, "mkoctfile");
++ octave_config_program = fullfile (octave_bindir, "octave-config");
++ octave_binary = fullfile (octave_bindir, "octave");
+ 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
deleted file mode 100644
index aa2e434..0000000
--- a/debian/patches/drop_versioned_binarys
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Don't install binarys with a version in them
- We don't need them.
-Forwarded: not-needed
-Author: Thomas Weber <tweber at debian.org>
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -164,7 +164,7 @@
- main.cc: main.in.cc Makefile
- @$(do_subst_default_vals)
-
--install-exec-hook: make-version-links
-+install-exec-hook:
-
- uninstall-local: remove-version-links
-
diff --git a/debian/patches/series b/debian/patches/series
index eb5b312..9cd3ee4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
-drop_version_from_pkg_function_calls
enable_dirs_in_pkg
-drop_versioned_binarys
+drop_versioned_binaries.diff
install_libraries_publically
no_pdf_in_print.diff
add_info_dir_categories
-drop_version_from_mkoctfile_function_call
mkoctfile-mpi.diff
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git
More information about the Pkg-octave-commit
mailing list