[Pkg-octave-commit] [octave] 01/09: Adapt for new QScintilla library naming scheme.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave.

commit af738a5d40e618bf3e3ff6d651d13fec159640b2
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Jan 4 14:37:10 2018 +0100

    Adapt for new QScintilla library naming scheme.
    
    + qscintilla-rename.patch: new patch.
    + Now Build-Depends on libqscintilla2-qt5-dev.
    
    Closes: #886195
    Thanks: Scott Kitterman
    Gbp-Dch: Full
---
 debian/control                         |  2 +-
 debian/patches/qscintilla-rename.patch | 19 +++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 563428d..b65cd45 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,8 @@ Build-Depends: automake,
                libpcre3-dev,
                libqhull-dev,
                libqrupdate-dev,
+               libqscintilla2-qt5-dev,
                libqt5opengl5-dev,
-               libqt5scintilla2-dev,
                libreadline-dev,
                librsvg2-bin,
                libsndfile1-dev,
diff --git a/debian/patches/qscintilla-rename.patch b/debian/patches/qscintilla-rename.patch
new file mode 100644
index 0000000..62d1555
--- /dev/null
+++ b/debian/patches/qscintilla-rename.patch
@@ -0,0 +1,19 @@
+Description: Fix detection of QScintilla following change in library naming scheme
+Author: Scott Kitterman <debian at kitterman.com>
+Bug-Debian: https://bugs.debian.org/886195
+Forwarded: no
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2018-01-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- octave-4.2.1.orig/m4/acinclude.m4
++++ octave-4.2.1/m4/acinclude.m4
+@@ -1346,7 +1346,7 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_
+     ;;
+     5)
+       QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+-      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5"
+     ;;
+     *)
+       AC_MSG_ERROR([Unrecognized Qt version $qt_version])
diff --git a/debian/patches/series b/debian/patches/series
index aad49e4..e257bae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ appstream-upgrade-spec.patch
 strncmp.patch
 add-corrcoef-function.patch
 java9.patch
+qscintilla-rename.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git