[Python-modules-commits] r4806 - in packages/numpy/trunk/debian (5 files)

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

    Date: Thursday, March 13, 2008 @ 00:01:09
  Author: certik-guest
Revision: 4806

Merging changes from Ubuntu.

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/python-numpy.links
  packages/numpy/trunk/debian/rules
Deleted:
  packages/numpy/trunk/debian/pyversions

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2008-03-12 19:23:17 UTC (rev 4805)
+++ packages/numpy/trunk/debian/changelog	2008-03-13 00:01:09 UTC (rev 4806)
@@ -1,3 +1,23 @@
+python-numpy (1:1.0.4-7) unstable; urgency=low
+
+  * Sync from ubuntu (Closes: #470698).
+    - Applied all ubuntu changes, except ubuntu's specific from debian/control
+  * debian/pyversions removed as it is not necessary now
+
+ -- Ondrej Certik <ondrej at certik.cz>  Thu, 13 Mar 2008 00:42:09 +0100
+
+python-numpy (1:1.0.4-6ubuntu1) hardy; urgency=low
+
+  * Sync from debian unstable.
+    - All existing Ubuntu changes are now in Debian.
+  * debian/rules: Unset LDFLAGS, as numpy's distutils is braindead and FTBFS.
+    (LP: #199031)
+  * debian/python-numpy.links: Reference /usr/share/pyshared, rather than the
+    old python-central-specific directory.
+  * debian/control: Comply with DebianMaintainerField.
+
+ -- William Grant <william.grant at ubuntu.org.au>  Sat, 08 Mar 2008 12:56:12 +1100
+
 python-numpy (1:1.0.4-6) unstable; urgency=low
 
   [ Kumar Appaiah ]

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2008-03-12 19:23:17 UTC (rev 4805)
+++ packages/numpy/trunk/debian/control	2008-03-13 00:01:09 UTC (rev 4806)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Marco Presi (Zufus) <zufus at debian.org>, Alexandre Fayolle <afayolle at debian.org>, José Fonseca <j_r_fonseca at yahoo.co.uk>, Matthias Klose <doko at debian.org>, Ondrej Certik <ondrej at certik.cz>, Kumar Appaiah <akumar at ee.iitm.ac.in>
-Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-all-dbg, python-central (>= 0.5), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 5.0.38), patchutils, python-docutils, libfftw3-dev
+Build-Depends: cdbs (>= 0.4.43), python-all-dev, python-all-dbg, python-central (>= 0.6), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 5.0.38), patchutils, python-docutils, libfftw3-dev
 Build-Conflicts: atlas3-base-dev
 XS-Python-Version: >= 2.3
 Standards-Version: 3.7.3

Modified: packages/numpy/trunk/debian/python-numpy.links
===================================================================
--- packages/numpy/trunk/debian/python-numpy.links	2008-03-12 19:23:17 UTC (rev 4805)
+++ packages/numpy/trunk/debian/python-numpy.links	2008-03-13 00:01:09 UTC (rev 4806)
@@ -1,7 +1,7 @@
-usr/share/pycentral/python-numpy/site-packages/numpy/numarray/numpy/nummacro.h usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy/nummacro.h
-usr/share/pycentral/python-numpy/site-packages/numpy/numarray/numpy/cfunc.h usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy/numpycfunc.h
-usr/share/pycentral/python-numpy/site-packages/numpy/numarray/numpy/numcomplex.h usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy/numcomplex.h
-usr/share/pycentral/python-numpy/site-packages/numpy/numarray/numpy/ieeespecial.h usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy/ieeespecial.h
-usr/share/pycentral/python-numpy/site-packages/numpy/numarray/numpy/libnumarray.h usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy/libnumarray.h
-usr/share/pycentral/python-numpy/site-packages/numpy/numarray/numpy/arraybase.h usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy/arraybase.h
-usr/share/pycentral/python-numpy/site-packages/numpy/core/include/numpy usr/include/numpy
+usr/share/pyshared/numpy/numarray/numpy/nummacro.h usr/share/pyshared/numpy/core/include/numpy/nummacro.h
+usr/share/pyshared/numpy/numarray/numpy/cfunc.h usr/share/pyshared/numpy/core/include/numpy/numpycfunc.h
+usr/share/pyshared/numpy/numarray/numpy/numcomplex.h usr/share/pyshared/numpy/core/include/numpy/numcomplex.h
+usr/share/pyshared/numpy/numarray/numpy/ieeespecial.h usr/share/pyshared/numpy/core/include/numpy/ieeespecial.h
+usr/share/pyshared/numpy/numarray/numpy/libnumarray.h usr/share/pyshared/numpy/core/include/numpy/libnumarray.h
+usr/share/pyshared/numpy/numarray/numpy/arraybase.h usr/share/pyshared/numpy/core/include/numpy/arraybase.h
+usr/share/pyshared/numpy/core/include/numpy usr/include/numpy

Deleted: packages/numpy/trunk/debian/pyversions
===================================================================
--- packages/numpy/trunk/debian/pyversions	2008-03-12 19:23:17 UTC (rev 4805)
+++ packages/numpy/trunk/debian/pyversions	2008-03-13 00:01:09 UTC (rev 4806)
@@ -1 +0,0 @@
-2.4-

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2008-03-12 19:23:17 UTC (rev 4805)
+++ packages/numpy/trunk/debian/rules	2008-03-13 00:01:09 UTC (rev 4806)
@@ -17,6 +17,8 @@
 
 DEB_PYTHON_PACKAGES_EXCLUDE=python-numpy-dbg
 
+unexport LDFLAGS
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk