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

[morph at users.alioth.debian.org]

    Date: Saturday, January 18, 2014 @ 21:02:28
  Author: morph
Revision: 27316

* debian/{control, rules}
  - build and install documentation

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

Modified: packages/pycurl/trunk/debian/changelog
===================================================================
--- packages/pycurl/trunk/debian/changelog	2014-01-18 20:38:59 UTC (rev 27315)
+++ packages/pycurl/trunk/debian/changelog	2014-01-18 21:02:28 UTC (rev 27316)
@@ -6,8 +6,10 @@
     - added new file license information
   * debian/patches/10_setup.py.patch
     - refreshed to new upstream code
+  * debian/{control, rules}
+    - build and install documentation
 
- -- Sandro Tosi <morph at debian.org>  Sat, 18 Jan 2014 21:00:29 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 18 Jan 2014 22:02:15 +0100
 
 pycurl (7.19.0.3-1) unstable; urgency=low
 

Modified: packages/pycurl/trunk/debian/control
===================================================================
--- packages/pycurl/trunk/debian/control	2014-01-18 20:38:59 UTC (rev 27315)
+++ packages/pycurl/trunk/debian/control	2014-01-18 21:02:28 UTC (rev 27316)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~), python-all-dbg, libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev, python-nose, python-bottle, python-cherrypy3
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~), python-all-dbg, libcurl4-gnutls-dev (>= 7.19.0), librtmp-dev, libssh2-1-dev, python-nose, python-bottle, python-cherrypy3, python-docutils
 Standards-Version: 3.9.5
 X-Python-Version: all
 Homepage: http://pycurl.sourceforge.net

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2014-01-18 20:38:59 UTC (rev 27315)
+++ packages/pycurl/trunk/debian/rules	2014-01-18 21:02:28 UTC (rev 27316)
@@ -21,6 +21,8 @@
 		python$$py setup.py build ; \
 		python$$py-dbg setup.py build ; \
 	done
+	mkdir -p www/htdocs/doc
+	$(MAKE) docs
 
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -60,8 +62,8 @@
 	dh_link -ppython-pycurl-dbg usr/share/doc/python-pycurl usr/share/doc/python-pycurl-dbg
 
 override_dh_installdocs:
-	cp -a doc/*.html debian/python-pycurl/usr/share/doc/python-pycurl/html
-	dh_installdocs TODO README.rst
+	cp -a doc/*.html www/htdocs/doc/*.html www/htdocs/*.html debian/python-pycurl/usr/share/doc/python-pycurl/html
+	dh_installdocs README.rst
 
 override_dh_installexamples:
 	dh_installexamples examples/*