[SCM] qtvirtualkeyboard packaging branch, experimental, updated. debian/5.7.1+dfsg-1-5-g6639ced

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 6639ced9681c6dc8859f4971f38afd890addef42
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 15 23:52:03 2017 +0300

    Deal with third-party stuff a bit better.
    
    * Do not exclude all of it from the tarball.
    * Drop useless disable_third_party.patch.
---
 debian/changelog                         |  4 +++
 debian/copyright                         |  3 +-
 debian/patches/disable_third_party.patch | 56 --------------------------------
 debian/patches/series                    |  1 -
 4 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 055638e..c1398cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ qtvirtualkeyboard-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.9.1.
+  * Do not exclude the whole src/virtualkeyboard/3rdparty/ directory from
+    the tarball, but only its tcime and pinyin subdirectories.
+  * Drop disable_third_party.patch, third-party stuff is already disabled
+    by default (except hunspell).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Jun 2017 08:27:43 -0300
 
diff --git a/debian/copyright b/debian/copyright
index 356bc3e..9f08582 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtvirtualkeyboard
 Source: https://download.qt.io/official_releases/qt/*/submodules/
-Files-Excluded: src/virtualkeyboard/3rdparty
+Files-Excluded: src/virtualkeyboard/3rdparty/tcime
+                src/virtualkeyboard/3rdparty/pinyin
 
 Files: *
 Copyright: 2016 The Qt Company Ltd
diff --git a/debian/patches/disable_third_party.patch b/debian/patches/disable_third_party.patch
deleted file mode 100644
index 79bfab7..0000000
--- a/debian/patches/disable_third_party.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: disable 3rdparty-embedded stuff.
- This patch disables the use of 3rdparty-embedded stuff.
- Upstreams does not has the code to use the system versions of
- them so we will simply disable them.
- .
- Patches to use system versions are more than welcomed, see
- <https://bugreports.qt.io/browse/QTBUG-59594>
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Bug: https://bugreports.qt.io/browse/QTBUG-59594
-Forwarded: not-needed
-Last-Update: 2017-06-24
-
-
----
- src/src.pro |   30 ------------------------------
- 1 file changed, 30 deletions(-)
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -2,36 +2,6 @@ TEMPLATE = subdirs
- 
- include(config.pri)
- 
--!disable-hunspell:exists(virtualkeyboard/3rdparty/hunspell/src/hunspell/hunspell.h) {
--    SUBDIRS += virtualkeyboard/3rdparty/hunspell
--    virtualkeyboard.depends += virtualkeyboard/3rdparty/hunspell
--}
--
--openwnn {
--    SUBDIRS += virtualkeyboard/3rdparty/openwnn
--    virtualkeyboard.depends += virtualkeyboard/3rdparty/openwnn
--}
--
--pinyin {
--    SUBDIRS += virtualkeyboard/3rdparty/pinyin
--    virtualkeyboard.depends += virtualkeyboard/3rdparty/pinyin
--}
--
--tcime {
--    SUBDIRS += virtualkeyboard/3rdparty/tcime
--    virtualkeyboard.depends += virtualkeyboard/3rdparty/tcime
--}
--
--lipi-toolkit {
--    SUBDIRS += virtualkeyboard/3rdparty/lipi-toolkit
--    virtualkeyboard.depends += virtualkeyboard/3rdparty/lipi-toolkit
--}
--
--t9write {
--    SUBDIRS += virtualkeyboard/3rdparty/t9write
--    virtualkeyboard.depends += virtualkeyboard/3rdparty/t9write
--}
--
- SUBDIRS += \
-     virtualkeyboard \
-     virtualkeyboard/import \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c8e458a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable_third_party.patch

-- 
qtvirtualkeyboard packaging