Please see the attached patch. Rebuilding with the new qscintilla2 causes octave to fail to detect qscintilla2 during the build. It builds, but less that support. I'm not bumping the priority since I don't know how important it is to Octave to have QScintilla2 suppport. I can upload the attached patch as an NMU if you'd prefer. Scott K
diff -Nru octave-4.2.1/debian/changelog octave-4.2.1/debian/changelog
--- octave-4.2.1/debian/changelog 2017-09-23 07:35:16.000000000 +0000
+++ octave-4.2.1/debian/changelog 2018-01-04 05:01:25.000000000 +0000
@@ -1,3 +1,10 @@
+octave (4.2.1-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Update build-depends and m4/acinclude.m4 for new qscintilla2 lib names
+
+ -- Scott Kitterman <scott@kitterman.com> Thu, 04 Jan 2018 05:01:25 +0000
+
octave (4.2.1-4) unstable; urgency=medium
* Disable java on armel, fixes FTBFS on that arch.
diff -Nru octave-4.2.1/debian/control octave-4.2.1/debian/control
--- octave-4.2.1/debian/control 2017-09-22 14:55:40.000000000 +0000
+++ octave-4.2.1/debian/control 2018-01-04 05:01:25.000000000 +0000
@@ -36,8 +36,8 @@
libpcre3-dev,
libqhull-dev,
libqrupdate-dev,
+ libqscintilla2-qt5-dev,
libqt5opengl5-dev,
- libqt5scintilla2-dev,
libreadline-dev,
librsvg2-bin,
libsndfile1-dev,
diff -Nru octave-4.2.1/debian/patches/qsci_rename octave-4.2.1/debian/patches/qsci_rename
--- octave-4.2.1/debian/patches/qsci_rename 1970-01-01 00:00:00.000000000 +0000
+++ octave-4.2.1/debian/patches/qsci_rename 2018-01-04 05:01:25.000000000 +0000
@@ -0,0 +1,11 @@
+--- 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 -Nru octave-4.2.1/debian/patches/series octave-4.2.1/debian/patches/series
--- octave-4.2.1/debian/patches/series 2017-09-10 14:58:14.000000000 +0000
+++ octave-4.2.1/debian/patches/series 2018-01-04 05:01:25.000000000 +0000
@@ -10,3 +10,4 @@
strncmp.patch
add-corrcoef-function.patch
java9.patch
+qsci_rename
Attachment:
signature.asc
Description: This is a digitally signed message part.