[Pkg-octave-commit] r993 - in octave/trunk/debian: . in patches
Rafael Laboissiere
rafael at alioth.debian.org
Fri Jul 27 07:48:42 UTC 2007
Author: rafael
Date: 2007-07-27 07:48:41 +0000 (Fri, 27 Jul 2007)
New Revision: 993
Removed:
octave/trunk/debian/patches/01_use_suitesparse_for_ufsparse.dpatch
octave/trunk/debian/patches/50_fix_pkg_rebuild.m.dpatch
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/in/octave2.9-00list
octave/trunk/debian/rules
Log:
Preparation for release 2.9.13-1 (two dpatches removed and small cleanup in
debian/rules)
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2007-07-25 04:02:23 UTC (rev 992)
+++ octave/trunk/debian/changelog 2007-07-27 07:48:41 UTC (rev 993)
@@ -1,5 +1,10 @@
-octave2.9 (1:2.9.12-3) UNRELEASED; urgency=low
+octave2.9 (1:2.9.13-1) UNRELEASED; urgency=low
+ * New upstream release
+ * debian/patches/01_use_suitesparse_for_ufsparse.dpatch,
+ debian/patches/50_fix_pkg_rebuild.m.dpatch : Removed patches
+ (applied upstream)
+
* debian/octave.st: Added enscript highlighting rules for Octave
* debian/in/PACKAGE.dirs: Added directory for enscript
* debian/rules: Install octave.st
Modified: octave/trunk/debian/in/octave2.9-00list
===================================================================
--- octave/trunk/debian/in/octave2.9-00list 2007-07-25 04:02:23 UTC (rev 992)
+++ octave/trunk/debian/in/octave2.9-00list 2007-07-27 07:48:41 UTC (rev 993)
@@ -1,3 +1,2 @@
-01_use_suitesparse_for_ufsparse.dpatch
50_octave-bug-tempfile
-50_fix_pkg_rebuild.m.dpatch
+
Deleted: octave/trunk/debian/patches/01_use_suitesparse_for_ufsparse.dpatch
===================================================================
--- octave/trunk/debian/patches/01_use_suitesparse_for_ufsparse.dpatch 2007-07-25 04:02:23 UTC (rev 992)
+++ octave/trunk/debian/patches/01_use_suitesparse_for_ufsparse.dpatch 2007-07-27 07:48:41 UTC (rev 993)
@@ -1,391 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_suitesparse_for_ufsparse.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Octave 2.9.12 needs some changes for usage of SuiteSparse 3.0 because
-## DP: the latter introduced a new "cs_complex_t" type
-## DP: Patch courtesy of David Bateman, see
-## DP: http://www.cae.wisc.edu/pipermail/help-octave/2007-June/004188.html
-
- at DPATCH@
-diff -urNad octave2.9-2.9.12~/liboctave/SparseCmplxQR.cc octave2.9-2.9.12/liboctave/SparseCmplxQR.cc
---- octave2.9-2.9.12~/liboctave/SparseCmplxQR.cc 2007-04-10 21:13:22.000000000 +0000
-+++ octave2.9-2.9.12/liboctave/SparseCmplxQR.cc 2007-06-06 07:55:54.000000000 +0000
-@@ -27,14 +27,22 @@
- #include "lo-error.h"
- #include "SparseCmplxQR.h"
-
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER < 2)) || (CS_VER < 2))
-+typedef double _Complex cs_complex_t;
-+
- // Why did g++ 4.x stl_vector.h make
--// OCTAVE_LOCAL_BUFFER (double _Complex, buf, n)
-+// OCTAVE_LOCAL_BUFFER (cs_complex_t, buf, n)
- // an error ?
- #define OCTAVE_C99_COMPLEX(buf, n) \
- OCTAVE_LOCAL_BUFFER (double, buf ## tmp, (2 * (n))); \
-- double _Complex *buf = reinterpret_cast<double _Complex *> (buf ## tmp);
-+ cs_complex_t *buf = reinterpret_cast<cs_complex_t *> (buf ## tmp);
-
--#define OCTAVE_C99_ZERO (0. + 0.iF);
-+#else
-+#define OCTAVE_C99_COMPLEX(buf, n) \
-+ OCTAVE_LOCAL_BUFFER (cs_complex_t, buf, (n));
-+#endif
-+
-+#define OCTAVE_C99_ZERO (0. + 0.iF)
-
- SparseComplexQR::SparseComplexQR_rep::SparseComplexQR_rep
- (GCC_ATTR_UNUSED const SparseComplexMatrix& a, GCC_ATTR_UNUSED int order)
-@@ -49,7 +57,7 @@
- // Prevents the methods below making a copy of the data.
- A.p = const_cast<octave_idx_type *>(a.cidx ());
- A.i = const_cast<octave_idx_type *>(a.ridx ());
-- A.x = const_cast<double _Complex *>(reinterpret_cast<const double _Complex *>
-+ A.x = const_cast<cs_complex_t *>(reinterpret_cast<const cs_complex_t *>
- (a.data ()));
- A.nz = -1;
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-@@ -180,8 +188,8 @@
- octave_idx_type b_nc = b.cols();
- octave_idx_type nc = N->L->n;
- octave_idx_type nr = nrows;
-- const double _Complex *bvec =
-- reinterpret_cast<const double _Complex *>(b.fortran_vec());
-+ const cs_complex_t *bvec =
-+ reinterpret_cast<const cs_complex_t *>(b.fortran_vec());
- ComplexMatrix ret(b_nr,b_nc);
- Complex *vec = ret.fortran_vec();
- if (nr < 1 || nc < 1 || nr != b_nr)
-@@ -196,10 +204,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_ipvec)
-- (S->pinv, bvec + idx, reinterpret_cast<double _Complex *>(buf), b_nr);
-+ (S->pinv, bvec + idx, reinterpret_cast<cs_complex_t *>(buf), b_nr);
- #else
- CXSPARSE_ZNAME (_ipvec)
-- (b_nr, S->Pinv, bvec + idx, reinterpret_cast<double _Complex *>(buf));
-+ (b_nr, S->Pinv, bvec + idx, reinterpret_cast<cs_complex_t *>(buf));
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- for (volatile octave_idx_type i = 0; i < nm; i++)
-@@ -207,7 +215,7 @@
- OCTAVE_QUIT;
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- CXSPARSE_ZNAME (_happly)
-- (N->L, i, N->B[i], reinterpret_cast<double _Complex *>(buf));
-+ (N->L, i, N->B[i], reinterpret_cast<cs_complex_t *>(buf));
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- }
- for (octave_idx_type i = 0; i < b_nr; i++)
-@@ -240,7 +248,7 @@
- if (! q.ok ())
- return ComplexMatrix();
- x.resize(nc, b_nc);
-- double _Complex *vec = reinterpret_cast<double _Complex *>
-+ cs_complex_t *vec = reinterpret_cast<cs_complex_t *>
- (x.fortran_vec());
- OCTAVE_C99_COMPLEX (buf, q.S()->m2);
- OCTAVE_LOCAL_BUFFER (Complex, Xx, b_nr);
-@@ -254,10 +262,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_ipvec)
-- (q.S()->pinv, reinterpret_cast<double _Complex *>(Xx), buf, nr);
-+ (q.S()->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr);
- #else
- CXSPARSE_ZNAME (_ipvec)
-- (nr, q.S()->Pinv, reinterpret_cast<double _Complex *>(Xx), buf);
-+ (nr, q.S()->Pinv, reinterpret_cast<cs_complex_t *>(Xx), buf);
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- for (volatile octave_idx_type j = 0; j < nc; j++)
-@@ -285,14 +293,20 @@
- if (! q.ok ())
- return ComplexMatrix();
- x.resize(nc, b_nc);
-- double _Complex *vec = reinterpret_cast<double _Complex *>
-+ cs_complex_t *vec = reinterpret_cast<cs_complex_t *>
- (x.fortran_vec());
- volatile octave_idx_type nbuf = (nc > q.S()->m2 ? nc : q.S()->m2);
- OCTAVE_C99_COMPLEX (buf, nbuf);
- OCTAVE_LOCAL_BUFFER (Complex, Xx, b_nr);
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ OCTAVE_LOCAL_BUFFER (double, B, nr);
-+ for (octave_idx_type i = 0; i < nr; i++)
-+ B[i] = q.N()->B [i];
-+#else
- OCTAVE_LOCAL_BUFFER (Complex, B, nr);
- for (octave_idx_type i = 0; i < nr; i++)
- B[i] = conj (reinterpret_cast<Complex *>(q.N()->B) [i]);
-+#endif
- for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc)
- {
- OCTAVE_QUIT;
-@@ -303,10 +317,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_pvec)
-- (q.S()->q, reinterpret_cast<double _Complex *>(Xx), buf, nr);
-+ (q.S()->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr);
- #else
- CXSPARSE_ZNAME (_pvec)
-- (nr, q.S()->Q, reinterpret_cast<double _Complex *>(Xx), buf);
-+ (nr, q.S()->Q, reinterpret_cast<cs_complex_t *>(Xx), buf);
- #endif
- CXSPARSE_ZNAME (_utsolve) (q.N()->U, buf);
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-@@ -315,8 +329,12 @@
- OCTAVE_QUIT;
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf);
-+#else
- CXSPARSE_ZNAME (_happly)
-- (q.N()->L, j, reinterpret_cast<double _Complex *>(B)[j], buf);
-+ (q.N()->L, j, reinterpret_cast<cs_complex_t *>(B)[j], buf);
-+#endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- }
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-@@ -372,10 +390,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_ipvec)
-- (q.S()->pinv, reinterpret_cast<double _Complex *>(Xx), buf, nr);
-+ (q.S()->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr);
- #else
- CXSPARSE_ZNAME (_ipvec)
-- (nr, q.S()->Pinv, reinterpret_cast<double _Complex *>(Xx), buf);
-+ (nr, q.S()->Pinv, reinterpret_cast<cs_complex_t *>(Xx), buf);
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- for (volatile octave_idx_type j = 0; j < nc; j++)
-@@ -389,10 +407,10 @@
- CXSPARSE_ZNAME (_usolve) (q.N()->U, buf);
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_ipvec)
-- (q.S()->q, buf, reinterpret_cast<double _Complex *>(Xx), nc);
-+ (q.S()->q, buf, reinterpret_cast<cs_complex_t *>(Xx), nc);
- #else
- CXSPARSE_ZNAME (_ipvec)
-- (nc, q.S()->Q, buf, reinterpret_cast<double _Complex *>(Xx));
-+ (nc, q.S()->Q, buf, reinterpret_cast<cs_complex_t *>(Xx));
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-
-@@ -430,9 +448,16 @@
- volatile octave_idx_type nbuf = (nc > q.S()->m2 ? nc : q.S()->m2);
- OCTAVE_LOCAL_BUFFER (Complex, Xx, (b_nr > nc ? b_nr : nc));
- OCTAVE_C99_COMPLEX (buf, nbuf);
-+
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ OCTAVE_LOCAL_BUFFER (double, B, nr);
-+ for (octave_idx_type i = 0; i < nr; i++)
-+ B[i] = q.N()->B [i];
-+#else
- OCTAVE_LOCAL_BUFFER (Complex, B, nr);
- for (octave_idx_type i = 0; i < nr; i++)
- B[i] = conj (reinterpret_cast<Complex *>(q.N()->B) [i]);
-+#endif
- for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc)
- {
- OCTAVE_QUIT;
-@@ -443,10 +468,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_pvec)
-- (q.S()->q, reinterpret_cast<double _Complex *>(Xx), buf, nr);
-+ (q.S()->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr);
- #else
- CXSPARSE_ZNAME (_pvec)
-- (nr, q.S()->Q, reinterpret_cast<double _Complex *>(Xx), buf);
-+ (nr, q.S()->Q, reinterpret_cast<cs_complex_t *>(Xx), buf);
- #endif
- CXSPARSE_ZNAME (_utsolve) (q.N()->U, buf);
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-@@ -454,17 +479,21 @@
- {
- OCTAVE_QUIT;
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf);
-+#else
- CXSPARSE_ZNAME (_happly)
-- (q.N()->L, j, reinterpret_cast<double _Complex *>(B)[j], buf);
-+ (q.N()->L, j, reinterpret_cast<cs_complex_t *>(B)[j], buf);
-+#endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- }
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_pvec)
-- (q.S()->pinv, buf, reinterpret_cast<double _Complex *>(Xx), nc);
-+ (q.S()->pinv, buf, reinterpret_cast<cs_complex_t *>(Xx), nc);
- #else
- CXSPARSE_ZNAME (_pvec)
-- (nc, q.S()->Pinv, buf, reinterpret_cast<double _Complex *>(Xx));
-+ (nc, q.S()->Pinv, buf, reinterpret_cast<cs_complex_t *>(Xx));
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-
-@@ -506,8 +535,8 @@
- octave_idx_type nc = a.cols();
- octave_idx_type b_nc = b.cols();
- octave_idx_type b_nr = b.rows();
-- const double _Complex *bvec =
-- reinterpret_cast<const double _Complex *>(b.fortran_vec());
-+ const cs_complex_t *bvec =
-+ reinterpret_cast<const cs_complex_t *>(b.fortran_vec());
- ComplexMatrix x;
-
- if (nr < 1 || nc < 1 || nr != b_nr)
-@@ -519,7 +548,7 @@
- if (! q.ok ())
- return ComplexMatrix();
- x.resize(nc, b_nc);
-- double _Complex *vec = reinterpret_cast<double _Complex *>
-+ cs_complex_t *vec = reinterpret_cast<cs_complex_t *>
- (x.fortran_vec());
- OCTAVE_C99_COMPLEX (buf, q.S()->m2);
- for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc;
-@@ -560,13 +589,19 @@
- if (! q.ok ())
- return ComplexMatrix();
- x.resize(nc, b_nc);
-- double _Complex *vec = reinterpret_cast<double _Complex *>
-+ cs_complex_t *vec = reinterpret_cast<cs_complex_t *>
- (x.fortran_vec());
- volatile octave_idx_type nbuf = (nc > q.S()->m2 ? nc : q.S()->m2);
- OCTAVE_C99_COMPLEX (buf, nbuf);
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ OCTAVE_LOCAL_BUFFER (double, B, nr);
-+ for (octave_idx_type i = 0; i < nr; i++)
-+ B[i] = q.N()->B [i];
-+#else
- OCTAVE_LOCAL_BUFFER (Complex, B, nr);
- for (octave_idx_type i = 0; i < nr; i++)
- B[i] = conj (reinterpret_cast<Complex *>(q.N()->B) [i]);
-+#endif
- for (volatile octave_idx_type i = 0, idx = 0, bidx = 0; i < b_nc;
- i++, idx+=nc, bidx+=b_nr)
- {
-@@ -585,8 +620,12 @@
- {
- OCTAVE_QUIT;
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf);
-+#else
- CXSPARSE_ZNAME (_happly)
-- (q.N()->L, j, reinterpret_cast<double _Complex *>(B)[j], buf);
-+ (q.N()->L, j, reinterpret_cast<cs_complex_t *>(B)[j], buf);
-+#endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- }
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-@@ -642,10 +681,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_ipvec)
-- (q.S()->pinv, reinterpret_cast<double _Complex *>(Xx), buf, nr);
-+ (q.S()->pinv, reinterpret_cast<cs_complex_t *>(Xx), buf, nr);
- #else
- CXSPARSE_ZNAME (_ipvec)
-- (nr, q.S()->Pinv, reinterpret_cast<double _Complex *>(Xx), buf);
-+ (nr, q.S()->Pinv, reinterpret_cast<cs_complex_t *>(Xx), buf);
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- for (volatile octave_idx_type j = 0; j < nc; j++)
-@@ -659,10 +698,10 @@
- CXSPARSE_ZNAME (_usolve) (q.N()->U, buf);
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_ipvec)
-- (q.S()->q, buf, reinterpret_cast<double _Complex *>(Xx), nc);
-+ (q.S()->q, buf, reinterpret_cast<cs_complex_t *>(Xx), nc);
- #else
- CXSPARSE_ZNAME (_ipvec)
-- (nc, q.S()->Q, buf, reinterpret_cast<double _Complex *>(Xx));
-+ (nc, q.S()->Q, buf, reinterpret_cast<cs_complex_t *>(Xx));
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-
-@@ -700,9 +739,15 @@
- volatile octave_idx_type nbuf = (nc > q.S()->m2 ? nc : q.S()->m2);
- OCTAVE_LOCAL_BUFFER (Complex, Xx, (b_nr > nc ? b_nr : nc));
- OCTAVE_C99_COMPLEX (buf, nbuf);
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ OCTAVE_LOCAL_BUFFER (double, B, nr);
-+ for (octave_idx_type i = 0; i < nr; i++)
-+ B[i] = q.N()->B [i];
-+#else
- OCTAVE_LOCAL_BUFFER (Complex, B, nr);
- for (octave_idx_type i = 0; i < nr; i++)
- B[i] = conj (reinterpret_cast<Complex *>(q.N()->B) [i]);
-+#endif
- for (volatile octave_idx_type i = 0, idx = 0; i < b_nc; i++, idx+=nc)
- {
- OCTAVE_QUIT;
-@@ -713,10 +758,10 @@
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_pvec)
-- (q.S()->q, reinterpret_cast<double _Complex *>(Xx), buf, nr);
-+ (q.S()->q, reinterpret_cast<cs_complex_t *>(Xx), buf, nr);
- #else
- CXSPARSE_ZNAME (_pvec)
-- (nr, q.S()->Q, reinterpret_cast<double _Complex *>(Xx), buf);
-+ (nr, q.S()->Q, reinterpret_cast<cs_complex_t *>(Xx), buf);
- #endif
- CXSPARSE_ZNAME (_utsolve) (q.N()->U, buf);
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-@@ -724,17 +769,21 @@
- {
- OCTAVE_QUIT;
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-+#if defined(CS_VER) && (((CS_VER == 2) && (CS_SUBVER >= 2)) || (CS_VER > 2))
-+ CXSPARSE_ZNAME (_happly) (q.N()->L, j, B[j], buf);
-+#else
- CXSPARSE_ZNAME (_happly)
-- (q.N()->L, j, reinterpret_cast<double _Complex *>(B)[j], buf);
-+ (q.N()->L, j, reinterpret_cast<cs_complex_t *>(B)[j], buf);
-+#endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- }
- BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
- #if defined(CS_VER) && (CS_VER >= 2)
- CXSPARSE_ZNAME (_pvec)
-- (q.S()->pinv, buf, reinterpret_cast<double _Complex *>(Xx), nc);
-+ (q.S()->pinv, buf, reinterpret_cast<cs_complex_t *>(Xx), nc);
- #else
- CXSPARSE_ZNAME (_pvec)
-- (nc, q.S()->Pinv, buf, reinterpret_cast<double _Complex *>(Xx));
-+ (nc, q.S()->Pinv, buf, reinterpret_cast<cs_complex_t *>(Xx));
- #endif
- END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
-
-diff -urNad octave2.9-2.9.12~/liboctave/oct-sparse.h octave2.9-2.9.12/liboctave/oct-sparse.h
---- octave2.9-2.9.12~/liboctave/oct-sparse.h 2007-01-10 18:20:18.000000000 +0000
-+++ octave2.9-2.9.12/liboctave/oct-sparse.h 2007-06-06 07:55:54.000000000 +0000
-@@ -28,10 +28,6 @@
- #include <config.h>
- #endif
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--
- #if defined (HAVE_SUITESPARSE_UMFPACK_H)
- #include <suitesparse/umfpack.h>
- #elif defined (HAVE_UFSPARSE_UMFPACK_H)
-@@ -103,8 +99,4 @@
- #endif
- #endif
-
--#ifdef __cplusplus
--}
--#endif
--
- #endif
Deleted: octave/trunk/debian/patches/50_fix_pkg_rebuild.m.dpatch
===================================================================
--- octave/trunk/debian/patches/50_fix_pkg_rebuild.m.dpatch 2007-07-25 04:02:23 UTC (rev 992)
+++ octave/trunk/debian/patches/50_fix_pkg_rebuild.m.dpatch 2007-07-27 07:48:41 UTC (rev 993)
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_fix_pkg_rebuild.m.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix -rebuild issue with pkg.m, patch taken from CVS, version 1.47
-## DP: http://www.nabble.com/Small-bug-in-%22pkg-rebuild%22-tf3807246.html
-
- at DPATCH@
-diff -urNad octave-2.9.12~/scripts/pkg/pkg.m octave-2.9.12/scripts/pkg/pkg.m
---- octave-2.9.12~/scripts/pkg/pkg.m 2007-05-22 19:25:29.000000000 +0000
-+++ octave-2.9.12/scripts/pkg/pkg.m 2007-05-24 18:24:31.000000000 +0000
-@@ -291,7 +291,7 @@
-
- case "rebuild"
- if (global_install)
-- global_packages = rebuild (prefix, global_list, auto, verbose);
-+ global_packages = rebuild (prefix, global_list, files, auto, verbose);
- save (global_list, "global_packages");
- local_packages = global_packages;
- else
-@@ -315,9 +315,12 @@
- else
- old_descriptions = installed_packages (list, list);
- wd = pwd ();
-- cd (prefix);
-- dirlist = glob (cellfun(@(x) [x, '-*'], files, 'UniformOutput', 0))
-- cd (wd);
-+ unwind_protect
-+ cd (prefix);
-+ dirlist = glob (cellfun(@(x) [x, '-*'], files, 'UniformOutput', 0))
-+ unwind_protect_cleanup
-+ cd (wd);
-+ end_unwind_protect
- endif
- descriptions = {};
- for k = 1:length (dirlist)
-@@ -351,10 +354,10 @@
- endif
- endfor
-
-- if (isempty (files))
-+ if (! isempty (files))
- ## We are rebuilding for a particular package(s) so we should take
- ## care to keep the other untouched packages in the descriptions
-- descriptions = {desriptions{:}, old_desriptions{:}};
-+ descriptions = {descriptions{:}, old_descriptions{:}};
-
- dup = [];
- for i = 1:length (descriptions)
Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules 2007-07-25 04:02:23 UTC (rev 992)
+++ octave/trunk/debian/rules 2007-07-27 07:48:41 UTC (rev 993)
@@ -214,7 +214,7 @@
# The following must be dropped when the upstream Makefile.in
# is fixed
- rm -rf libcruft/mkf77def libcruft/misc/pic test/a.wav
+# rm -rf libcruft/misc/pic
dh_clean
More information about the Pkg-octave-commit
mailing list