[Python-modules-commits] r18280 - in packages/python-mock/trunk/debian (7 files)

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

    Date: Tuesday, August 23, 2011 @ 08:34:49
  Author: fladi-guest
Revision: 18280

Use dh_sphinxdoc.

Modified:
  packages/python-mock/trunk/debian/changelog
  packages/python-mock/trunk/debian/control
  packages/python-mock/trunk/debian/python-mock.docs
  packages/python-mock/trunk/debian/python-mock.links
  packages/python-mock/trunk/debian/python3-mock.docs
  packages/python-mock/trunk/debian/python3-mock.links
  packages/python-mock/trunk/debian/rules

Modified: packages/python-mock/trunk/debian/changelog
===================================================================
--- packages/python-mock/trunk/debian/changelog	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/changelog	2011-08-23 08:34:49 UTC (rev 18280)
@@ -1,4 +1,4 @@
-python-mock (0.7.2-1) UNRELEASED; urgency=low
+python-mock (0.7.2-1) unstable; urgency=low
 
   * New upstream release. (Closes: #617799)
   * Set PMPT as maintainer and myself as uploader.
@@ -12,8 +12,9 @@
   * Use dh_link to create the documentation symlinks.
   * Set X-P-V to >= 2.4.
   * Build for Python3.
+  * Use dh_sphinxdoc.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 07 Jul 2011 08:07:56 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Tue, 23 Aug 2011 10:33:11 +0200
 
 python-mock (0.6.0-1.1) unstable; urgency=low
 

Modified: packages/python-mock/trunk/debian/control
===================================================================
--- packages/python-mock/trunk/debian/control	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/control	2011-08-23 08:34:49 UTC (rev 18280)
@@ -19,7 +19,7 @@
 
 Package: python-mock
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}
 Recommends: libjs-jquery
 Description: Mocking and Testing Library
  mock provides a core mock.Mock class that is intended to reduce the
@@ -31,7 +31,7 @@
 
 Package: python3-mock
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}, ${sphinxdoc:Depends}
 Recommends: libjs-jquery
 Description: Mocking and Testing Library (Python3 version)
  mock provides a core mock.Mock class that is intended to reduce the

Modified: packages/python-mock/trunk/debian/python-mock.docs
===================================================================
--- packages/python-mock/trunk/debian/python-mock.docs	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/python-mock.docs	2011-08-23 08:34:49 UTC (rev 18280)
@@ -1 +1 @@
-.build/html
+docs/.build/html

Modified: packages/python-mock/trunk/debian/python-mock.links
===================================================================
--- packages/python-mock/trunk/debian/python-mock.links	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/python-mock.links	2011-08-23 08:34:49 UTC (rev 18280)
@@ -1,2 +1 @@
 usr/share/doc/python-mock/html/_sources usr/share/doc/python-mock/rst
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-mock/html/_static/jquery.js

Modified: packages/python-mock/trunk/debian/python3-mock.docs
===================================================================
--- packages/python-mock/trunk/debian/python3-mock.docs	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/python3-mock.docs	2011-08-23 08:34:49 UTC (rev 18280)
@@ -1 +1 @@
-.build/html
+docs/.build/html

Modified: packages/python-mock/trunk/debian/python3-mock.links
===================================================================
--- packages/python-mock/trunk/debian/python3-mock.links	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/python3-mock.links	2011-08-23 08:34:49 UTC (rev 18280)
@@ -1,2 +1 @@
 usr/share/doc/python3-mock/html/_sources usr/share/doc/python3-mock/rst
-usr/share/javascript/jquery/jquery.js usr/share/doc/python3-mock/html/_static/jquery.js

Modified: packages/python-mock/trunk/debian/rules
===================================================================
--- packages/python-mock/trunk/debian/rules	2011-08-23 05:56:56 UTC (rev 18279)
+++ packages/python-mock/trunk/debian/rules	2011-08-23 08:34:49 UTC (rev 18280)
@@ -7,7 +7,7 @@
 PY3VERS := $(shell py3versions -r)
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3,sphinxdoc
 	
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
@@ -15,6 +15,7 @@
 	for py in $(PYVERS) $(PY3VERS); do \
 		$$py -B setup.py build; \
 	done
+	PYTHONPATH=. sphinx-build -b html -N docs/ docs/.build/html
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
@@ -41,17 +42,8 @@
 override_dh_installchangelogs:
 	dh_installchangelogs -k docs/changelog.txt
 
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
-	PYTHONPATH=. sphinx-build -b html -d .build/.doctrees -N docs .build/html
-	rm .build/html/.buildinfo
-	dh_installdocs
-	rm -rf .build/
-	# Remove embedded copy of libjs-jquery
-	rm debian/python-mock/usr/share/doc/python-mock/html/_static/jquery.js
-
 .PHONY: override_dh_compress
 override_dh_compress:
-	dh_compress -X.js -X.html
+	dh_compress -X.js -X.html -X.txt