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

[hertzog at users.alioth.debian.org]

    Date: Thursday, September 15, 2011 @ 08:38:08
  Author: hertzog
Revision: 18528

Apply patch from Steve Langasek to dynamically build the UTF-8
locale required by the test-suite instead of build-depending on
locales-all. Closes: #630421

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

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2011-09-15 08:29:26 UTC (rev 18527)
+++ packages/python-django/trunk/debian/changelog	2011-09-15 08:38:08 UTC (rev 18528)
@@ -6,6 +6,9 @@
   * Update 01_disable_url_verify_regression_tests.diff and merge
     07_disable_url_verify_model_tests.diff into it.
   * Update patch headers to conform to DEP-3.
+  * Apply patch from Steve Langasek to dynamically build the UTF-8
+    locale required by the test-suite instead of build-depending on
+    locales-all. Closes: #630421
 
  -- Raphaël Hertzog <hertzog at debian.org>  Thu, 15 Sep 2011 09:37:26 +0200
 

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2011-09-15 08:29:26 UTC (rev 18527)
+++ packages/python-django/trunk/debian/control	2011-09-15 08:38:08 UTC (rev 18528)
@@ -4,7 +4,7 @@
 Maintainer: Chris Lamb <lamby at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Raphaël Hertzog <hertzog at debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50), python-support, python (>= 2.5) | python-sqlite, locales-all | language-pack-en-base
+Build-Depends: debhelper (>= 7.0.50), python-support, python (>= 2.5) | python-sqlite, locales
 Build-Depends-Indep: python-sphinx, libjs-jquery
 Homepage: http://www.djangoproject.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-django/trunk/

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2011-09-15 08:29:26 UTC (rev 18527)
+++ packages/python-django/trunk/debian/rules	2011-09-15 08:38:08 UTC (rev 18528)
@@ -32,7 +32,10 @@
 
 override_dh_auto_test:
 	touch tests/__init__.py
-	LC_ALL=en_US.utf8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=2
+	mkdir -p tmp-locales
+	localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 -A /usr/share/locale/locale.alias tmp-locales/en_US.UTF-8
+	LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=2
+	rm -rf tmp-locales
 
 override_dh_clean:
 	# backup~ is used in tests