[Pkg-octave-commit] [octave] 01/02: d/p/drop_versioned_binaries.diff: add back hunk for src/main.in.cc.

Sébastien Villemot sebastien at debian.org
Tue Mar 22 21:48:35 UTC 2016


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

sebastien pushed a commit to branch master
in repository octave.

commit 0bc18cf6a83b9526807f9c3d27d69ca99ccfc52a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Mar 22 22:09:46 2016 +0100

    d/p/drop_versioned_binaries.diff: add back hunk for src/main.in.cc.
---
 debian/patches/drop_versioned_binaries.diff | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/drop_versioned_binaries.diff b/debian/patches/drop_versioned_binaries.diff
index ff8d1ae..e351877 100644
--- a/debian/patches/drop_versioned_binaries.diff
+++ b/debian/patches/drop_versioned_binaries.diff
@@ -42,3 +42,14 @@ Last-Update: 2015-04-17
  
      if (! exist (mkoctfile_program, "file"))
        __gripe_missing_component__ ("pkg", "mkoctfile");
+--- a/src/main.in.cc
++++ b/src/main.in.cc
+@@ -433,7 +433,7 @@ main (int argc, char **argv)
+   std::string octave_bindir = get_octave_bindir ();
+   std::string octave_archlibdir = get_octave_archlibdir ();
+   std::string octave_cli
+-    = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
++    = octave_bindir + dir_sep_char + "octave-cli";
+   std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
+ 
+ #if defined (HAVE_OCTAVE_GUI)

-- 
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