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

[morph at users.alioth.debian.org]

    Date: Tuesday, June 29, 2010 @ 18:17:49
  Author: morph
Revision: 13720

build and install documentation; thanks to Joel for the report;
Closes: #508113

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

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2010-06-29 17:18:10 UTC (rev 13719)
+++ packages/numpy/trunk/debian/changelog	2010-06-29 18:17:49 UTC (rev 13720)
@@ -18,7 +18,8 @@
       main ones
   * debian/rules
     - remove 'get-orig-source' target, no more needed
-    - build documentation
+    - build and install documentation; thanks to Joel for the report;
+      Closes: #508113
   * debian/python-numpy.install
     - sorted, it's clearer to read
     - added installation for 'compat', 'matrixlib' and 'polynomial' submodules
@@ -41,7 +42,7 @@
   * Use setup.py install --install-layout; specifying --prefix installs
     into the wrong location.
 
- -- Sandro Tosi <morph at debian.org>  Tue, 29 Jun 2010 19:16:25 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 29 Jun 2010 19:59:46 +0200
 
 python-numpy (1:1.3.0-3) unstable; urgency=low
 

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2010-06-29 17:18:10 UTC (rev 13719)
+++ packages/numpy/trunk/debian/rules	2010-06-29 18:17:49 UTC (rev 13720)
@@ -75,13 +75,13 @@
 		dh_link usr/share/pyshared/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
 	done
 
-binary-install/python-numpy-doc::
+binary-install/python-numpy-doc:: build/python-numpy-doc
 	cp -r $(CURDIR)/numpy/doc/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
 	#cd doc; make html; cd ..
-	#cp -r $(CURDIR)/doc/build/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
+	cp -r $(CURDIR)/doc/build/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::