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

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

    Date: Sunday, June 15, 2008 @ 12:17:57
  Author: certik-guest
Revision: 5649

Emilio's patch applied

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	2008-06-15 10:14:51 UTC (rev 5648)
+++ packages/numpy/trunk/debian/changelog	2008-06-15 12:17:57 UTC (rev 5649)
@@ -1,3 +1,14 @@
+python-numpy (1:1.1.0-2) UNRELEASED; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/rules:
+    - Also install Numpy documentation in python-numpy-doc (Closes: #486329)
+  * debian/control:
+    - Update python-numpy-doc's long description to mention that it also
+      contains Numpy documentation.
+
+ -- Ondrej Certik <ondrej at certik.cz>  Sun, 15 Jun 2008 14:16:58 +0200
+
 python-numpy (1:1.1.0-1) unstable; urgency=low
 
   [ Ondrej Certik ]

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2008-06-15 10:14:51 UTC (rev 5648)
+++ packages/numpy/trunk/debian/control	2008-06-15 12:17:57 UTC (rev 5649)
@@ -64,4 +64,4 @@
  are now deprecated and shouldn't be used except to support older
  software.
  .
- This package contains documentation for the f2py subpackage.
+ This package contains documentation for Numpy and f2py.

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2008-06-15 10:14:51 UTC (rev 5648)
+++ packages/numpy/trunk/debian/rules	2008-06-15 12:17:57 UTC (rev 5649)
@@ -70,9 +70,11 @@
 	done
 
 binary-install/python-numpy-doc::
-	rst2html numpy/f2py/docs/usersguide/index.txt > $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/index.html
-	cp -r $(CURDIR)/numpy/f2py/docs/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
-	chmod -x $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/usersguide/setup_example.py
+	cp -r $(CURDIR)/numpy/doc/html/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
+	mkdir $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/f2py
+	rst2html numpy/f2py/docs/usersguide/index.txt > $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/f2py/index.html
+	cp -r $(CURDIR)/numpy/f2py/docs/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/f2py
+	chmod -x $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/f2py/usersguide/setup_example.py
 
 build/python-numpy-dbg::
 	set -e; \