[Python-modules-commits] r22621 - in packages/numpy/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Friday, August 31, 2012 @ 11:10:14
  Author: morph
Revision: 22621

* debian/patches/*
  - updated to new upstream code

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
  packages/numpy/trunk/debian/patches/series
Deleted:
  packages/numpy/trunk/debian/patches/20_sphinx_1.1.2.diff

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2012-08-31 10:38:31 UTC (rev 22620)
+++ packages/numpy/trunk/debian/changelog	2012-08-31 11:10:14 UTC (rev 22621)
@@ -13,8 +13,10 @@
     - bump C_API_VERSION to 7
   * debian/control
     - added python{,3}-tz to b-d, needed to run tests
+  * debian/patches/*
+    - updated to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Fri, 31 Aug 2012 12:37:52 +0200
+ -- Sandro Tosi <morph at debian.org>  Fri, 31 Aug 2012 13:10:00 +0200
 
 python-numpy (1:1.6.2-1) unstable; urgency=low
 

Deleted: packages/numpy/trunk/debian/patches/20_sphinx_1.1.2.diff
===================================================================
--- packages/numpy/trunk/debian/patches/20_sphinx_1.1.2.diff	2012-08-31 10:38:31 UTC (rev 22620)
+++ packages/numpy/trunk/debian/patches/20_sphinx_1.1.2.diff	2012-08-31 11:10:14 UTC (rev 22621)
@@ -1,19 +0,0 @@
-Description: fix FTBFS with sphinx 1.1.2 because automodule is not allowed in glossary
-Author: Pauli Virtanen
-Origin: https://github.com/numpy/numpy/commit/1451b414693d63d8224857b1c67726eb8d5f97af
-Forwarded: not-needed
-Index: python-numpy-1.5.1/doc/source/glossary.rst
-===================================================================
---- python-numpy-1.5.1.orig/doc/source/glossary.rst	2010-11-09 00:58:22.000000000 +0100
-+++ python-numpy-1.5.1/doc/source/glossary.rst	2012-01-31 23:31:29.323501993 +0100
-@@ -4,9 +4,7 @@
- 
- .. toctree::
- 
--.. glossary::
--
--   .. automodule:: numpy.doc.glossary
-+.. automodule:: numpy.doc.glossary
- 
- Jargon
- ------

Modified: packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch
===================================================================
--- packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2012-08-31 10:38:31 UTC (rev 22620)
+++ packages/numpy/trunk/debian/patches/50_search-multiarch-paths.patch	2012-08-31 11:10:14 UTC (rev 22621)
@@ -5,14 +5,12 @@
 Author: Julian Taylor <jtaylor at ubuntu.com>
 Forwarded: no (it's a Debian specific patch, for now)
 
-Index: python-numpy-1.6.2~rc1/numpy/distutils/system_info.py
-===================================================================
---- python-numpy-1.6.2~rc1.orig/numpy/distutils/system_info.py	2012-05-04 21:51:57.000000000 +0200
-+++ python-numpy-1.6.2~rc1/numpy/distutils/system_info.py	2012-05-23 22:32:01.192226184 +0200
-@@ -203,6 +203,16 @@
-                                      '/usr/lib'], platform_bits)
-     default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -206,6 +206,16 @@ else:
+     default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include',
                                  '/usr/include']
+ 
 +    try:
 +       import subprocess as sp
 +       p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE)

Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series	2012-08-31 10:38:31 UTC (rev 22620)
+++ packages/numpy/trunk/debian/patches/series	2012-08-31 11:10:14 UTC (rev 22621)
@@ -3,6 +3,5 @@
 03_force_f2py_version.patch
 #05_fix_endianness_detection.patch
 10_use_local_python.org_object.inv_sphinx.diff
-20_sphinx_1.1.2.diff
 40_m68k_long_double_format.diff
 50_search-multiarch-paths.patch