[Python-modules-commits] r15136 - in packages/scipy/trunk/debian (5 files)

varun at users.alioth.debian.org varun at users.alioth.debian.org
Fri Dec 24 15:52:40 UTC 2010


    Date: Friday, December 24, 2010 @ 15:52:20
  Author: varun
Revision: 15136

* New upstream release
* Build-Depend on python-numpy-* (>= 1:1.5.1)
* Update all the debian/patches/*

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/patches/blitz++.patch
  packages/scipy/trunk/debian/patches/restore_sys_argv.patch
  packages/scipy/trunk/debian/patches/string_exception.patch

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2010-12-23 23:14:52 UTC (rev 15135)
+++ packages/scipy/trunk/debian/changelog	2010-12-24 15:52:20 UTC (rev 15136)
@@ -1,5 +1,10 @@
-python-scipy (0.7.2+dfsg1-2) UNRELEASED; urgency=low
+python-scipy (0.8.0+dfsg1-1) experimental; urgency=low
 
+  [ Varun Hiremath ]
+  * New upstream release
+  * Build-Depend on python-numpy-* (>= 1:1.5.1)
+  * Update all the debian/patches/*
+
   [ Luca Falavigna ]
   * Remove myself from Uploaders.
 
@@ -7,7 +12,7 @@
   * debian/patches/blitz++.patch: Fix scipy.weave.inline compilations. Thanks
     to Sameer Morar (Closes: #598520, LP: #302649)
 
- -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Wed, 29 Sep 2010 15:22:10 +0200
+ -- Varun Hiremath <varun at debian.org>  Fri, 24 Dec 2010 08:20:54 -0500
 
 python-scipy (0.7.2+dfsg1-1) unstable; urgency=low
 

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2010-12-23 23:14:52 UTC (rev 15135)
+++ packages/scipy/trunk/debian/control	2010-12-24 15:52:20 UTC (rev 15136)
@@ -5,7 +5,7 @@
 Uploaders: Alexandre Fayolle <afayolle at debian.org>, Ondrej Certik <ondrej at certik.cz>, David Cournapeau <cournape at gmail.com>, Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.5.4-1~),
  python-all-dbg (>= 2.5.4-1~), python-central (>= 0.6.7),
- python-numpy (>= 1:1.4.1-4~), python-numpy-dbg (>= 1:1.2.0),
+ python-numpy (>= 1:1.5.1), python-numpy-dbg (>= 1:1.5.1),
  gfortran, sharutils, swig, libsuitesparse-dev (>= 3.1.0-3),
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev
 XS-Python-Version: all
@@ -18,7 +18,7 @@
 Package: python-scipy
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-numpy (>= 1:1.2.0), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Recommends: g++ | c++-compiler
 Suggests: python-profiler
@@ -37,7 +37,7 @@
 Section: debug
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-dbg, ${shlibs:Depends}, ${misc:Depends}, python-scipy (= ${binary:Version}), python-numpy-dbg (>= 1:1.2.0)
+Depends: ${python:Depends}, python-dbg, ${shlibs:Depends}, ${misc:Depends}, python-scipy (= ${binary:Version}), python-numpy-dbg (>= 1:1.5.1)
 Description: scientific tools for Python - debugging symbols
  SciPy supplements the popular NumPy module (python-numpy package), gathering a
  variety of high level science and engineering modules together as a single

Modified: packages/scipy/trunk/debian/patches/blitz++.patch
===================================================================
--- packages/scipy/trunk/debian/patches/blitz++.patch	2010-12-23 23:14:52 UTC (rev 15135)
+++ packages/scipy/trunk/debian/patches/blitz++.patch	2010-12-24 15:52:20 UTC (rev 15136)
@@ -4,10 +4,10 @@
 Bug-Debian: http://bugs.debian.org/598520
 Bug-Ubuntu: https://launchpad.net/bugs/302649
 
-Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/blitz.h
+Index: python-scipy-0.8.0+dfsg1/scipy/weave/blitz/blitz/blitz.h
 ===================================================================
---- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/blitz.h	2010-09-29 13:17:01.539914362 +0200
-+++ python-scipy-0.7.2/scipy/weave/blitz/blitz/blitz.h	2010-09-29 13:17:02.091914362 +0200
+--- python-scipy-0.8.0+dfsg1.orig/scipy/weave/blitz/blitz/blitz.h	2010-07-26 10:48:37.000000000 -0400
++++ python-scipy-0.8.0+dfsg1/scipy/weave/blitz/blitz/blitz.h	2010-12-23 18:39:27.000000000 -0500
 @@ -65,6 +65,8 @@
  
  #define BZ_THROW                     // Needed in <blitz/numinquire.h>
@@ -17,23 +17,23 @@
  BZ_NAMESPACE(blitz)
  
  #ifdef BZ_HAVE_STD
-Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/mathfunc.h
+Index: python-scipy-0.8.0+dfsg1/scipy/weave/blitz/blitz/mathfunc.h
 ===================================================================
---- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/mathfunc.h	2010-09-29 13:17:01.507914362 +0200
-+++ python-scipy-0.7.2/scipy/weave/blitz/blitz/mathfunc.h	2010-09-29 13:17:02.099914362 +0200
-@@ -12,6 +12,8 @@
-  #include <blitz/prettyprint.h>
- #endif
+--- python-scipy-0.8.0+dfsg1.orig/scipy/weave/blitz/blitz/mathfunc.h	2010-07-26 10:48:37.000000000 -0400
++++ python-scipy-0.8.0+dfsg1/scipy/weave/blitz/blitz/mathfunc.h	2010-12-23 18:39:27.000000000 -0500
+@@ -14,6 +14,8 @@
  
+ #include <cstdlib>
+ 
 +#include <cstdlib>
 +
  BZ_NAMESPACE(blitz)
  
  // abs(P_numtype1)    Absolute value
-Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/prettyprint.h
+Index: python-scipy-0.8.0+dfsg1/scipy/weave/blitz/blitz/prettyprint.h
 ===================================================================
---- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/prettyprint.h	2010-09-29 13:20:04.091914362 +0200
-+++ python-scipy-0.7.2/scipy/weave/blitz/blitz/prettyprint.h	2010-09-29 13:18:19.611914362 +0200
+--- python-scipy-0.8.0+dfsg1.orig/scipy/weave/blitz/blitz/prettyprint.h	2010-07-26 10:48:37.000000000 -0400
++++ python-scipy-0.8.0+dfsg1/scipy/weave/blitz/blitz/prettyprint.h	2010-12-23 18:39:27.000000000 -0500
 @@ -22,6 +22,8 @@
  #ifndef BZ_PRETTYPRINT_H
  #define BZ_PRETTYPRINT_H

Modified: packages/scipy/trunk/debian/patches/restore_sys_argv.patch
===================================================================
--- packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2010-12-23 23:14:52 UTC (rev 15135)
+++ packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2010-12-24 15:52:20 UTC (rev 15136)
@@ -1,11 +1,11 @@
 Description: restore sys.argv in case of exception
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500814
 
-Index: scipy-0.7.1/scipy/weave/build_tools.py
+Index: python-scipy-0.8.0+dfsg1/scipy/weave/build_tools.py
 ===================================================================
---- scipy-0.7.1.orig/scipy/weave/build_tools.py	2010-04-05 16:40:02.377973881 +0200
-+++ scipy-0.7.1/scipy/weave/build_tools.py	2010-04-05 16:41:02.685970432 +0200
-@@ -283,6 +283,9 @@
+--- python-scipy-0.8.0+dfsg1.orig/scipy/weave/build_tools.py	2010-12-23 18:39:55.000000000 -0500
++++ python-scipy-0.8.0+dfsg1/scipy/weave/build_tools.py	2010-12-23 18:39:58.000000000 -0500
+@@ -284,6 +284,9 @@
          configure_python_path(build_dir)
      except SyntaxError: #TypeError:
          success = 0

Modified: packages/scipy/trunk/debian/patches/string_exception.patch
===================================================================
--- packages/scipy/trunk/debian/patches/string_exception.patch	2010-12-23 23:14:52 UTC (rev 15135)
+++ packages/scipy/trunk/debian/patches/string_exception.patch	2010-12-24 15:52:20 UTC (rev 15136)
@@ -1,29 +1,29 @@
 Description: Do not use string exceptions, not supported by Python 2.6
 Origin: Debian
 
-Index: python-scipy-0.7.2/scipy/weave/blitz_tools.py
+Index: python-scipy-0.8.0/scipy/weave/blitz_tools.py
 ===================================================================
---- python-scipy-0.7.2.orig/scipy/weave/blitz_tools.py	2010-06-07 12:48:10.000000000 +0000
-+++ python-scipy-0.7.2/scipy/weave/blitz_tools.py	2010-06-07 12:47:44.000000000 +0000
-@@ -32,7 +32,7 @@
-     #    of time.  It also can cause core-dumps if the sizes of the inputs
+--- python-scipy-0.8.0.orig/scipy/weave/blitz_tools.py	2010-07-26 10:48:37.000000000 -0400
++++ python-scipy-0.8.0/scipy/weave/blitz_tools.py	2010-07-30 16:43:35.000000000 -0400
+@@ -33,7 +33,7 @@
      #    aren't compatible.
      if check_size and not size_check.check_expr(expr,local_dict,global_dict):
--        raise 'inputs failed to pass size check.'
-+        raise Exception('inputs failed to pass size check.')
+         if sys.version_info < (2, 6):
+-            raise "inputs failed to pass size check."
++            raise Exception("inputs failed to pass size check.")
+         else:
+             raise ValueError("inputs failed to pass size check.")
  
-     # 2. try local cache
-     try:
-Index: python-scipy-0.7.2/scipy/weave/bytecodecompiler.py
+Index: python-scipy-0.8.0/scipy/weave/bytecodecompiler.py
 ===================================================================
---- python-scipy-0.7.2.orig/scipy/weave/bytecodecompiler.py	2010-06-07 12:48:10.000000000 +0000
-+++ python-scipy-0.7.2/scipy/weave/bytecodecompiler.py	2010-06-07 12:48:02.000000000 +0000
-@@ -237,7 +237,7 @@
-         elif goto is None:
+--- python-scipy-0.8.0.orig/scipy/weave/bytecodecompiler.py	2010-07-26 10:48:37.000000000 -0400
++++ python-scipy-0.8.0/scipy/weave/bytecodecompiler.py	2010-07-30 16:44:30.000000000 -0400
+@@ -239,7 +239,7 @@
              return next # Normal
          else:
--            raise 'xx'
-+            raise Exception('xx')
+             if sys.version_info < (2, 6):
+-                raise "Executing code failed."
++                raise Exception("Executing code failed.")
+             else:
+                 raise ValueError("Executing code failed.")
  
-     symbols = { 0: 'less', 1: 'lesseq', 2: 'equal', 3: 'notequal',
-                 4: 'greater', 5: 'greatereq', 6: 'in', 7: 'not in',




More information about the Python-modules-commits mailing list