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

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

    Date: Saturday, April 21, 2012 @ 17:54:56
  Author: fladi-guest
Revision: 21341

Make buildable with django (>= 1.2).

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

Modified: packages/django-markupfield/trunk/debian/changelog
===================================================================
--- packages/django-markupfield/trunk/debian/changelog	2012-04-21 14:09:10 UTC (rev 21340)
+++ packages/django-markupfield/trunk/debian/changelog	2012-04-21 17:54:56 UTC (rev 21341)
@@ -6,7 +6,7 @@
   * Update years in d/copyright.
   * Fix tests for django (>= 1.4) FTBFS (Closes: #669472).
     - Ship out own settings.py
-    - Bump B-D for python-django to (>= 1.4)
+    - Bump B-D for python-django to (>= 1.2)
 
  -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 11:58:50 +0200
 

Modified: packages/django-markupfield/trunk/debian/control
===================================================================
--- packages/django-markupfield/trunk/debian/control	2012-04-21 14:09:10 UTC (rev 21340)
+++ packages/django-markupfield/trunk/debian/control	2012-04-21 17:54:56 UTC (rev 21341)
@@ -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-docutils,
                python-markdown,
                python-support

Modified: packages/django-markupfield/trunk/debian/rules
===================================================================
--- packages/django-markupfield/trunk/debian/rules	2012-04-21 14:09:10 UTC (rev 21340)
+++ packages/django-markupfield/trunk/debian/rules	2012-04-21 17:54:56 UTC (rev 21341)
@@ -6,7 +6,12 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	cp debian/settings.py testproject/testproject
+	set -e ; \
+	if [ -d testproject/testproject ]; then \
+		cp debian/settings.py testproject/testproject ; \
+	else \
+		cp debian/settings.py testproject ; \
+	fi
 	set -e; \
 	for python in $(shell pyversions -r); do \
 		PYTHONPATH=".:testproject" $$python testproject/manage.py test --settings=testproject.settings ; \