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

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

    Date: Friday, April 20, 2012 @ 09:29:40
  Author: fladi-guest
Revision: 21303

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

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

Modified: packages/django-floppyforms/trunk/debian/changelog
===================================================================
--- packages/django-floppyforms/trunk/debian/changelog	2012-04-20 09:18:54 UTC (rev 21302)
+++ packages/django-floppyforms/trunk/debian/changelog	2012-04-20 09:29:40 UTC (rev 21303)
@@ -1,3 +1,9 @@
+django-floppyforms (0.4.7-2) unstable; urgency=low
+
+  * Fix tests for django (>= 1.4) FTBFS (Closes: #669462).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 11:26:07 +0200
+
 django-floppyforms (0.4.7-1) unstable; urgency=low
 
   * Initial release (Closes: #659902)

Modified: packages/django-floppyforms/trunk/debian/control
===================================================================
--- packages/django-floppyforms/trunk/debian/control	2012-04-20 09:18:54 UTC (rev 21302)
+++ packages/django-floppyforms/trunk/debian/control	2012-04-20 09:29:40 UTC (rev 21303)
@@ -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 (>= 1.2),
+               python-django (>= 1.4),
                python-setuptools
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.6

Modified: packages/django-floppyforms/trunk/debian/rules
===================================================================
--- packages/django-floppyforms/trunk/debian/rules	2012-04-20 09:18:54 UTC (rev 21302)
+++ packages/django-floppyforms/trunk/debian/rules	2012-04-20 09:29:40 UTC (rev 21303)
@@ -6,10 +6,10 @@
 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 \
-	  PYTHONPATH=".:src" $$python testproject/manage.py test --settings=testproject.settings; \
+		PYTHONPATH=".:src:testproject" $$python testproject/manage.py test --settings=testproject.settings floppyforms ; \
 	done
 	rm -rf testproject
 endif

Modified: packages/django-floppyforms/trunk/debian/settings.py
===================================================================
--- packages/django-floppyforms/trunk/debian/settings.py	2012-04-20 09:18:54 UTC (rev 21302)
+++ packages/django-floppyforms/trunk/debian/settings.py	2012-04-20 09:29:40 UTC (rev 21303)
@@ -5,4 +5,5 @@
     }
 }
 INSTALLED_APPS = ['floppyforms']
+SECRET_KEY = "1"