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

[fladi-guest at users.alioth.debian.org]

    Date: Friday, April 20, 2012 @ 08:25:22
  Author: fladi-guest
Revision: 21300

Fix FTBFS with django (>= 1.4) (Closes: #669486).

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	2012-04-20 08:22:36 UTC (rev 21299)
+++ packages/django-auth-ldap/trunk/debian/changelog	2012-04-20 08:25:22 UTC (rev 21300)
@@ -1,8 +1,9 @@
-django-auth-ldap (1.0.19-1) UNRELEASED; urgency=low
+django-auth-ldap (1.0.19-1) unstable; urgency=low
 
   * New upstream release.
+  * Fix tests for django (>= 1.4) FTBFS (Closes: #669486).
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 09:35:57 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 10:24:37 +0200
 
 django-auth-ldap (1.0.18-1) unstable; urgency=low
 

Modified: packages/django-auth-ldap/trunk/debian/control
===================================================================
--- packages/django-auth-ldap/trunk/debian/control	2012-04-20 08:22:36 UTC (rev 21299)
+++ packages/django-auth-ldap/trunk/debian/control	2012-04-20 08:25:22 UTC (rev 21300)
@@ -5,7 +5,7 @@
 Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.6.6-3~),
-               python-django,
+               python-django (>= 1.4),
                python-sphinx (>= 1.0.7+dfsg)
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.3

Modified: packages/django-auth-ldap/trunk/debian/rules
===================================================================
--- packages/django-auth-ldap/trunk/debian/rules	2012-04-20 08:22:36 UTC (rev 21299)
+++ packages/django-auth-ldap/trunk/debian/rules	2012-04-20 08:25:22 UTC (rev 21300)
@@ -12,11 +12,11 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	cp debian/settings.py testproject/settings.py
+	cp debian/settings.py testproject/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 ;\
-	  PYTHONPATH=".:src" $$python testproject/manage.py test --settings=testproject.settings ; \
+	  PYTHONPATH=".:src:testproject" $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\
+	  PYTHONPATH=".:src:testproject" $$python testproject/manage.py test --settings=testproject.settings django_auth_ldap ; \
 	done
 	rm -rf testproject
 endif

Modified: packages/django-auth-ldap/trunk/debian/settings.py
===================================================================
--- packages/django-auth-ldap/trunk/debian/settings.py	2012-04-20 08:22:36 UTC (rev 21299)
+++ packages/django-auth-ldap/trunk/debian/settings.py	2012-04-20 08:25:22 UTC (rev 21300)
@@ -13,3 +13,4 @@
                   ]
 SITE_ID = 1
 ROOT_URLCONF = "testproject.urls"
+SECRET_KEY = "1"