[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-14-7-gb527e8b

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=b527e8b

The following commit has been merged in the master branch:
commit b527e8b2150acda821abaabe512fb9a39ac4b639
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Mar 2 21:53:22 2016 +0300

    Call generateTLDs.sh with LC_ALL=C.UTF-8, to workaround a bug in grep.
    
    See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22838.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 45f04ad..39dd085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qtbase-opensource-src (5.5.1+dfsg-15) UNRELEASED; urgency=medium
   * Correct license of japanese_230_50.qpf font in debian/copyright. Thanks to
     Arnout Vandecappelle for the patch (closes: #815616).
   * debian/generateTLDs.sh: Set -e to fail when a subcommand fails.
+  * Call generateTLDs.sh with LC_ALL=C.UTF-8, to workaround a bug in grep.
+    See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22838.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
 
diff --git a/debian/rules b/debian/rules
index 5d4ea15..2353a8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -225,7 +225,7 @@ override_dh_auto_build-arch:
 	# regenerate some upstream-provided files.
 	cd $(CURDIR)/src; ../bin/qmake; make sub-corelib
 	# Add here the code to generate the helpers and then the headers.
-	sh debian/generateTLDs.sh
+	LC_ALL=C.UTF-8 sh debian/generateTLDs.sh
 	# Clean up the compiled code and start again.
 	cd $(CURDIR)/src; make distclean
 	make clean

-- 
qtbase packaging