diff -Nru bzr-svn-1.2.1/debian/changelog bzr-svn-1.2.1/debian/changelog --- bzr-svn-1.2.1/debian/changelog 2012-03-11 08:44:56.000000000 +0000 +++ bzr-svn-1.2.1/debian/changelog 2012-03-11 22:55:35.000000000 +0000 @@ -1,10 +1,9 @@ -bzr-svn (1.2.1-1~bazaar2~lucid1) lucid; urgency=low +bzr-svn (1.2.1-1~bazaar2~lucid2) lucid; urgency=low - * Rebuild in PPA. - * debian/control tweaked: s/(python-bzrlib\.tests \(>= 2\.5\.0- - 2)\)/\1~)/ + * For maverick and earlier, generate a C.UTF-8 locale before using it to run + the tests. - -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 08:44:56 +0000 + -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 22:55:35 +0000 bzr-svn (1.2.1-1) unstable; urgency=low diff -Nru bzr-svn-1.2.1/debian/rules bzr-svn-1.2.1/debian/rules --- bzr-svn-1.2.1/debian/rules 2012-01-23 21:16:01.000000000 +0000 +++ bzr-svn-1.2.1/debian/rules 2012-03-11 22:55:04.000000000 +0000 @@ -13,6 +13,7 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) override_dh_auto_test: - LC_ALL=C.UTF-8 $(CONCURRENCY) BZR_PLUGINS_AT=svn@$(CURDIR) /usr/bin/bzr selftest \ + localedef -i POSIX -f UTF-8 -c $(CURDIR)/C.UTF-8 || : + LOCPATH=$(CURDIR) LC_ALL=C.UTF-8 $(CONCURRENCY) BZR_PLUGINS_AT=svn@$(CURDIR) /usr/bin/bzr selftest \ --parallel=fork -v "^bzrlib.plugins.svn." Subversion Svn endif