[Python-modules-commits] r3821 - in packages/scipy/trunk/debian (6 files)

[certik-guest at users.alioth.debian.org]

    Date: Monday, December 3, 2007 @ 14:34:36
  Author: certik-guest
Revision: 3821

dpatch -> quilt

Added:
  packages/scipy/trunk/debian/patches/series
    (from rev 3817, packages/scipy/trunk/debian/patches/00list)
Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/patches/umfpack.dpatch
  packages/scipy/trunk/debian/rules
Deleted:
  packages/scipy/trunk/debian/patches/00list

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2007-12-03 14:18:31 UTC (rev 3820)
+++ packages/scipy/trunk/debian/changelog	2007-12-03 14:34:36 UTC (rev 3821)
@@ -1,3 +1,9 @@
+python-scipy (0.6.0-4) UNRELEASED; urgency=low
+
+  * Use quilt (much eaiser to use) instead of dpatch
+
+ -- Ondrej Certik <ondrej at certik.cz>  Mon, 03 Dec 2007 15:33:24 +0100
+
 python-scipy (0.6.0-3) unstable; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2007-12-03 14:18:31 UTC (rev 3820)
+++ packages/scipy/trunk/debian/control	2007-12-03 14:34:36 UTC (rev 3821)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Alexandre Fayolle <afayolle at debian.org>, Marco Presi (Zufus) <zufus at debian.org>, Ondrej Certik <ondrej at certik.cz>
-Build-Depends: debhelper (>= 5.0.37.2), dpkg-dev (>= 1.13.19), dpatch,
+Build-Depends: debhelper (>= 5.0.37.2), dpkg-dev (>= 1.13.19), quilt,
  python-all-dev, python-central (>= 0.5), python-numpy (>= 1:1.0.2),
  g77, sharutils, swig, libsuitesparse-dev (>= 3.0.0-6.1), netcdfg-dev,
  libx11-dev, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev,

Deleted: packages/scipy/trunk/debian/patches/00list
===================================================================
--- packages/scipy/trunk/debian/patches/00list	2007-12-03 14:18:31 UTC (rev 3820)
+++ packages/scipy/trunk/debian/patches/00list	2007-12-03 14:34:36 UTC (rev 3821)
@@ -1 +0,0 @@
-umfpack.dpatch

Copied: packages/scipy/trunk/debian/patches/series (from rev 3817, packages/scipy/trunk/debian/patches/00list)
===================================================================
--- packages/scipy/trunk/debian/patches/series	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/series	2007-12-03 14:34:36 UTC (rev 3821)
@@ -0,0 +1 @@
+umfpack.dpatch

Modified: packages/scipy/trunk/debian/patches/umfpack.dpatch
===================================================================
--- packages/scipy/trunk/debian/patches/umfpack.dpatch	2007-12-03 14:18:31 UTC (rev 3820)
+++ packages/scipy/trunk/debian/patches/umfpack.dpatch	2007-12-03 14:34:36 UTC (rev 3821)
@@ -1,22 +1,7 @@
-#! /bin/sh -e
-
-# DP: Modified
-
-if [ $# -ne 1 ]; then
-    echo >&2 "$0: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f -p0 < $0;;
-    -unpatch) patch -f -R -p0 < $0;;
-    *)
-        echo >&2 "$0: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- scipy.orig/linsolve/umfpack/umfpack.i
-+++ scipy/linsolve/umfpack/umfpack.i
+Index: python-scipy-0.6.0/scipy/linsolve/umfpack/umfpack.i
+===================================================================
+--- python-scipy-0.6.0.orig/scipy/linsolve/umfpack/umfpack.i	2007-12-03 15:20:37.827719117 +0100
++++ python-scipy-0.6.0/scipy/linsolve/umfpack/umfpack.i	2007-12-03 15:20:51.328488481 +0100
 @@ -10,13 +10,13 @@
  */
  

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2007-12-03 14:18:31 UTC (rev 3820)
+++ packages/scipy/trunk/debian/rules	2007-12-03 14:34:36 UTC (rev 3821)
@@ -92,9 +92,7 @@
 patch: patched-stamp
 
 patched-stamp:
-	dpatch apply-all
-	dpatch cat-all > patch-stamp
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
 unpatch:
-	dpatch deapply-all
-	rm -fr patched-stamp debian/patched
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2