[Python-modules-commits] r21344 - in packages/django-picklefield/trunk/debian (3 files)

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

    Date: Saturday, April 21, 2012 @ 20:50:42
  Author: fladi-guest
Revision: 21344

Allow package to be built with django (>= 1.2).

Modified:
  packages/django-picklefield/trunk/debian/changelog
  packages/django-picklefield/trunk/debian/control
  packages/django-picklefield/trunk/debian/rules

Modified: packages/django-picklefield/trunk/debian/changelog
===================================================================
--- packages/django-picklefield/trunk/debian/changelog	2012-04-21 20:19:06 UTC (rev 21343)
+++ packages/django-picklefield/trunk/debian/changelog	2012-04-21 20:50:42 UTC (rev 21344)
@@ -2,7 +2,7 @@
 
   * Fix tests for django (>= 1.4) FTBFS (Closes: #669493).
     - Add our own settings.py for the tests
-    - Bump B-D on python-django to (>= 1.4)
+    - Bump B-D on python-django to (>= 1.2)
 
  -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 18:22:53 +0200
 

Modified: packages/django-picklefield/trunk/debian/control
===================================================================
--- packages/django-picklefield/trunk/debian/control	2012-04-21 20:19:06 UTC (rev 21343)
+++ packages/django-picklefield/trunk/debian/control	2012-04-21 20:50:42 UTC (rev 21344)
@@ -5,7 +5,7 @@
 Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.5),
-               python-django (>= 1.4),
+               python-django (>= 1.2),
                python-setuptools,
                python-support
 Standards-Version: 3.9.3

Modified: packages/django-picklefield/trunk/debian/rules
===================================================================
--- packages/django-picklefield/trunk/debian/rules	2012-04-21 20:19:06 UTC (rev 21343)
+++ packages/django-picklefield/trunk/debian/rules	2012-04-21 20:50:42 UTC (rev 21344)
@@ -12,7 +12,11 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	cp debian/settings.py testproject/testproject/
+	if [ -d testproject/testproject ]; then \
+		cp debian/settings.py testproject/testproject ; \
+	else \
+		cp debian/settings.py testproject/testproject ; \
+	fi
 	set -e; \
 	for python in $(shell pyversions -r); do \
 		PYTHONPATH=".:src:testproject" $$python testproject/manage.py test --settings=testproject.settings picklefield ; \