[SCM] qtbase packaging branch, experimental, updated. debian/5.9.1+dfsg-10-4-gaffb4e9

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sun Sep 24 07:46:43 UTC 2017


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

The following commit has been merged in the experimental branch:
commit affb4e9712e9ce64ece7a58da5f88b6a0d61ad4c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Sep 24 10:43:51 2017 +0300

    Stop excluding src/3rdparty/zlib/doc/rfc*.txt from the tarball.
    
    These files are no longer shipped by upstream.
---
 debian/changelog | 2 ++
 debian/copyright | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74aee8c..5a4a3a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtbase-opensource-src (5.9.2+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop fix_atspi_condition.diff, it was coming from upstream.
   * Port gnukfreebsd_cloexec.diff to new upstream code.
+  * Stop excluding src/3rdparty/zlib/doc/rfc*.txt from the tarball,
+    these files are no longer shipped by upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Sep 2017 23:28:13 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 99c5221..3ee72c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtbase-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
-Files-Excluded: src/3rdparty/zlib/doc/rfc*.txt
-                tests/auto/corelib/tools/qbytearray/rfc3252.txt
+Files-Excluded: tests/auto/corelib/tools/qbytearray/rfc3252.txt
                 tests/auto/corelib/io/qtextstream/rfc3261.txt
                 tests/auto/network/access/qftp/rfc3252.txt
                 tests/auto/network/access/qnetworkreply/rfc3252.txt

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list