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

Mon Feb 7 12:57:26 UTC 2011

Date: Monday, February 7, 2011 @ 12:57:24
  Author: fladi-guest
Revision: 15507

Prepare for upload to unstable.

Added:
  packages/django-auth-ldap/trunk/debian/settings.py
Modified:
  packages/django-auth-ldap/trunk/debian/changelog
  packages/django-auth-ldap/trunk/debian/control
  packages/django-auth-ldap/trunk/debian/copyright
  packages/django-auth-ldap/trunk/debian/rules

Modified: packages/django-auth-ldap/trunk/debian/changelog
===================================================================

--- packages/django-auth-ldap/trunk/debian/changelog	2011-02-07 12:50:05 UTC (rev 15506)
+++ packages/django-auth-ldap/trunk/debian/changelog	2011-02-07 12:57:24 UTC (rev 15507)
@@ -1,3 +1,14 @@
+django-auth-ldap (1.0.7-2) unstable; urgency=low
+
+  * 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.
+  * Remove bogus docs/._index.rst ahead of building documentation.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 07 Feb 2011 13:56:58 +0100
+
 django-auth-ldap (1.0.7-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/django-auth-ldap/trunk/debian/control
===================================================================
--- packages/django-auth-ldap/trunk/debian/control	2011-02-07 12:50:05 UTC (rev 15506)
+++ packages/django-auth-ldap/trunk/debian/control	2011-02-07 12:57:24 UTC (rev 15507)
@@ -1,11 +1,12 @@
 Source: django-auth-ldap
 Section: python
 Priority: optional
-Maintainer: Fladischer Michael <FladischerMichael at fladi.at>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.3), python-support, 
  python-django, python-sphinx
 Standards-Version: 3.9.1
+XS-Python-Version: >= 2.3
 Homepage: http://pypi.python.org/pypi/django-auth-ldap/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-auth-ldap/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/django-auth-ldap/trunk/

Modified: packages/django-auth-ldap/trunk/debian/copyright
===================================================================
--- packages/django-auth-ldap/trunk/debian/copyright	2011-02-07 12:50:05 UTC (rev 15506)
+++ packages/django-auth-ldap/trunk/debian/copyright	2011-02-07 12:57:24 UTC (rev 15507)
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: django-auth-ldap
-Maintainer: Peter Sagerson <psagers at ignorare.net>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: django-auth-ldap
+Upstream-Contact: Peter Sagerson <psagers at ignorare.net>
 Source: http://pypi.python.org/pypi/django-auth-ldap/
 
 Files: *
@@ -12,24 +12,24 @@
 License: BSD
 
 License: BSD
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    .
-    - Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-    .
-    - Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-    .
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ - Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ - Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

Modified: packages/django-auth-ldap/trunk/debian/rules
===================================================================
--- packages/django-auth-ldap/trunk/debian/rules	2011-02-07 12:50:05 UTC (rev 15506)
+++ packages/django-auth-ldap/trunk/debian/rules	2011-02-07 12:57:24 UTC (rev 15507)
@@ -4,9 +4,8 @@
 
 
 override_dh_installdocs:
+	rm -f docs/._index.rst
 	make -C docs html
-	rm docs/_build/html/._index.html
-	rm docs/_build/html/_sources/._index.txt
 	dh_installdocs
 	rm debian/python-django-auth-ldap/usr/share/doc/python-django-auth-ldap/html/_static/jquery.js
 	ln -s ../../../../javascript/jquery/jquery.js debian/python-django-auth-ldap/usr/share/doc/python-django-auth-ldap/html/_static/jquery.js
@@ -14,11 +13,7 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	echo 'DATABASE_ENGINE = "sqlite3"' > testproject/settings.py
-	echo 'DATABASE_NAME = "testproject/test.db3"' >> testproject/settings.py
-	echo 'INSTALLED_APPS = ["django_auth_ldap","django.contrib.auth","django.contrib.contenttypes","django.contrib.admin","django.contrib.sites","django.contrib.sessions"]' >> testproject/settings.py
-	echo 'SITE_ID = 1' >> testproject/settings.py
-	echo 'ROOT_URLCONF = "testproject.urls"' >> testproject/settings.py
+	cp debian/settings.py testproject/settings.py
 	for python in $(shell pyversions -r); do \
 	  rm -f testproject/test.db3 ; \
 	  PYTHONPATH=".:src" $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\

Added: packages/django-auth-ldap/trunk/debian/settings.py
===================================================================
--- packages/django-auth-ldap/trunk/debian/settings.py	                        (rev 0)
+++ packages/django-auth-ldap/trunk/debian/settings.py	2011-02-07 12:57:24 UTC (rev 15507)
@@ -0,0 +1,11 @@
+DATABASE_ENGINE = "sqlite3"
+DATABASE_NAME = "testproject/test.db3"
+INSTALLED_APPS = ["django_auth_ldap",
+                  "django.contrib.auth",
+                  "django.contrib.contenttypes",
+                  "django.contrib.admin",
+                  "django.contrib.sites",
+                  "django.contrib.sessions",
+                  ]
+SITE_ID = 1
+ROOT_URLCONF = "testproject.urls"


