[SCM] Konversation packaging for Debian branch, master, updated. debian/1.6-1-2-g9b48acd

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 34d2aca3bc777b0d91f5cb543a172e5f9365460c
Author: Diane Trout <diane at ghic.org>
Date:   Sun Jan 17 09:40:31 2016 -0800

    Add have-qca2-needs-to-be-defined.patch Andy Irving noticed an ordering problem that prevented Konversation from detecting it had QCA available. (Closes: #798036)
---
 debian/changelog                                   |  9 ++++++++
 debian/patches/have-qca2-needs-to-be-defined.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5234965..2847547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+konversation (1.6-2) UNRELEASED; urgency=medium
+
+  * Add have-qca2-needs-to-be-defined.patch
+    Andy Irving noticed an ordering problem that prevented
+    Konversation from detecting it had QCA available.
+    (Closes: #798036)
+
+ -- Diane Trout <diane at debian.org>  Wed, 16 Sep 2015 22:21:23 -0700
+
 konversation (1.6-1) unstable; urgency=medium
 
   * Update watch file.
diff --git a/debian/patches/have-qca2-needs-to-be-defined.patch b/debian/patches/have-qca2-needs-to-be-defined.patch
new file mode 100644
index 0000000..6cbde62
--- /dev/null
+++ b/debian/patches/have-qca2-needs-to-be-defined.patch
@@ -0,0 +1,25 @@
+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 67ce773..8f52dd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+have-qca2-needs-to-be-defined.patch
 debian_dbug_autoreplace.diff
 debian_channel.diff

-- 
Konversation packaging for Debian