[Pkg-octave-commit] [octave] 01/02: Consolidate all patches relative to dropping version numbers in binaries.

Sébastien Villemot sebastien at moszumanska.debian.org
Sun Dec 22 15:23:38 UTC 2013


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

sebastien pushed a commit to annotated tag debian/3.8.0_rc2-1
in repository octave.

commit 6d256ba61516fd7edacef8232d5ec47ed24e0a0c
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        | 55 ++++++++++++++++++++++
 debian/patches/drop_versioned_binarys              | 15 ------
 debian/patches/series                              |  4 +-
 5 files changed, 56 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..e89595f
--- /dev/null
+++ b/debian/patches/drop_versioned_binaries.diff
@@ -0,0 +1,55 @@
+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
+@@ -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];
+         }
+--- 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