[Pkg-octave-commit] [octave] 02/03: Refresh patch.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit 74bff80e1ec2debda9375d5d6eb020b54ea585ee
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Jan 2 20:37:28 2014 +0100

    Refresh patch.
    
    Git-Dch: Ignore
---
 debian/patches/drop_versioned_binaries.diff | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/patches/drop_versioned_binaries.diff b/debian/patches/drop_versioned_binaries.diff
index 2f16e27..dd42618 100644
--- a/debian/patches/drop_versioned_binaries.diff
+++ b/debian/patches/drop_versioned_binaries.diff
@@ -15,8 +15,8 @@ Author: Thomas Weber <tweber at debian.org>
  
 --- a/src/main.in.cc
 +++ b/src/main.in.cc
-@@ -595,7 +595,7 @@
-   std::string octave_bindir = get_octave_bindir ();
+@@ -614,7 +614,7 @@
+   std::string octave_archlibdir = get_octave_archlibdir ();
  
    std::string file
 -    = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;;
@@ -24,19 +24,16 @@ Author: Thomas Weber <tweber at debian.org>
  
    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
+@@ -635,7 +635,7 @@
+ 
+           file = octave_archlibdir + dir_sep_char + "octave-gui";
+ #else
+-          file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
++          file = octave_bindir + dir_sep_char + "octave-cli";
+ #endif
            new_argv[k++] = argv[i];
          }
-@@ -658,7 +658,7 @@
+@@ -680,7 +680,7 @@
            start_gui = false;
            gui_libs = false;
  

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git