[Pkg-octave-commit] [SCM] Debian packaging for octave-odepkg branch, master, updated. upstream/0.8.0-23-g8a5d764

Rafael Laboissiere rafael at laboissiere.net
Fri Apr 20 11:52:14 UTC 2012


The following commit has been merged in the master branch:
commit b49adc78eff284aa930a9c543f5416ef7fe1bd2f
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Apr 20 11:44:52 2012 +0000

    Drop patch fix-call-to-print-with-name.patch (applied upstream)

diff --git a/debian/patches/fix-call-to-print-with-name.patch b/debian/patches/fix-call-to-print-with-name.patch
deleted file mode 100644
index e7e6e06..0000000
--- a/debian/patches/fix-call-to-print-with-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Carlo de Falco  <kingcrimson at tiscali.it>
-Description: Fixed call to octave_value::print_with_name
-Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/odepkg/src/odepkg_auxiliary_functions.cc?view=patch&r1=9007&r2=9006&pathrev=9007
-Last-Update: 2012-03-11
-
---- octave-odepkg-0.8.0.orig/src/odepkg_auxiliary_functions.cc
-+++ octave-odepkg-0.8.0/src/odepkg_auxiliary_functions.cc
-@@ -454,8 +454,8 @@ octave_idx_type odepkg_auxiliary_solstor
-       // eg. if the code should be debuged or something like this
-       vt = octave_value (vtstore);
-       vy = octave_value (vystore);
--      vt.print_with_name (octave_stdout, "vt", true);
--      vy.print_with_name (octave_stdout, "vy", true);
-+      vt.print_with_name (octave_stdout, "vt");
-+      vy.print_with_name (octave_stdout, "vy");
-       break;
-   }
- 
diff --git a/debian/patches/series b/debian/patches/series
index c61cc7b..6c0facb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 info-dir-section.diff
-fix-call-to-print-with-name.patch
 fix-short-circuit-warning.patch

-- 
Debian packaging for octave-odepkg



More information about the Pkg-octave-commit mailing list