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

varun at users.alioth.debian.org varun at users.alioth.debian.org
Fri Apr 20 04:52:06 UTC 2012 

    Date: Friday, April 20, 2012 @ 04:52:01
  Author: varun
Revision: 21293

* New upstream release (Closes: #653262)
* Update debian/orig-tar.sh script
* debian/patches
  - updated restore_sys_argv.patch
  - removed string_exception.patch, not needed

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/orig-tar.sh
  packages/scipy/trunk/debian/patches/restore_sys_argv.patch
  packages/scipy/trunk/debian/patches/series
Deleted:
  packages/scipy/trunk/debian/patches/string_exception.patch

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2012-04-19 21:28:19 UTC (rev 21292)
+++ packages/scipy/trunk/debian/changelog	2012-04-20 04:52:01 UTC (rev 21293)
@@ -1,3 +1,13 @@
+python-scipy (0.10.1+dfsg1-1) unstable; urgency=low
+
+  * New upstream release (Closes: #653262)
+  * Update debian/orig-tar.sh script
+  * debian/patches
+    - updated restore_sys_argv.patch
+    - removed string_exception.patch, not needed
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 19 Apr 2012 16:14:28 -0400
+
 python-scipy (0.9.0+dfsg1-1) unstable; urgency=low
 
   * New upstream release (Closes: #614407, #579041, #569008)
@@ -79,11 +89,11 @@
   [ Julien Lavergne ]
   * debian/copyright : Update Copyright holders (Closes: #524131)
   * From Ubuntu, prepare for the future python transition:
-   - debian/rules: 
+   - debian/rules:
     + Include /usr/share/python/python.mk
     + Add $(py_setup_install_args) to setup.py install
     + Replace site-packages by *-packages
-   - debian/control: 
+   - debian/control:
     + Bump build-depends to python-all-dev (>= 2.5.4-1~)
 
   [ Luca Falavigna ]
@@ -142,7 +152,7 @@
 python-scipy (0.6.0-10) unstable; urgency=low
 
   [Sandro Tosi]
-  * Fixes a dangling symlink (Closes: #471825) 
+  * Fixes a dangling symlink (Closes: #471825)
 
  -- Ondrej Certik <ondrej at certik.cz>  Thu, 20 Mar 2008 14:50:31 +0100
 
@@ -163,7 +173,7 @@
 
   * Bumped the version, because python-numpy conflicts with python-scipy (<=
     0.6.0-6). This compiles against the old suitesparse, but it makes the
-    package installable and working again. 
+    package installable and working again.
 
  -- Ondrej Certik <ondrej at certik.cz>  Thu, 21 Feb 2008 15:38:00 +0100
 
@@ -186,7 +196,7 @@
 
 python-scipy (0.6.0-5) unstable; urgency=low
 
-  * DM-Upload-Allowed changed to XS-DM-Upload-Allowed 
+  * DM-Upload-Allowed changed to XS-DM-Upload-Allowed
   * standards-version made uptodate (3.7.3)
   * don't create an empty dir usr/share/doc/python-scipy/weave/
 
@@ -289,7 +299,7 @@
 
 python-scipy (0.5.2-4) experimental; urgency=low
 
-  * Incorporated code from setup_without_xplt.py into patches/sandbox.dpatch, in order to 
+  * Incorporated code from setup_without_xplt.py into patches/sandbox.dpatch, in order to
     build sandbox/xplt only on supported archs (Closes: #407869).
   * Added libx11-dev among Build-Deps to support xplt.
 
@@ -304,7 +314,7 @@
 python-scipy (0.5.2-2) experimental; urgency=low
 
   * Enabled sandbox modules. To this aim randomkit.[ch] are included from
-    pyhon-numpy sources. See debian/patches/sandbox.dpatch 
+    pyhon-numpy sources. See debian/patches/sandbox.dpatch
     (Closes: #407869).
 
  -- Marco Presi (Zufus) <zufus at debian.org>  Mon, 19 Feb 2007 19:26:22 +0000
@@ -312,8 +322,8 @@
 python-scipy (0.5.2-1) unstable; urgency=low
 
   * Fixed scipy.signal segfault (closes: #410757)
-  * Replaced hard-coded xv command with "see" (from mime-support). 
-    Additionally, the environment variable SCIPY_PIL_IMAGE_VIEWER can be set. 
+  * Replaced hard-coded xv command with "see" (from mime-support).
+    Additionally, the environment variable SCIPY_PIL_IMAGE_VIEWER can be set.
     (Closes: #395198)
 
  -- Marco Presi (Zufus) <zufus at debian.org>  Sun, 18 Feb 2007 16:22:03 +0000
@@ -337,7 +347,7 @@
 
 python-scipy (0.5.1-3) unstable; urgency=low
 
-  * Moved weave/examples into /usr/share/doc/python-scipy/ 
+  * Moved weave/examples into /usr/share/doc/python-scipy/
     and removed *.so files that prevented building on non x86 archs
     (closes: #397241)
 
@@ -371,7 +381,7 @@
 
   * New upstream release
   * Removed debian/patches/python2.3.dpatch now included in upstream release
-	
+
  -- Marco Presi (Zufus) <zufus at debian.org>  Sun, 30 Jul 2006 00:33:21 +0200
 
 python-scipy (0.4.9-2) unstable; urgency=low
@@ -405,7 +415,7 @@
   * Depend on libwxgtk2.4-1-python due to new C++ ABI.
   * Do not depend on obsolete blas-dev (Closes: #320441)
   * Drop the python2.2 version due to python2.2-numeric removal.
-  * Applied Andreas Jochens' patch fixing gcc4.0 storage class 
+  * Applied Andreas Jochens' patch fixing gcc4.0 storage class
     error (Closes: #302598)
 
  -- José Fonseca <j_r_fonseca at yahoo.co.uk>  Sun, 31 Jul 2005 11:11:42 +0100
@@ -413,7 +423,7 @@
 python-scipy (0.3.2-6) unstable; urgency=low
 
   * Added a Suggests: python2.X-profiler in debian/control, made the
-    import of pstats optional by patching stats/__init__.py 
+    import of pstats optional by patching stats/__init__.py
     (Closes: #296796)
 
  -- Alexandre Fayolle <afayolle at debian.org>  Fri, 11 Mar 2005 10:54:35 +0100

Modified: packages/scipy/trunk/debian/orig-tar.sh
===================================================================
--- packages/scipy/trunk/debian/orig-tar.sh	2012-04-19 21:28:19 UTC (rev 21292)
+++ packages/scipy/trunk/debian/orig-tar.sh	2012-04-20 04:52:01 UTC (rev 21293)
@@ -4,6 +4,7 @@
 DVER=$(dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | sed 's/\-[^-]*$//')
 TAR=python-scipy_$DVER.orig.tar.gz
 DIR=scipy-$2.orig
+SRC=https://github.com/scipy/scipy/commits/v$2
 
 # extract upstream tar ball
 tar xzf $3
@@ -12,9 +13,9 @@
 
 # add cython source files
 (cd $DIR/scipy/spatial/;\
-svn export http://svn.scipy.org/svn/scipy/tags/$2/scipy/spatial/ckdtree.pyx)
+wget $SRC/scipy/spatial/ckdtree.pyx)
 (cd $DIR/scipy/stats/;\
-svn export http://svn.scipy.org/svn/scipy/tags/$2/scipy/stats/vonmises_cython.pyx)
+wget $SRC/scipy/stats/vonmises_cython.pyx)
 
 # create tar ball
 GZIP=--best tar czf $TAR $DIR

Modified: packages/scipy/trunk/debian/patches/restore_sys_argv.patch
===================================================================
--- packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2012-04-19 21:28:19 UTC (rev 21292)
+++ packages/scipy/trunk/debian/patches/restore_sys_argv.patch	2012-04-20 04:52:01 UTC (rev 21293)
@@ -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: python-scipy-0.8.0+dfsg1/scipy/weave/build_tools.py
+Index: python-scipy-0.10.1+dfsg1/scipy/weave/build_tools.py
 ===================================================================
---- 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 @@
+--- python-scipy-0.10.1+dfsg1.orig/scipy/weave/build_tools.py	2012-04-19 16:30:03.073017007 -0400
++++ python-scipy-0.10.1+dfsg1/scipy/weave/build_tools.py	2012-04-19 16:30:12.712727587 -0400
+@@ -283,6 +283,9 @@
          configure_python_path(build_dir)
      except SyntaxError: #TypeError:
          success = 0

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2012-04-19 21:28:19 UTC (rev 21292)
+++ packages/scipy/trunk/debian/patches/series	2012-04-20 04:52:01 UTC (rev 21293)
@@ -1,3 +1,2 @@
 restore_sys_argv.patch
-string_exception.patch
 blitz++.patch

Deleted: packages/scipy/trunk/debian/patches/string_exception.patch
===================================================================
--- packages/scipy/trunk/debian/patches/string_exception.patch	2012-04-19 21:28:19 UTC (rev 21292)
+++ packages/scipy/trunk/debian/patches/string_exception.patch	2012-04-20 04:52:01 UTC (rev 21293)
@@ -1,29 +0,0 @@
-Description: Do not use string exceptions, not supported by Python 2.6
-Origin: Debian
-
-Index: python-scipy-0.8.0/scipy/weave/blitz_tools.py
-===================================================================
---- 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):
-         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.")
- 
-Index: python-scipy-0.8.0/scipy/weave/bytecodecompiler.py
-===================================================================
---- 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:
-             if sys.version_info < (2, 6):
--                raise "Executing code failed."
-+                raise Exception("Executing code failed.")
-             else:
-                 raise ValueError("Executing code failed.")
-

More information about the Python-modules-commits mailing list