[Pkg-octave-commit] [SCM] Debian packaging for octave-communications branch, master, updated. debian/1.1.0-2-8-g5796659

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 8f32d695b19630e154b55530e8fceed47c3c0b08
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri May 18 14:14:06 2012 +0200

    LU-class-name-clash.patch: remove patch, applied upstream

diff --git a/debian/patches/LU-class-name-clash.patch b/debian/patches/LU-class-name-clash.patch
deleted file mode 100644
index 46c3ebe..0000000
--- a/debian/patches/LU-class-name-clash.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Thomas Sailer
-Description: Rename LU class to avoid a name clash with the LU class of octave 3.6.0
-Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=9540
-Last-Update: 2012-03-12
-
---- octave-communications-1.1.0.orig/src/galois.cc
-+++ octave-communications-1.1.0/src/galois.cc
-@@ -882,7 +882,7 @@ galois::exp (void) const
- template class base_lu <galois>;
- 
- void
--LU::factor (const galois& a, const pivot_type& typ)
-+galoisLU::factor (const galois& a, const pivot_type& typ)
- {
-   int a_nr = a.rows ();
-   int a_nc = a.cols ();
-@@ -898,7 +898,7 @@ LU::factor (const galois& a, const pivot
-     int jp = j;
- 
-     // Find the pivot and test for singularity
--    if (ptype == LU::ROW) { 
-+    if (ptype == galoisLU::ROW) { 
-       for (int i = j+1; i < a_nr; i++)
- 	if (a_fact(i,j) > a_fact(jp,j))
- 	  jp = i;
-@@ -911,7 +911,7 @@ LU::factor (const galois& a, const pivot
-     ipvt(j) = jp;
- 
-     if (a_fact(jp,j) != 0) {
--      if (ptype == LU::ROW) { 
-+      if (ptype == galoisLU::ROW) { 
- 	// Apply the interchange to columns 1:NC.
- 	if (jp != j)
- 	  for (int i = 0; i < a_nc; i++) {
-@@ -962,7 +962,7 @@ LU::factor (const galois& a, const pivot
- }
- 
- galois
--LU::L (void) const
-+galoisLU::L (void) const
- {
-   int a_nr = a_fact.rows ();
-   int a_nc = a_fact.cols ();
-@@ -981,7 +981,7 @@ LU::L (void) const
- }
- 
- galois
--LU::U (void) const
-+galoisLU::U (void) const
- {
-   int a_nr = a_fact.rows ();
-   int a_nc = a_fact.cols ();
-@@ -1049,7 +1049,7 @@ galois::determinant (int& info) const
-     info = 0;
-     retval(0,0) = 1;
-   } else {
--    LU fact (*this);
-+    galoisLU fact (*this);
- 
-     if ( ! fact.singular()) {
-       galois A (fact.a_fact);
-@@ -1110,7 +1110,7 @@ galois::solve (const galois& b, int& inf
-     return galois();
-   } else if (nc > nr) {
-     // Under-determined system, use column interchanges.
--    LU fact ((*this), LU::COL);
-+    galoisLU fact ((*this), galoisLU::COL);
- 
-     if (fact.singular()) {
-       info = -1;
-@@ -1173,7 +1173,7 @@ galois::solve (const galois& b, int& inf
-     }
-     
-   } else {
--    LU fact (*this);
-+    galoisLU fact (*this);
- 
-     if (fact.singular()) {
-       info = -1;
---- octave-communications-1.1.0.orig/src/galois.h
-+++ octave-communications-1.1.0/src/galois.h
-@@ -131,7 +131,7 @@ public:
- };
- 
- class
--LU : public base_lu <galois>
-+galoisLU : public base_lu <galois>
- {
-   friend class galois;
- public:
-@@ -141,15 +141,15 @@ public:
-     COL
-   };
- 
--  LU (void) : base_lu <galois> () { }
-+  galoisLU (void) : base_lu <galois> () { }
- 
--  LU (const galois& a, const pivot_type& typ) { factor (a, typ); }
-+  galoisLU (const galois& a, const pivot_type& typ) { factor (a, typ); }
- 
--  LU (const galois& a) { factor (a, LU::ROW); }
-+  galoisLU (const galois& a) { factor (a, galoisLU::ROW); }
- 
--  LU (const LU& a) : base_lu <galois> (a) { }
-+  galoisLU (const galoisLU& a) : base_lu <galois> (a) { }
- 
--  LU& operator = (const LU& a)
-+  galoisLU& operator = (const galoisLU& a)
-     {
-       if (this != &a)
- 	base_lu <galois> :: operator = (a);
-@@ -157,7 +157,7 @@ public:
-       return *this;
-     }
- 
--  ~LU (void) { }
-+  ~galoisLU (void) { }
- 
-   galois L (void) const;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3b1fc98..0cf16c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-LU-class-name-clash.patch
 fix-huffmandict-test.patch
 build-documentation.patch
 info-dir-section.patch

-- 
Debian packaging for octave-communications