[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.1-6-8-g8b29c98

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit cc5340725f221c75be73345e3ad58978893ab739
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri Jun 1 11:57:46 2012 +0200

    base2dec.patch: remove patch, applied upstream

diff --git a/debian/patches/base2dec.patch b/debian/patches/base2dec.patch
deleted file mode 100644
index 3e8604a..0000000
--- a/debian/patches/base2dec.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix bug in base2dec.m
- In particular, this patch removes a failure in the testsuite of
- octave-communications 1.1.1.
-Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/731e9e1539a8
-Bug: http://savannah.gnu.org/bugs/?func=detailitem&item_id=35621
-Last-Update: 2012-05-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/scripts/strings/base2dec.m b/scripts/strings/base2dec.m
---- a/scripts/strings/base2dec.m
-+++ b/scripts/strings/base2dec.m
-@@ -89,7 +89,7 @@
-   table = NaN (1, 256);
-   table(toascii (symbols(1:base))) = 0 : base-1;
-   table(toascii (" ")) = 0;
--  s = table(toascii (s));
-+  s = reshape (table(toascii (s)), size (s));
- 
-   ## Multiply the resulting digits by the appropriate power
-   ## and sum the rows.
-@@ -103,6 +103,9 @@
- %!assert(base2dec ("-1", 2), NaN);
- %!assert(base2dec ({"A1", "1A"}, 16), [161; 26]);
- 
-+%% Bug #35621
-+%!assert (base2dec (["0"; "1"], 2), [0; 1])
-+
- %%Test input validation
- %!error base2dec ();
- %!error base2dec ("11120");
-
diff --git a/debian/patches/series b/debian/patches/series
index 2d29c33..0799947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ add_info_dir_categories
 correct_typos
 use_system_gl2ps
 drop_version_from_mkoctfile_function_call
-base2dec.patch

-- 
Debian packaging for octave