Merge lp:~mtmiller/ubuntu/trusty/octave/lp1288136 into lp:ubuntu/trusty/octave

[Mike Miller]

This change fixes a high priority bug in the octave source package, preventing proper installation or upgrade when certain other octave-* packages are installed. I've built and tested locally on trusty, requires installing octave and octave-vrml together and ensuring the dpkg postinst script runs without error.

[Mike Miller (mtmiller)]

FYI, octave 3.8.1-1 was just uploaded to Debian unstable. The debdiff will be much larger, which is why I proposed this patch originally. Feel free to reject this change if it would be preferable to pull the new version from Debian (with Ubuntu-specific changes reapplied).

[Martin Pitt (pitti)]

Thanks Mike! I'll sponsor this fix for now. If you think that the new Debian version contains useful fixes, this can still be merged.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-02-25 20:41:26 +0000
+++ .pc/applied-patches	2014-03-10 13:34:35 +0000
@@ -11,3 +11,4 @@
 hurd_path_max.diff
 save-uint8-in-text-format.diff
 always-build-octave-jar.patch
+fix-pkg-depends-hyphen.diff

=== added directory '.pc/fix-pkg-depends-hyphen.diff'
=== added directory '.pc/fix-pkg-depends-hyphen.diff/scripts'
=== added directory '.pc/fix-pkg-depends-hyphen.diff/scripts/pkg'
=== added directory '.pc/fix-pkg-depends-hyphen.diff/scripts/pkg/private'
=== added file '.pc/fix-pkg-depends-hyphen.diff/scripts/pkg/private/fix_depends.m'
--- .pc/fix-pkg-depends-hyphen.diff/scripts/pkg/private/fix_depends.m	1970-01-01 00:00:00 +0000
+++ .pc/fix-pkg-depends-hyphen.diff/scripts/pkg/private/fix_depends.m	2014-03-10 13:34:35 +0000
@@ -0,0 +1,67 @@
+## Copyright (C) 2005-2013 Søren Hauberg
+## Copyright (C) 2010 VZLU Prague, a.s.
+##
+## This file is part of Octave.
+##
+## Octave is free software; you can redistribute it and/or modify it
+## under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or (at
+## your option) any later version.
+##
+## Octave is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {@var{deps_cell} =} fix_depends (@var{depends})
+## Undocumented internal function.
+## @end deftypefn
+
+## Make sure the depends field is of the right format.
+## This function returns a cell of structures with the following fields:
+##   package, version, operator
+function deps_cell = fix_depends (depends)
+  deps = strtrim (ostrsplit (tolower (depends), ","));
+  deps_cell = cell (1, length (deps));
+  dep_pat = ...
+  '\s*(?<name>\w+)+\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*';
+
+  ## For each dependency.
+  for i = 1:length (deps)
+    dep = deps{i};
+    [start, nm] = regexp (dep, dep_pat, 'start', 'names');
+    ## Is the dependency specified 
+    ## in the correct format?
+    if (! isempty (start))
+      package = tolower (strtrim (nm.name));
+      ## Does the dependency specify a version
+      ## Example: package(>= version).
+      if (! isempty (nm.ver))
+        operator = nm.op;
+        if (! any (strcmp (operator, {">", ">=", "<=", "<", "=="})))
+          error ("unsupported operator: %s", operator);
+        endif
+        version = fix_version (nm.ver);
+        ## If no version is specified for the dependency
+        ## we say that the version should be greater than
+        ## or equal to "0.0.0".
+      else
+        package = tolower (strtrim (dep));
+        operator = ">=";
+        version  = "0.0.0";
+      endif
+      deps_cell{i} = struct ("package", package, 
+                             "operator", operator,
+                             "version", version);
+    else
+      error ("incorrect syntax for dependency '%s' in the DESCRIPTION file\n",
+             dep);
+    endif
+  endfor
+endfunction
+

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-26 16:39:01 +0000
+++ debian/changelog	2014-03-10 13:34:35 +0000
@@ -1,3 +1,9 @@
+octave (3.8.0-5ubuntu5) trusty; urgency=medium
+
+  * Fix installing packages where dependency name contains '-'. (LP: #1288136)
+
+ -- Mike Miller <[e-mail]>  Mon, 10 Mar 2014 09:11:34 -0400
+
 octave (3.8.0-5ubuntu4) trusty; urgency=medium
 
   * Build again with default optimization on ppc64el.

=== added file 'debian/patches/fix-pkg-depends-hyphen.diff'
--- debian/patches/fix-pkg-depends-hyphen.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-pkg-depends-hyphen.diff	2014-03-10 13:34:35 +0000
@@ -0,0 +1,16 @@
+Description: Fix installing packages where dependency name contains '-'
+Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/442bca7dea44
+Bug: http://savannah.gnu.org/bugs/?41087
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1288136
+
+--- a/scripts/pkg/private/fix_depends.m
++++ b/scripts/pkg/private/fix_depends.m
+@@ -29,7 +29,7 @@ function deps_cell = fix_depends (depend
+   deps = strtrim (ostrsplit (tolower (depends), ","));
+   deps_cell = cell (1, length (deps));
+   dep_pat = ...
+-  '\s*(?<name>\w+)+\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*';
++  '\s*(?<name>[-\w]+)\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*';
+ 
+   ## For each dependency.
+   for i = 1:length (deps)

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-25 20:41:26 +0000
+++ debian/patches/series	2014-03-10 13:34:35 +0000
@@ -11,3 +11,4 @@
 hurd_path_max.diff
 save-uint8-in-text-format.diff
 always-build-octave-jar.patch
+fix-pkg-depends-hyphen.diff

=== modified file 'scripts/pkg/private/fix_depends.m'
--- scripts/pkg/private/fix_depends.m	2013-12-20 20:49:52 +0000
+++ scripts/pkg/private/fix_depends.m	2014-03-10 13:34:35 +0000
@@ -29,7 +29,7 @@
   deps = strtrim (ostrsplit (tolower (depends), ","));
   deps_cell = cell (1, length (deps));
   dep_pat = ...
-  '\s*(?<name>\w+)+\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*';
+  '\s*(?<name>[-\w]+)\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*';
 
   ## For each dependency.
   for i = 1:length (deps)