[SCM] tora Debian packaging branch, master, updated. upstream/2.1.3-40-g133f84d

[Scott Kitterman]

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

The following commit has been merged in the master branch:
commit 133f84d58fffbb05138b9c4f08ecea3fd9f59a65
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Jan 4 01:53:09 2018 -0500

    * Update for new qscintilla2 library names (Closes: #885643)
---
 debian/changelog                 |  7 +++++++
 debian/control                   |  2 +-
 debian/patches/qsci-rename.patch | 11 +++++++++++
 debian/patches/series            |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1fcd193..6a00df2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tora (2.1.3-4) unstable; urgency=medium
+
+  * Team upload.
+  * Update for new qscintilla2 library names (Closes: #885643)
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 04 Jan 2018 01:45:26 -0500
+
 tora (2.1.3-3) unstable; urgency=medium
 
   * Added missing entry in initializer.
diff --git a/debian/control b/debian/control
index c83129f..4f0bd1c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 9), libqscintilla2-dev, cdbs, libpq-dev, cmake
+Build-Depends: debhelper (>= 9), libqscintilla2-qt4-dev, cdbs, libpq-dev, cmake
 Standards-Version: 3.9.8
 Homepage: http://www.torasql.com
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git
diff --git a/debian/patches/qsci-rename.patch b/debian/patches/qsci-rename.patch
new file mode 100644
index 0000000..52f0b8c
--- /dev/null
+++ b/debian/patches/qsci-rename.patch
@@ -0,0 +1,11 @@
+--- tora-2.1.3.orig/cmake/modules/FindQScintilla.cmake
++++ tora-2.1.3/cmake/modules/FindQScintilla.cmake
+@@ -42,7 +42,7 @@ IF(QT4_FOUND)
+                 ${FRAMEWORK_INCLUDE_DIR}/Qsci
+     )
+ 
+-    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
++    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt4)
+     FIND_LIBRARY(QSCINTILLA_LIBRARY
+         NAMES ${QSCINTILLA_NAMES}
+         PATHS ${QT_LIBRARY_DIR}
diff --git a/debian/patches/series b/debian/patches/series
index 64e8a44..34bb543 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 initializer.diff
 unistd.diff
+qsci-rename.patch

-- 
tora Debian packaging