[Python-modules-commits] r3789 - in packages/numpy/trunk/debian (changelog control rules)

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

    Date: Sunday, December 2, 2007 @ 02:09:26
  Author: kumanna-guest
Revision: 3789

  + Don't build python-numpy-dev. Make python-numpy provide it.
  + Add Conflicts to all packages to python-numpy and
    python-f2py introduction.
  + Move all f2py related installs to python-f2py.
  + Man pages altered to go to python-f2py.

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2007-12-02 01:11:46 UTC (rev 3788)
+++ packages/numpy/trunk/debian/changelog	2007-12-02 02:09:26 UTC (rev 3789)
@@ -3,16 +3,18 @@
   [ Kumar Appaiah ]
   * New upstream release.
   * debian/control:
-    + Don't build python-numpy-dev.
+    + Don't build python-numpy-dev. Make python-numpy provide it.
     + Build python-f2py.
     + python-numpy depends on python-f2py.
+    + Add Conflicts to all packages to python-numpy and
+      python-f2py introduction.
   * debian/rules:    
-    Move all f2py related installs to python-f2py.
-  
+    + Move all f2py related installs to python-f2py.
+    + Man pages altered to go to python-f2py.
+    
   [ Ondrej Certik ]
   TODO:
   * Check if all Conflicts/Provides/Replaces are right.
-  * make all packages depend on python-f2py (why?)
   * I think python-f2py version will now be equal to numpy version, check with
     upstream.
   * I didn't check the last build... only warnings were man pages weren't in

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2007-12-02 01:11:46 UTC (rev 3788)
+++ packages/numpy/trunk/debian/control	2007-12-02 02:09:26 UTC (rev 3789)
@@ -16,8 +16,7 @@
 XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, ${shlibs:Depends}, python-f2py
 Suggests: python-numpy-doc, python-numpy-dbg
-Replaces: python-f2py, python2.3-f2py, python2.4-f2py, python-numpy-ext (<< 1:1.0.1-1)
-Conflicts: python-f2py, python2.3-f2py, python2.4-f2py, python-scipy (<= 0.5.2-7+b1), python-matplotlib (<< 0.90.0-1), python-numpy-dev (<= 1:1.0.3-2)
+Conflicts: python-f2py (<= 2.45.241+1926-5), python2.3-f2py, python2.4-f2py, python-scipy (<= 0.5.2-7+b1), python-matplotlib (<< 0.90.0-1), python-numpy-dev (<= 1:1.0.3-2)
 Provides: ${python:Provides}, python-numpy-ext, python-numpy-dev
 Description: Numerical Python adds a fast array facility to the Python language
  Numpy contains a powerful N-dimensional array object,
@@ -69,8 +68,8 @@
 XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends}, python-numeric, python-scipy-core
 Recommends: g77 | fortran77-compiler
-Conflicts: python2.3-f2py, python-f2py-doc, python-f2py (<= 2.45.241+1926-5)
-Replaces: python2.3-f2py, python-f2py-doc
+Conflicts: python2.3-f2py, python-f2py-doc, python-f2py (<= 2.45.241+1926-5), python-numpy (<< 1:1.0.4-1)
+Replaces: python2.3-f2py, python2.4-f2py, python-numpy-ext (<< 1:1.0.1-1), python-f2py-doc
 Provides: python-f2py-doc
 Description: Fortran to Python interface generator
  F2PY is a Python extension tool for creating Python C/API modules from

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2007-12-02 01:11:46 UTC (rev 3788)
+++ packages/numpy/trunk/debian/rules	2007-12-02 02:09:26 UTC (rev 3789)
@@ -28,7 +28,7 @@
 
 install/python-f2py::
 	: # Adding links to manpages
-	mkdir -p debian/python-numpy/usr/share/man/man1
+	mkdir -p debian/python-f2py/usr/share/man/man1
 	for v in $(PYVERS); do \
 	  ln -sf f2py.1 debian/python-f2py/usr/share/man/man1/f2py$$v.1; \
 	  ln -sf f2py.1 debian/python-f2py/usr/share/man/man1/f2py$$v-dbg.1; \
@@ -36,7 +36,7 @@
 
 	: # Add unversioned f2py script
 	mv $(DEB_DESTDIR)/usr/bin/f2py $(DEB_DESTDIR)/usr/bin/f2py$(cdbs_python_current_version)
-	ln -s f2py$(cdbs_python_current_version) debian/python-numpy/usr/bin/f2py
+#	ln -s f2py$(cdbs_python_current_version) debian/python-f2py/usr/bin/f2py
 
 # 	: # Add more f2py files
 # 	for v in $(cdbs_python_build_versions); do \