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

[morph at users.alioth.debian.org]

    Date: Monday, August 15, 2011 @ 22:48:41
  Author: morph
Revision: 18174

* debian/{control, rules}
  - use dh_sphinxdoc

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	2011-08-15 21:57:46 UTC (rev 18173)
+++ packages/numpy/trunk/debian/changelog	2011-08-15 22:48:41 UTC (rev 18174)
@@ -11,8 +11,10 @@
     - adjust pdist versions
   * debian/control
     - remove Ondrej from Uploaders: thanks for all the work you did!
+  * debian/{control, rules}
+    - use dh_sphinxdoc
 
- -- Sandro Tosi <morph at debian.org>  Thu, 11 Aug 2011 03:19:18 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 16 Aug 2011 00:48:16 +0200
 
 python-numpy (1:1.5.1-2) unstable; urgency=low
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2011-08-15 21:57:46 UTC (rev 18173)
+++ packages/numpy/trunk/debian/control	2011-08-15 22:48:41 UTC (rev 18174)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Alexandre Fayolle <afayolle at debian.org>, Matthias Klose <doko at debian.org>, David Cournapeau <cournape at gmail.com>, Sandro Tosi <morph at debian.org>
-Build-Depends: python-all-dev, python-all-dbg, python-support (>= 1), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, quilt, python-sphinx (>= 1.0.1), python-matplotlib
+Build-Depends: python-all-dev, python-all-dbg, python-support (>= 1), gfortran (>= 4:4.2), libblas-dev [!arm !m68k], liblapack-dev [!arm !m68k], debhelper (>= 7.0.50~), patchutils, python-docutils, quilt, python-sphinx (>= 1.0.7), python-matplotlib
 XS-Python-Version: >= 2.4
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2011-08-15 21:57:46 UTC (rev 18173)
+++ packages/numpy/trunk/debian/rules	2011-08-15 22:48:41 UTC (rev 18174)
@@ -10,7 +10,7 @@
 export ATLAS=None
 
 %:
-	dh $@;
+	dh $@ --with sphinxdoc
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -64,19 +64,12 @@
 	rm -rf debian/python-numpy-dbg/usr/share/doc/python-numpy-dbg
 	dh_link usr/share/doc/python-numpy usr/share/doc/python-numpy-dbg
 
-	# remove extra license in doc
-	rm -f debian/python-numpy-doc/usr/share/doc/python-numpy-doc/html/_sources/license.txt
-
-	# use system-wide jquery
-	rm -f debian/python-numpy-doc/usr/share/doc/python-numpy-doc/html/_static/jquery.js
-	dh_link -ppython-numpy-doc /usr/share/javascript/jquery/jquery.js /usr/share/doc/python-numpy-doc/html/_static/jquery.js
-
 	# create the pydist file
 	mkdir -p debian/python-numpy/usr/share/python/dist/
 	echo "numpy python-numpy (>= 1:1.6.1), python-numpy (<< 1:1.7)" > debian/python-numpy/usr/share/python/dist/python-numpy
 
 override_dh_compress:
-	dh_compress -X.js -Xobjects.inv
+	dh_compress -X.js -Xobjects.inv -X.txt
 
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))