[Python-modules-commits] r22419 - in packages/python-django-registration/trunk/debian (5 files)

Tue Jul 10 14:07:59 UTC 2012

Date: Tuesday, July 10, 2012 @ 14:07:57
  Author: hertzog
Revision: 22419

* New upstream release.
  - Now fully compatible with Django 2.4 which is in Debian Wheezy.
  - No longer use the deprecated "sha" module. Closes: #581721
* Update Standards-Version to 3.9.3.
* Replace python-docutil build-dependency by one on python-sphinx to be able
  to generate the HTML documentation with the new upstream makefile.
* Update the dh_auto_build override to include the "make html" call
  that generates the documentation and create
  debian/python-django-registration.docs to install the generated
  documentation.
* Create a dh_auto_clean override to remove the (upstream provided and)
  generated documentation in docs/_build/html.
* Use dh_sphinxdoc to get rid of embedded javascript files that sphinx-build
  generates. Add accordingly ${sphinxdoc:Depends} to Depends.
* Update the doc-base registration to use the new path for the HTML
  documentation.

Added:
  packages/python-django-registration/trunk/debian/python-django-registration.docs
Modified:
  packages/python-django-registration/trunk/debian/changelog
  packages/python-django-registration/trunk/debian/control
  packages/python-django-registration/trunk/debian/python-django-registration.doc-base
  packages/python-django-registration/trunk/debian/rules

Modified: packages/python-django-registration/trunk/debian/changelog
===================================================================

--- packages/python-django-registration/trunk/debian/changelog	2012-07-10 14:04:31 UTC (rev 22418)
+++ packages/python-django-registration/trunk/debian/changelog	2012-07-10 14:07:57 UTC (rev 22419)
@@ -1,3 +1,24 @@
+python-django-registration (0.8-1) unstable; urgency=low
+
+  * New upstream release.
+    - Now fully compatible with Django 2.4 which is in Debian Wheezy.
+    - No longer use the deprecated "sha" module. Closes: #581721
+  * Update Standards-Version to 3.9.3.
+  * Replace python-docutil build-dependency by one on python-sphinx to be able
+    to generate the HTML documentation with the new upstream makefile.
+  * Update the dh_auto_build override to include the "make html" call
+    that generates the documentation and create
+    debian/python-django-registration.docs to install the generated
+    documentation.
+  * Create a dh_auto_clean override to remove the (upstream provided and)
+    generated documentation in docs/_build/html.
+  * Use dh_sphinxdoc to get rid of embedded javascript files that sphinx-build
+    generates. Add accordingly ${sphinxdoc:Depends} to Depends.
+  * Update the doc-base registration to use the new path for the HTML
+    documentation.
+
+ -- RaphaÃ«l Hertzog <hertzog at debian.org>  Tue, 10 Jul 2012 16:04:20 +0200
+
 python-django-registration (0.7-3) unstable; urgency=low
 
   * Provide README.Debian in place of upstream's README.txt. Closes: #646589

Modified: packages/python-django-registration/trunk/debian/control
===================================================================
--- packages/python-django-registration/trunk/debian/control	2012-07-10 14:04:31 UTC (rev 22418)
+++ packages/python-django-registration/trunk/debian/control	2012-07-10 14:07:57 UTC (rev 22419)
@@ -3,16 +3,16 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: RaphaÃ«l Hertzog <hertzog at debian.org>, David Spreen <netzwurm at debian.org>, Stephan Peijnik <debian at sp.or.at>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~)
-Build-Depends-Indep: python-docutils, python-django (>= 1.0)
+Build-Depends-Indep: python-django (>= 1.0), python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
 Homepage: http://www.bitbucket.org/ubernostrum/django-registration/wiki/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django-registration/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-django-registration/trunk/
 
 Package: python-django-registration
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-django (>= 1.0)
+Depends: ${python:Depends}, ${misc:Depends}, ${sphinxdoc:Depends}, python-django (>= 1.0)
 Description: User-registration application for Django
  This is a fairly simple user-registration application for Django,
  designed to make allowing user signups as painless as possible.

Modified: packages/python-django-registration/trunk/debian/python-django-registration.doc-base
===================================================================
--- packages/python-django-registration/trunk/debian/python-django-registration.doc-base	2012-07-10 14:04:31 UTC (rev 22418)
+++ packages/python-django-registration/trunk/debian/python-django-registration.doc-base	2012-07-10 14:07:57 UTC (rev 22419)
@@ -6,8 +6,5 @@
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-django-registration/overview.html
-Files: /usr/share/doc/python-django-registration/*.html
-
-Format: Text
-Files: /usr/share/doc/python-django-registration/overview.txt* /usr/share/doc/python-django-registration/views.txt* /usr/share/doc/python-django-registration/models.txt* /usr/share/doc/python-django-registration/forms.txt*
+Index: /usr/share/doc/python-django-registration/html/index.html
+Files: /usr/share/doc/python-django-registration/html/*.html

Added: packages/python-django-registration/trunk/debian/python-django-registration.docs
===================================================================
--- packages/python-django-registration/trunk/debian/python-django-registration.docs	                        (rev 0)
+++ packages/python-django-registration/trunk/debian/python-django-registration.docs	2012-07-10 14:07:57 UTC (rev 22419)
@@ -0,0 +1 @@
+docs/_build/html

Modified: packages/python-django-registration/trunk/debian/rules
===================================================================
--- packages/python-django-registration/trunk/debian/rules	2012-07-10 14:04:31 UTC (rev 22418)
+++ packages/python-django-registration/trunk/debian/rules	2012-07-10 14:07:57 UTC (rev 22419)
@@ -3,21 +3,18 @@
 PKG = $(shell dh_listpackages)
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,sphinxdoc
 
+override_dh_auto_clean:
+	rm -rf docs/_build/html
+	dh_auto_clean
+
 override_dh_auto_build:
 	cd registration && /usr/bin/django-admin compilemessages
+	cd docs && $(MAKE) html
 	dh_auto_build
 
 override_dh_auto_install:
 	dh_auto_install
 	# Drop .po files and keep only .mo files (compiled)
 	find debian/$(PKG)/ -name '*.po' -exec rm {} \;
-
-override_dh_installdocs:
-	dh_installdocs
-	# Generate documentation
-	rst2html <docs/overview.txt >debian/$(PKG)/usr/share/doc/$(PKG)/overview.html
-	rst2html <docs/views.txt >debian/$(PKG)/usr/share/doc/$(PKG)/views.html
-	rst2html <docs/models.txt >debian/$(PKG)/usr/share/doc/$(PKG)/models.html
-	rst2html <docs/forms.txt >debian/$(PKG)/usr/share/doc/$(PKG)/forms.html


