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

Dmitry Shachnev mitya57 at moszumanska.debian.org
Wed Mar 2 10:03:24 UTC 2016


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

The following commit has been merged in the master branch:
commit cfe23e6fabb56273a2b5ae11422cb3a2067916d2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Mar 2 13:03:15 2016 +0300

    debian/generateTLDs.sh: Set -e to fail when a subcommand fails.
---
 debian/changelog       | 1 +
 debian/generateTLDs.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8394e75..45f04ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qtbase-opensource-src (5.5.1+dfsg-15) UNRELEASED; urgency=medium
   * Backport several upstream dbusmenu/dbustray related fixes from 5.6 branch.
   * 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.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Feb 2016 10:15:48 +0000
 
diff --git a/debian/generateTLDs.sh b/debian/generateTLDs.sh
index 49503a0..63b4ffd 100644
--- a/debian/generateTLDs.sh
+++ b/debian/generateTLDs.sh
@@ -20,6 +20,8 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+set -e
+
 DESTHEADER=src/corelib/io/qurltlds_p.h
 
 mv -f $DESTHEADER $DESTHEADER.orig

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list