[Python-modules-commits] r18780 - in packages/django-auth-ldap/trunk/debian (10 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Sat Oct 1 13:26:45 UTC 2011 

    Date: Saturday, October 1, 2011 @ 13:26:44
  Author: fladi-guest
Revision: 18780

Ship documentation in separate package.

Added:
  packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.doc-base
    (from rev 17721, packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.doc-base)
  packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.docs
    (from rev 17721, packages/django-auth-ldap/trunk/debian/docs)
  packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.install
Modified:
  packages/django-auth-ldap/trunk/debian/changelog
  packages/django-auth-ldap/trunk/debian/control
  packages/django-auth-ldap/trunk/debian/rules
Deleted:
  packages/django-auth-ldap/trunk/debian/docs
  packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.doc-base
  packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links
  packages/django-auth-ldap/trunk/debian/pyversions

Modified: packages/django-auth-ldap/trunk/debian/changelog
===================================================================
--- packages/django-auth-ldap/trunk/debian/changelog	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/changelog	2011-10-01 13:26:44 UTC (rev 18780)
@@ -1,22 +1,24 @@
-django-auth-ldap (1.0.10-1) UNRELEASED; urgency=low
+django-auth-ldap (1.0.12-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Upload to unstable.
   * Update DEP5 format.
   * Drop debian/pyversions in favour of XS-Python-Version.
   * Set PMPT as maintainer and myself as uploader.
-  * Simplify debian/rules by using a static settings.py.
+  * Simplify debian/rules by using static settings.py.
   * Remove bogus docs/._index.rst ahead of building documentation.
-  * Streamline packaging code with .
+  * Streamline packaging code with wrap-and-sort.
   * Switch to dh_python2.
   * Update database settings for unit tests to comply with Django 1.3.
-  * Use dh_link to create documentation symlinks.
   * Clean up documentation after build.
-  * Set 'abort-on-upstream-changes' and 'unapply-patches' in d/s/local-
-    options.
   * Bumped Standards-Version to 3.9.2 (no change necessary).
+  * Use dh_sphinxdoc.
+  * Change build path for documentation.
+  * Ship documentation in separate package.
+  * Use override_dh_auto_build to build documentation.
+  * Update copyright year in d/copyright.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 06 Jun 2011 23:35:03 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Sat, 01 Oct 2011 15:22:55 +0200
 
 django-auth-ldap (1.0.7-1) experimental; urgency=low
 

Modified: packages/django-auth-ldap/trunk/debian/control
===================================================================
--- packages/django-auth-ldap/trunk/debian/control	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/control	2011-10-01 13:26:44 UTC (rev 18780)
@@ -16,10 +16,21 @@
 Package: python-django-auth-ldap
 Architecture: all
 Depends: python-django, python-ldap (>= 2.0), ${misc:Depends}, ${python:Depends}
-Breaks: ${python:Breaks}
-Recommends: libjs-jquery
+Suggests: python-django-auth-ldap-doc
 Description: Django LDAP authentication backend
  Django authentication backend that authenticates against an LDAP
  service. Configuration can be as simple as a single distinguished
  name template, but there are many rich configuration options for
  working with users, groups, and permissions.
+
+Package: python-django-auth-ldap-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Django LDAP authentication backend (documentation)
+ Django authentication backend that authenticates against an LDAP
+ service. Configuration can be as simple as a single distinguished
+ name template, but there are many rich configuration options for
+ working with users, groups, and permissions.
+ .
+ This package contains the documentation.

Deleted: packages/django-auth-ldap/trunk/debian/docs
===================================================================
--- packages/django-auth-ldap/trunk/debian/docs	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/docs	2011-10-01 13:26:44 UTC (rev 18780)
@@ -1 +0,0 @@
-docs/_build/html/

Copied: packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.doc-base (from rev 17721, packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.doc-base)
===================================================================
--- packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.doc-base	                        (rev 0)
+++ packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.doc-base	2011-10-01 13:26:44 UTC (rev 18780)
@@ -0,0 +1,8 @@
+Document: python-django-auth-ldap-doc
+Title: Python Django LDAP Authentication Documentation
+Author: Peter Sagerson
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-django-auth-ldap-doc/html/index.html
+Files: /usr/share/doc/python-django-auth-ldap-doc/html/*.html

Copied: packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.docs (from rev 17721, packages/django-auth-ldap/trunk/debian/docs)
===================================================================
--- packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.docs	                        (rev 0)
+++ packages/django-auth-ldap/trunk/debian/python-django-auth-ldap-doc.docs	2011-10-01 13:26:44 UTC (rev 18780)
@@ -0,0 +1 @@
+docs/.build/html/

Deleted: packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.doc-base
===================================================================
--- packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.doc-base	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.doc-base	2011-10-01 13:26:44 UTC (rev 18780)
@@ -1,8 +0,0 @@
-Document: python-django-auth-ldap
-Title: Python Django LDAP Authentication Documentation
-Author: Peter Sagerson
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-django-auth-ldap/html/index.html
-Files: /usr/share/doc/python-django-auth-ldap/html/*.html

Added: packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.install
===================================================================
--- packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.install	                        (rev 0)
+++ packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.install	2011-10-01 13:26:44 UTC (rev 18780)
@@ -0,0 +1 @@
+usr/

Deleted: packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links
===================================================================
--- packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links	2011-10-01 13:26:44 UTC (rev 18780)
@@ -1,2 +0,0 @@
-usr/share/doc/python-django-auth-ldap/html/_sources usr/share/doc/python-django-auth-ldap/rst
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-django-auth-ldap/html/_static/jquery.js

Deleted: packages/django-auth-ldap/trunk/debian/pyversions
===================================================================
--- packages/django-auth-ldap/trunk/debian/pyversions	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/pyversions	2011-10-01 13:26:44 UTC (rev 18780)
@@ -1 +0,0 @@
-2.3-

Modified: packages/django-auth-ldap/trunk/debian/rules
===================================================================
--- packages/django-auth-ldap/trunk/debian/rules	2011-10-01 13:23:47 UTC (rev 18779)
+++ packages/django-auth-ldap/trunk/debian/rules	2011-10-01 13:26:44 UTC (rev 18780)
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with=python2
+	dh $@ --with=python2,sphinxdoc
 
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
-	make -C docs html
-	dh_installdocs
-	rm debian/python-django-auth-ldap/usr/share/doc/python-django-auth-ldap/html/_static/jquery.js
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+	PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs docs/.build/html
+	dh_auto_build
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
@@ -24,5 +23,5 @@
 
 .PHONY: override_dh_clean
 override_dh_clean:
-	rm -rf docs/_build/
+	rm -rf docs/.build/
 	dh_clean

More information about the Python-modules-commits mailing list