[Python-modules-commits] r16252 - in packages/django-auth-ldap/trunk/debian (7 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Mon Mar 28 07:44:14 UTC 2011
Date: Monday, March 28, 2011 @ 07:44:10
Author: fladi-guest
Revision: 16252
New upstream release + various packaging improvements.
Added:
packages/django-auth-ldap/trunk/debian/clean
packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links
packages/django-auth-ldap/trunk/debian/source/local-options
Modified:
packages/django-auth-ldap/trunk/debian/changelog
packages/django-auth-ldap/trunk/debian/control
packages/django-auth-ldap/trunk/debian/rules
packages/django-auth-ldap/trunk/debian/settings.py
Modified: packages/django-auth-ldap/trunk/debian/changelog
===================================================================
--- packages/django-auth-ldap/trunk/debian/changelog 2011-03-27 13:40:27 UTC (rev 16251)
+++ packages/django-auth-ldap/trunk/debian/changelog 2011-03-28 07:44:10 UTC (rev 16252)
@@ -1,4 +1,4 @@
-django-auth-ldap (1.0.8-1) unstable; urgency=low
+django-auth-ldap (1.0.9-1) unstable; urgency=low
* New upstream release.
* Upload to unstable.
@@ -8,8 +8,14 @@
* Simplify debian/rules by using a static settings.py.
* Remove bogus docs/._index.rst ahead of building documentation.
* Streamline packaging code with .
+ * 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.
- -- Fladischer Michael <FladischerMichael at fladi.at> Sun, 20 Mar 2011 21:20:34 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 28 Mar 2011 09:41:37 +0200
django-auth-ldap (1.0.7-1) experimental; urgency=low
Added: packages/django-auth-ldap/trunk/debian/clean
===================================================================
--- packages/django-auth-ldap/trunk/debian/clean (rev 0)
+++ packages/django-auth-ldap/trunk/debian/clean 2011-03-28 07:44:10 UTC (rev 16252)
@@ -0,0 +1 @@
+docs/._index.rst
Modified: packages/django-auth-ldap/trunk/debian/control
===================================================================
--- packages/django-auth-ldap/trunk/debian/control 2011-03-27 13:40:27 UTC (rev 16251)
+++ packages/django-auth-ldap/trunk/debian/control 2011-03-28 07:44:10 UTC (rev 16252)
@@ -4,12 +4,11 @@
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-all (>= 2.6.6-3~),
python-django,
- python-sphinx,
- python-support
+ python-sphinx
Standards-Version: 3.9.1
-XS-Python-Version: >= 2.3
+X-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/
@@ -17,6 +16,8 @@
Package: python-django-auth-ldap
Architecture: all
Depends: python-django, python-ldap (>= 2.0), ${misc:Depends}, ${python:Depends}
+Breaks: ${python:Breaks}
+Recommends: libjs-jquery
Description: Django LDAP authentication backend
Django authentication backend that authenticates against an LDAP
service. Configuration can be as simple as a single distinguished
Added: packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links
===================================================================
--- packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links (rev 0)
+++ packages/django-auth-ldap/trunk/debian/python-django-auth-ldap.links 2011-03-28 07:44:10 UTC (rev 16252)
@@ -0,0 +1,2 @@
+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
Modified: packages/django-auth-ldap/trunk/debian/rules
===================================================================
--- packages/django-auth-ldap/trunk/debian/rules 2011-03-27 13:40:27 UTC (rev 16251)
+++ packages/django-auth-ldap/trunk/debian/rules 2011-03-28 07:44:10 UTC (rev 16252)
@@ -1,15 +1,15 @@
#!/usr/bin/make -f
+
%:
- dh $@
+ dh $@ --with=python2
-
+.PHONY: override_dh_installdocs
override_dh_installdocs:
- rm -f docs/._index.rst
make -C docs html
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
+.PHONY: override_dh_auto_test
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
django-admin startproject testproject
@@ -22,3 +22,7 @@
rm -rf testproject
endif
+.PHONY: override_dh_clean
+override_dh_clean:
+ rm -rf docs/_build/
+ dh_clean
Modified: packages/django-auth-ldap/trunk/debian/settings.py
===================================================================
--- packages/django-auth-ldap/trunk/debian/settings.py 2011-03-27 13:40:27 UTC (rev 16251)
+++ packages/django-auth-ldap/trunk/debian/settings.py 2011-03-28 07:44:10 UTC (rev 16252)
@@ -1,5 +1,9 @@
-DATABASE_ENGINE = "sqlite3"
-DATABASE_NAME = "testproject/test.db3"
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': 'testproject/test.db3'
+ }
+}
INSTALLED_APPS = ["django_auth_ldap",
"django.contrib.auth",
"django.contrib.contenttypes",
Added: packages/django-auth-ldap/trunk/debian/source/local-options
===================================================================
--- packages/django-auth-ldap/trunk/debian/source/local-options (rev 0)
+++ packages/django-auth-ldap/trunk/debian/source/local-options 2011-03-28 07:44:10 UTC (rev 16252)
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches
More information about the Python-modules-commits
mailing list