* Remove libc-bin from Depends

* Add (>= 0) to the locales dependency to avoid the locales-all case
 * Fix set -e in d/rules
 * Add a reference to the ML archive for the patch
This commit is contained in:
Simon Chopin 2013-04-23 14:50:10 +00:00
parent 15fba86d78
commit 39f6c38a15
3 changed files with 4 additions and 6 deletions

3
debian/control vendored
View file

@ -6,8 +6,7 @@ Uploaders: Simon Chopin <chopin.simon@gmail.com>
Build-Depends: Build-Depends:
debhelper (>= 8), debhelper (>= 8),
python-all (>= 2.6.6-3~), python-all (>= 2.6.6-3~),
libc-bin, locales (>= 0),
locales,
python-nose, python-nose,
python-setuptools python-setuptools
Standards-Version: 3.9.4 Standards-Version: 3.9.4

View file

@ -1,8 +1,8 @@
Description: Normalize the locale names when testing i18n features Description: Normalize the locale names when testing i18n features
Author: Simon Chopin <chopin.simon@gmail.com> Author: Simon Chopin <chopin.simon@gmail.com>
Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional> Forwarded: https://lists.fedorahosted.org/pipermail/kitchen-devel/2013-April/000020.html
Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
Last-Update: 2013-04-23 Last-Update: 2013-04-23
--- ---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/tests/test_i18n.py --- a/tests/test_i18n.py

3
debian/rules vendored
View file

@ -9,8 +9,7 @@ ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
localedef -f UTF-8 -i en_US ./debian/tmp/locales/en_US.UTF-8/ localedef -f UTF-8 -i en_US ./debian/tmp/locales/en_US.UTF-8/
localedef -f UTF-8 -i pt_BR ./debian/tmp/locales/pt_BR.UTF-8/ localedef -f UTF-8 -i pt_BR ./debian/tmp/locales/pt_BR.UTF-8/
localedef -f ISO-8859-1 -i pt_BR ./debian/tmp/locales/pt_BR.ISO-8859-1/ localedef -f ISO-8859-1 -i pt_BR ./debian/tmp/locales/pt_BR.ISO-8859-1/
set -e set -e; \
echo $(shell pwd)
for py in $(shell pyversions -r); do \ for py in $(shell pyversions -r); do \
LOCPATH=$(CURDIR)/debian/tmp/locales/ $$py /usr/bin/nosetests tests; \ LOCPATH=$(CURDIR)/debian/tmp/locales/ $$py /usr/bin/nosetests tests; \
done done