[Python-modules-commits] r27695 - in packages/pycurl/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Saturday, February 15, 2014 @ 18:11:34
  Author: morph
Revision: 27695

Build and install doc from ReST files

Added:
  packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch
Modified:
  packages/pycurl/trunk/debian/changelog
  packages/pycurl/trunk/debian/patches/series
  packages/pycurl/trunk/debian/rules

Modified: packages/pycurl/trunk/debian/changelog
===================================================================
--- packages/pycurl/trunk/debian/changelog	2014-02-15 17:12:14 UTC (rev 27694)
+++ packages/pycurl/trunk/debian/changelog	2014-02-15 18:11:34 UTC (rev 27695)
@@ -12,8 +12,9 @@
     - updated upstream & packaging copyright information
   * debian/patches/10_setup.py.patch
     - refreshed
+  * Build and install doc from ReST files
 
- -- Sandro Tosi <morph at debian.org>  Sat, 15 Feb 2014 17:40:12 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 15 Feb 2014 19:11:24 +0100
 
 pycurl (7.19.3-1) unstable; urgency=medium
 

Added: packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch
===================================================================
--- packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch	                        (rev 0)
+++ packages/pycurl/trunk/debian/patches/20_build_doc_for_debian.patch	2014-02-15 18:11:34 UTC (rev 27695)
@@ -0,0 +1,23 @@
+Description: Adapt documentation build process for Debian packaging purposes
+Author: Sandro Tosi <morph at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2014-02-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile
++++ b/Makefile
+@@ -63,10 +63,11 @@ windist: distclean
+ 	rm -rf build
+ 
+ www docs:
+-	mkdir -p build
+-	rsync -av www build
++	mkdir -p build/www/htdocs/doc
++	#rsync -av www build
+ 	cd doc && for file in *.rst; do rst2html "$$file" ../build/www/htdocs/doc/`echo "$$file" |sed -e 's/.rst$$/.html/'`; done
+ 	rst2html RELEASE-NOTES.rst build/www/htdocs/release-notes.html
++	rst2html README.rst build/www/htdocs/README.html
+ 
+ 
+ .PHONY: all build test do-test strip install install_lib clean distclean maintainer-clean dist sdist windist

Modified: packages/pycurl/trunk/debian/patches/series
===================================================================
--- packages/pycurl/trunk/debian/patches/series	2014-02-15 17:12:14 UTC (rev 27694)
+++ packages/pycurl/trunk/debian/patches/series	2014-02-15 18:11:34 UTC (rev 27695)
@@ -1 +1,2 @@
 10_setup.py.patch
+20_build_doc_for_debian.patch

Modified: packages/pycurl/trunk/debian/rules
===================================================================
--- packages/pycurl/trunk/debian/rules	2014-02-15 17:12:14 UTC (rev 27694)
+++ packages/pycurl/trunk/debian/rules	2014-02-15 18:11:34 UTC (rev 27695)
@@ -62,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 www/htdocs/doc/*.html www/htdocs/*.html debian/python-pycurl/usr/share/doc/python-pycurl/html
-	dh_installdocs README.rst
+	cp -a build/www/htdocs/doc/*.html $(CURDIR)/debian/python-pycurl/usr/share/doc/python-pycurl/html
+	dh_installdocs
 
 override_dh_installexamples:
 	dh_installexamples examples/*