[Python-modules-commits] r9775 - in packages/scipy/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Tuesday, September 15, 2009 @ 21:31:24
  Author: dktrkranz
Revision: 9775

Remove patches, they are no longer needed and also causing FTBFS with
recent python-numpy. Remove quilt machinery too (Closes: #545606)

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/rules
Deleted:
  packages/scipy/trunk/debian/patches/

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2009-09-15 19:39:14 UTC (rev 9774)
+++ packages/scipy/trunk/debian/changelog	2009-09-15 21:31:24 UTC (rev 9775)
@@ -11,10 +11,12 @@
     + Bump build-depends to python-all-dev (>= 2.5.4-1~)
 
   [ Luca Falavigna ]
+  * Remove patches, they are no longer needed and also causing FTBFS with
+    recent python-numpy. Remove quilt machinery too (Closes: #545606).
   * debian/copyright: add missing copyright holder (Closes: #540504).
   * debian/watch: fix regex to report correct upstream stable version.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Tue, 15 Sep 2009 21:34:21 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 15 Sep 2009 23:18:53 +0200
 
 python-scipy (0.7.0-1) unstable; urgency=low
 

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2009-09-15 19:39:14 UTC (rev 9774)
+++ packages/scipy/trunk/debian/control	2009-09-15 21:31:24 UTC (rev 9775)
@@ -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>, David Cournapeau <cournape at gmail.com>
-Build-Depends: debhelper (>= 5.0.37.2), dpkg-dev (>= 1.13.19), quilt,
+Build-Depends: debhelper (>= 5.0.37.2), dpkg-dev (>= 1.13.19),
  python-all-dev (>= 2.5.4-1~), python-central (>= 0.5), python-numpy (>= 1:1.2.0), gfortran,
  sharutils, swig, libsuitesparse-dev (>= 3.1.0-3),
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2009-09-15 19:39:14 UTC (rev 9774)
+++ packages/scipy/trunk/debian/rules	2009-09-15 21:31:24 UTC (rev 9775)
@@ -19,13 +19,13 @@
 #debian_patches= umfpack signals viewer sandbox  #fft python23 amd64
 
 build: build-stamp
-build-stamp: patched-stamp
+build-stamp:
 	dh_testdir
 # We do the actual compilation in install to avoid cloberring
 # scipy.so
 	touch build-stamp
 
-clean: clean-patched unpatch
+clean: clean-patched
 
 clean-patched:
 	dh_testdir
@@ -89,16 +89,3 @@
 
 binary: binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
-
-# ---------------------------------------------------------------------------
-# Rules to manage patches (taken from dpatch man page)
-
-
-
-patch: patched-stamp
-
-patched-stamp:
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-unpatch:
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2