[SCM] Konversation packaging for Debian branch, master, updated. debian/1.6.2-2-6-gc9d34a4

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=commitdiff;h=c9d34a4

The following commit has been merged in the master branch:
commit c9d34a4327c2ccdcd7bb66f203215e8d404a4cc9
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 18 08:10:46 2017 +0200

    update the patches
    
    - have-qca2-needs-to-be-defined.patch: drop, backported from upstream
---
 debian/changelog                                   |  2 ++
 debian/patches/have-qca2-needs-to-be-defined.patch | 25 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 103156b..3b6ffdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ konversation (1.7.2-0r1) UNRELEASED; urgency=medium
       - kio-dev -> libkf5kio-dev
     - drop libkf5sonnet-dev, no more used
   * Update install files.
+  * Update the patches:
+    - have-qca2-needs-to-be-defined.patch: drop, backported from upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 18 Jun 2017 07:59:21 +0200
 
diff --git a/debian/patches/have-qca2-needs-to-be-defined.patch b/debian/patches/have-qca2-needs-to-be-defined.patch
deleted file mode 100644
index 6cbde62..0000000
--- a/debian/patches/have-qca2-needs-to-be-defined.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Andy Irving <irv at soundforsound.co.uk>
-Description: HAVE_QCA2 needs to be set before the configuration file
- is created. Andy Irving proposed the fix in the Debian bug,
- I (Diane Trout) showed it to Eike Hien, checked that it worked,
- and pushed it upstream.
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798036
-Reviewed-by: Diane Trout <diane at debian.org>
-Reviewed-by: Eike Hein <hein at kde.org>
-Applied-Upstream: http://commits.kde.org/konversation/edeedffafb282730fa99a53634a3ea6f8ba6a00a
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,11 +52,11 @@
- check_include_file("byteswap.h" HAVE_BYTESWAP_H)
- check_include_file("sys/endian.h" HAVE_SYS_ENDIAN_H)
- 
-+set(HAVE_QCA2 ${Qca-qt5_FOUND})
-+
- configure_file(config-konversation.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konversation.h )
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
--set(HAVE_QCA2 ${Qca-qt5_FOUND})
--
- add_definitions(
-   -DQT_USE_QSTRINGBUILDER
-   -DQT_NO_CAST_TO_ASCII
diff --git a/debian/patches/series b/debian/patches/series
index 8f52dd2..67ce773 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-have-qca2-needs-to-be-defined.patch
 debian_dbug_autoreplace.diff
 debian_channel.diff

-- 
Konversation packaging for Debian