[Python-modules-commits] r21302 - in packages/django-countries/trunk/debian (4 files)

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

    Date: Friday, April 20, 2012 @ 09:18:54
  Author: fladi-guest
Revision: 21302

Fix FTBFS for django (>= 1.4) (Closes: #669492).

Modified:
  packages/django-countries/trunk/debian/changelog
  packages/django-countries/trunk/debian/control
  packages/django-countries/trunk/debian/rules
  packages/django-countries/trunk/debian/settings.py

Modified: packages/django-countries/trunk/debian/changelog
===================================================================
--- packages/django-countries/trunk/debian/changelog	2012-04-20 09:08:33 UTC (rev 21301)
+++ packages/django-countries/trunk/debian/changelog	2012-04-20 09:18:54 UTC (rev 21302)
@@ -1,8 +1,9 @@
-django-countries (1.2-1) unstable; urgency=low
+django-countries (1.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Fix tests for django (>= 1.4) FTBFS (Closes: #669492).
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 10:32:38 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 11:11:13 +0200
 
 django-countries (1.1.2-1) unstable; urgency=low
 

Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2012-04-20 09:08:33 UTC (rev 21301)
+++ packages/django-countries/trunk/debian/control	2012-04-20 09:18:54 UTC (rev 21302)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~),
                iso-codes,
                python-all (>= 2.6.6-3~),
-               python-django (>= 1.2),
+               python-django (>= 1.4),
                python-setuptools
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5

Modified: packages/django-countries/trunk/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2012-04-20 09:08:33 UTC (rev 21301)
+++ packages/django-countries/trunk/debian/rules	2012-04-20 09:18:54 UTC (rev 21302)
@@ -11,12 +11,12 @@
 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
 	set -e; \
 	for python in $(shell pyversions -r); do \
 	  rm -f testproject/test.db3 ; \
-	  PYTHONPATH="." $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\
-	  PYTHONPATH="." $$python testproject/manage.py test --settings=testproject.settings ;\
+	  PYTHONPATH=".:testproject" $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\
+	  PYTHONPATH=".:testproject" $$python testproject/manage.py test --settings=testproject.settings django_countries ;\
 	done
 	rm -rf testproject
 endif

Modified: packages/django-countries/trunk/debian/settings.py
===================================================================
--- packages/django-countries/trunk/debian/settings.py	2012-04-20 09:08:33 UTC (rev 21301)
+++ packages/django-countries/trunk/debian/settings.py	2012-04-20 09:18:54 UTC (rev 21302)
@@ -13,3 +13,4 @@
                   ]
 SITE_ID = 1
 ROOT_URLCONF = "testproject.urls"
+SECRET_KEY = "1"