[pysparse] 02/06: Update patch queue.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository pysparse.

commit e76567431f4f2a8d95d11d6fb50b3bbce5709b8e
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Sep 23 11:14:42 2016 +0100

    Update patch queue.
    
    - Drop no-g2c.patch, applied upstream.
    - Refresh suitesparse-4.1.patch.
    - Drop superlu-4.3.patch, no longer applicable.
    
    Gbp-Dch: Full
---
 debian/patches/no-g2c.patch          | 13 -------------
 debian/patches/series                |  2 --
 debian/patches/suitesparse-4.1.patch | 12 ++++++------
 debian/patches/superlu-4.3.patch     | 18 ------------------
 4 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/debian/patches/no-g2c.patch b/debian/patches/no-g2c.patch
deleted file mode 100644
index d2a2eea..0000000
--- a/debian/patches/no-g2c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Remove g2c library no longer in Debian from consideration by setup.py.
-
---- pysparse-1.1/setup.py~	2009-07-29 18:06:29.000000000 -0400
-+++ pysparse-1.1/setup.py	2009-09-27 18:17:28.000000000 -0400
-@@ -8,7 +8,7 @@
- 
- # default settings
- library_dirs_list= []
--libraries_list = ['lapack', 'blas', 'g2c']
-+libraries_list = ['lapack', 'blas']
- superlu_defs = [('USE_VENDOR_BLAS',1)]
- if sys.platform == 'win32':
-     superlu_defs += [('NO_TIMER', 1)]
diff --git a/debian/patches/series b/debian/patches/series
index 75155a9..ce73121 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-no-g2c.patch
 use-debian-libs.patch
 suitesparse-4.1.patch
-superlu-4.3.patch
diff --git a/debian/patches/suitesparse-4.1.patch b/debian/patches/suitesparse-4.1.patch
index c3cf5f1..3227fd4 100644
--- a/debian/patches/suitesparse-4.1.patch
+++ b/debian/patches/suitesparse-4.1.patch
@@ -10,7 +10,7 @@ Last-Update: 2013-08-05
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Src/umfpackmodule.c
 +++ b/Src/umfpackmodule.c
-@@ -491,7 +491,7 @@
+@@ -493,7 +493,7 @@
  }
  
  static PyObject *
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                    double tolpivot, double tolsympivot)
  {
    UMFPackObject *self;
-@@ -544,9 +544,6 @@
+@@ -546,9 +546,6 @@
    if (strategy != -1)
      self->Control[UMFPACK_STRATEGY] = strategy;
  
@@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    if (scale != -1)
      self->Control[UMFPACK_SCALE] = scale;
  
-@@ -662,9 +659,6 @@
+@@ -664,9 +661,6 @@
                      \"UMFPACK_STRATEGY_AUTO\"\n\
                      \"UMFPACK_STRATEGY_UNSYMMETRIC\"\n\
                      \"UMFPACK_STRATEGY_SYMMETRIC\"\n\
@@ -39,7 +39,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \n\
  scale               scaling UMFPACK would use\n\
                      \"UMFPACK_SCALE_NONE\"\n\
-@@ -683,19 +677,17 @@
+@@ -685,19 +679,17 @@
  factorize(PyObject *self, PyObject *args, PyObject *keywds) {
    LLMatObject *matrix;
    char *strategy="UMFPACK_STRATEGY_AUTO";
@@ -61,7 +61,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                      &scale,
                      &tolpivot,
                      &tolsympivot);
-@@ -708,8 +700,6 @@
+@@ -710,8 +702,6 @@
      strategyval = UMFPACK_STRATEGY_UNSYMMETRIC;
    else if (strcmp("UMFPACK_STRATEGY_SYMMETRIC", strategy) == 0)
      strategyval = UMFPACK_STRATEGY_SYMMETRIC;
@@ -70,7 +70,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
    if (strcmp("UMFPACK_SCALE_NONE", scale) == 0)
      scaleval = UMFPACK_SCALE_NONE;
-@@ -718,7 +708,7 @@
+@@ -720,7 +710,7 @@
    if (strcmp("UMFPACK_SCALE_MAX", scale) == 0)
      scaleval = UMFPACK_SCALE_MAX;
  
diff --git a/debian/patches/superlu-4.3.patch b/debian/patches/superlu-4.3.patch
deleted file mode 100644
index 07147bf..0000000
--- a/debian/patches/superlu-4.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS against superlu 4.3
- The tolerance argument to dgstrf() has been dropped in superlu.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: no
-Last-Update: 2014-03-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Src/superlu3module.c
-+++ b/Src/superlu3module.c
-@@ -267,7 +267,7 @@ static PyObject *newSuperLUObject(int n,
-   //printf("Factorizing with drop_tol = %g\n", drop_tol);
-   /* Perform factorization (perm_c and perm_r are swapped because our matrix
-    * is stored in compressed-row format and not in compressed-column format! */
--  dgstrf(&self->options, &AC, drop_tol, relax, panel_size,
-+  dgstrf(&self->options, &AC, relax, panel_size,
-          etree, NULL, 0, self->perm_c, self->perm_r,
-          &self->L, &self->U, &self->stat, &info);
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pysparse.git