[Python-modules-commits] r18533 - in packages/python-django/trunk/debian (4 files)

[hertzog at users.alioth.debian.org]

    Date: Thursday, September 15, 2011 @ 10:39:41
  Author: hertzog
Revision: 18533

* New patch 02_disable-sources-in-sphinxdoc.diff to not generate
  the _sources directory that we used to remove manually within the rules
  file. But must be kept disabled until #641710 is fixed.
* Properly support DEB_BUILD_OPTIONS=nocheck despite the override
  of dh_auto_test.

Added:
  packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff
Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series
  packages/python-django/trunk/debian/rules

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2011-09-15 09:10:24 UTC (rev 18532)
+++ packages/python-django/trunk/debian/changelog	2011-09-15 10:39:41 UTC (rev 18533)
@@ -16,6 +16,11 @@
   * Cleanup build-dependencies now that even oldstable has python 2.5.
   * Switch to dh_python2 as python helper tool. Drop legacy files
     debian/pyversions and debian/pycompat.
+  * New patch 02_disable-sources-in-sphinxdoc.diff to not generate
+    the _sources directory that we used to remove manually within the rules
+    file. But must be kept disabled until #641710 is fixed.
+  * Properly support DEB_BUILD_OPTIONS=nocheck despite the override
+    of dh_auto_test.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Thu, 15 Sep 2011 09:37:26 +0200
 

Added: packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff
===================================================================
--- packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff	2011-09-15 10:39:41 UTC (rev 18533)
@@ -0,0 +1,23 @@
+Description: Disable creation of _sources directory by Sphinx
+ We do this to save some space as the sources of the documentation
+ are not really useful in a binary package.
+ .
+ This is a Debian specific patch.
+Forwarded: not-needed
+Author: Raphaël Hertzog <hertzog at debian.org>
+Origin: vendor
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -158,7 +158,10 @@ html_additional_pages = {}
+ #html_split_index = False
+ 
+ # If true, links to the reST sources are added to the pages.
+-#html_show_sourcelink = True
++html_show_sourcelink = False
++
++# Do not ship a copy of the sources
++html_copy_source = False
+ 
+ # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+ #html_show_sphinx = True

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2011-09-15 09:10:24 UTC (rev 18532)
+++ packages/python-django/trunk/debian/patches/series	2011-09-15 10:39:41 UTC (rev 18533)
@@ -1,3 +1,5 @@
 01_disable_url_verify_regression_tests.diff
+# Disabled until 641710 is fixed
+# 02_disable-sources-in-sphinxdoc.diff
 03_manpage.diff
 04_hyphen-manpage.diff

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2011-09-15 09:10:24 UTC (rev 18532)
+++ packages/python-django/trunk/debian/rules	2011-09-15 10:39:41 UTC (rev 18533)
@@ -29,14 +29,15 @@
 	cp -r docs docs.debian
 	find docs.debian -type f -print0 | xargs -0r perl -pi -e 's|(?<!/)(django-admin)\.py|$$1|'
 	make -C docs.debian html
-	rm -rf docs.debian/_build/html/_sources/
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	touch tests/__init__.py
 	mkdir -p tmp-locales
 	localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 -A /usr/share/locale/locale.alias tmp-locales/en_US.UTF-8
 	LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=2
 	rm -rf tmp-locales
+endif
 
 override_dh_clean:
 	# backup~ is used in tests
@@ -73,12 +74,5 @@
 			ln -sf /usr/share/javascript/jquery/$$FILENAME {} \;; \
 	done
 
-override_dh_installdocs:
-	dh_installdocs
-	# Remove embedded copy of libjs-jquery
-	cd debian/python-django-doc/usr/share/doc/python-django-doc/html/_static \
-		&& rm jquery.js \
-		&& ln -s ../../../../javascript/jquery/jquery.js .
-
 override_dh_compress:
 	dh_compress -X.js -Xobjects.inv