[SCM] qtvirtualkeyboard packaging branch, master, updated. 470d9943395a1996fecf5584d9beb18aee58ac15

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 31da91f7fe6ac86fb340cbd2b71c4adfac003233
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 24 18:44:30 2017 -0300

    Do not ship 3rdparty stuff.
    
    Upstream does not has a way to use the system libraries, so for
    the moment we are disabling them. Patches are more than welcomed.
---
 debian/changelog                         |  2 +-
 debian/copyright                         |  1 +
 debian/patches/disable_third_party.patch | 56 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/watch                             |  1 +
 5 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b00fd69..94cdb76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtvirtualkeyboard-opensource-src (5.7.1-1) UNRELEASED; urgency=medium
+qtvirtualkeyboard-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #697509).
     - Based on previous work by Jonathan Riddell and Bhushan Shah.
diff --git a/debian/copyright b/debian/copyright
index c19e5da..d868c95 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 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: *
 Copyright: 2016 The Qt Company Ltd
diff --git a/debian/patches/disable_third_party.patch b/debian/patches/disable_third_party.patch
new file mode 100644
index 0000000..79bfab7
--- /dev/null
+++ b/debian/patches/disable_third_party.patch
@@ -0,0 +1,56 @@
+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
new file mode 100644
index 0000000..c8e458a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_third_party.patch
diff --git a/debian/watch b/debian/watch
index 32fd37b..0c267ab 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=uversionmangle=s/-/~/,dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
 https://download.qt.io/official_releases/qt/([\d\.]*)/([\d\.]*)/submodules/qtvirtualkeyboard-opensource-src-([^-]*)\.tar\.xz

-- 
qtvirtualkeyboard packaging