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

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

    Date: Sunday, January 25, 2009 @ 08:37:19
  Author: certik-guest
Revision: 7386

Docs fixed, preparing for upload

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	2009-01-24 22:23:42 UTC (rev 7385)
+++ packages/numpy/trunk/debian/changelog	2009-01-25 08:37:19 UTC (rev 7386)
@@ -1,9 +1,8 @@
-python-numpy (1:1.2.1.ds-1) UNRELEASED; urgency=low
+python-numpy (1:1.2.1-1) unstable; urgency=low
 
   * New upstream release
   * debian/rules: get-orig-source added, as we have to repackage upstream
     sources and add there a missing doc/ directory from the upstream svn
-  * python-sphinx added to Depends, build the sphinx documentation
 
  -- Ondrej Certik <ondrej at certik.cz>  Tue, 30 Dec 2008 17:11:13 -0800
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2009-01-24 22:23:42 UTC (rev 7385)
+++ packages/numpy/trunk/debian/control	2009-01-25 08:37:19 UTC (rev 7386)
@@ -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 debian.org>
-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, quilt, python-sphinx (>= 0.5.1-1)
+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, quilt
 Build-Conflicts: atlas3-base-dev, libatlas-headers, libatlas-base-dev, libatlas-sse-dev, libatlas-sse2-dev, libatlas-3dnow-dev
 XS-Python-Version: >= 2.3
 Standards-Version: 3.8.0

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2009-01-24 22:23:42 UTC (rev 7385)
+++ packages/numpy/trunk/debian/rules	2009-01-25 08:37:19 UTC (rev 7386)
@@ -32,8 +32,8 @@
 	install -d $(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy
 	cp -r $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/* \
 		$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/
-	cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/README.txt \
-		$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/README.doc.txt
+	#cp $(DEB_DESTDIR)/usr/lib/python$(cdbs_python_current_version)/site-packages/numpy/doc/README.txt \
+	#	$(CURDIR)/debian/python-numpy/usr/share/doc/python-numpy/README.doc.txt
 
 	: # Adding links to manpages
 	mkdir -p debian/python-numpy/usr/share/man/man1
@@ -70,8 +70,9 @@
 	done
 
 binary-install/python-numpy-doc::
-	cd doc; make html; cd ..
-	cp -r $(CURDIR)/doc/build/html/* $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)
+	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