Package: src:sqlitebrowser
Version: 3.10.1-1
Severity: wishlist
Tags: patch

Dear Maintainer,

The qscintilla2 package in experimental contains a number of changes in
library naming to match upstream's changes.  As a result, sqlitebrowser will
FTBFS with this version due to a link failure.  I've attached a patch for an
eventual NMU (when the transition starts).  If you would prefer to handle the
upload yourself, please let me know.

Scott K
diff -Nru sqlitebrowser-3.10.1/debian/changelog sqlitebrowser-3.10.1/debian/changelog
--- sqlitebrowser-3.10.1/debian/changelog	2017-11-04 07:55:35.000000000 -0400
+++ sqlitebrowser-3.10.1/debian/changelog	2017-12-28 13:25:34.000000000 -0500
@@ -1,3 +1,10 @@
+sqlitebrowser (3.10.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for new qscintilla2 library names
+
+ -- Scott Kitterman <[email protected]>  Thu, 28 Dec 2017 13:25:18 -0500
+
 sqlitebrowser (3.10.1-1) unstable; urgency=medium
 
   * New upstream version
diff -Nru sqlitebrowser-3.10.1/debian/control sqlitebrowser-3.10.1/debian/control
--- sqlitebrowser-3.10.1/debian/control	2017-11-04 07:55:35.000000000 -0400
+++ sqlitebrowser-3.10.1/debian/control	2017-12-28 13:26:01.000000000 -0500
@@ -2,7 +2,7 @@
 Section: database
 Priority: optional
 Maintainer: Arto Jantunen <[email protected]>
-Build-Depends: debhelper (>= 10), qtbase5-dev, libsqlite3-dev, cmake, libantlr-dev, qttools5-dev, qttools5-dev-tools, libqt5scintilla2-dev
+Build-Depends: debhelper (>= 10), qtbase5-dev, libsqlite3-dev, cmake, libantlr-dev, qttools5-dev, qttools5-dev-tools, libqscintilla2-qt5-dev
 Standards-Version: 4.1.1
 Homepage: http://sqlitebrowser.org/
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/sqlitebrowser.git
diff -Nru sqlitebrowser-3.10.1/debian/patches/0001-Use-system-qscintilla2.patch sqlitebrowser-3.10.1/debian/patches/0001-Use-system-qscintilla2.patch
--- sqlitebrowser-3.10.1/debian/patches/0001-Use-system-qscintilla2.patch	2017-11-04 07:55:35.000000000 -0400
+++ sqlitebrowser-3.10.1/debian/patches/0001-Use-system-qscintilla2.patch	2017-12-28 13:25:02.000000000 -0500
@@ -17,7 +17,7 @@
  
  find_library ( QSCINTILLA_LIBRARY
 -  NAMES qscintilla qscintilla2 libqscintilla2
-+  NAMES qscintilla qscintilla2 libqscintilla2 qt5scintilla2
++  NAMES qscintilla qscintilla2 libqscintilla2 qscintilla2_qt5
    HINTS ${QT_LIBRARY_DIR}
  )
  
@@ -30,7 +30,7 @@
  UI_DIR = .ui
  INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
 -LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
-+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqt5scintilla2
++LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
  DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
  
  unix {
@@ -44,8 +44,8 @@
  link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
 -add_dependencies(test-sqlobjects qscintilla2)
 -target_link_libraries(test-sqlobjects qscintilla2)
-+add_dependencies(test-sqlobjects qt5scintilla2)
-+target_link_libraries(test-sqlobjects qt5scintilla2)
++add_dependencies(test-sqlobjects qscintilla2_qt5)
++target_link_libraries(test-sqlobjects qscintilla2_qt5)
  add_test(test-sqlobjects test-sqlobjects)
  
  # test-import
@@ -55,6 +55,6 @@
  link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
 -add_dependencies(test-regex qscintilla2)
 -target_link_libraries(test-regex qscintilla2)
-+add_dependencies(test-regex qt5scintilla2)
-+target_link_libraries(test-regex qt5scintilla2)
++add_dependencies(test-regex qscintilla2_qt5)
++target_link_libraries(test-regex qscintilla2_qt5)
  add_test(test-regex test-regex)

Reply via email to