[Python-modules-commits] r21346 - in packages/django-countries/trunk/debian (control rules)

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

    Date: Saturday, April 21, 2012 @ 20:59:31
  Author: fladi-guest
Revision: 21346

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

Modified:
  packages/django-countries/trunk/debian/control
  packages/django-countries/trunk/debian/rules

Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2012-04-21 20:53:56 UTC (rev 21345)
+++ packages/django-countries/trunk/debian/control	2012-04-21 20:59:31 UTC (rev 21346)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~),
                iso-codes,
                python-all (>= 2.6.6-3~),
-               python-django (>= 1.4),
+               python-django (>= 1.2),
                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-21 20:53:56 UTC (rev 21345)
+++ packages/django-countries/trunk/debian/rules	2012-04-21 20:59:31 UTC (rev 21346)
@@ -11,7 +11,11 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	cp debian/settings.py testproject/testproject/settings.py
+	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 \
 	  rm -f testproject/test.db3 ; \