misc fixes

Author: koppi

debian/control

@@ -1,6 +1,5 @@
 Source: libqgcodeeditor
 Priority: optional
-Uploaders: Jakob Flierl <jakob.flierl@gmail.com>
 Maintainer: Jakob Flierl <jakob.flierl@gmail.com>
 Build-Depends: debhelper-compat (= 13),
                qtbase5-dev,
@@ -34,8 +33,7 @@ Description: G-Code text editor library based on Qt5 - development files
 
 Package: libqgcodeeditor-qt6
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Suggests: libqgcodeeditor-doc
 Multi-Arch: same
@@ -81,7 +79,7 @@ Description: Qt5 Designer plugin for QGCodeEditor (debug)
 Package: libqgcodeeditor-qt6-designer
 Section: misc
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}
 Enhances: qt-designer
 Multi-Arch: same
 Description: Qt6 Designer plugin for QGCodeEditor
@@ -144,6 +142,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends: libjs-jquery,
          ${misc:Depends}
+X-Doc-Main-Package: libqgcodeeditor-qt5
 Description: G-Code text editor library based on Qt5 - development files
  libqgcodeeditor (also known as QGGCodeEditor) is a free C++ library based on Qt
  that enables the quick creation of G-Code editing apps. It features
@@ -156,9 +155,8 @@ Package: libqgcodeeditor-qt5-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: libqgcodeeditor (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libqgcodeeditor-qt5 (= ${binary:Version}),
+         ${misc:Depends}
 Description: G-Code text editor library based on Qt5 - development files
  libqgcodeeditor (also known as QGGCodeEditor) is a free C++ library based on Qt
  that enables the quick creation of G-Code editing apps. It features
@@ -174,9 +172,8 @@ Package: libqgcodeeditor-qt6-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: libqgcodeeditor (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: libqgcodeeditor-qt6 (= ${binary:Version}),
+         ${misc:Depends}
 Description: G-Code text editor library based on Qt6 - development files
  libqgcodeeditor (also known as QGGCodeEditor) is a free C++ library based on Qt
  that enables the quick creation of G-Code editing apps. It features

debian/libqgcodeeditor-qt5-15.install

@@ -1,3 +1,3 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt5/
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QGCodeEditor/QGCodeEditor.h
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QGCodeEditor/QGCodeSyntaxHighlighter.h
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/features/qgcodeeditor.prf
-usr/lib/${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt5.so

debian/libqgcodeeditor-qt5-dev.install

@@ -0,0 +1,4 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt5.so
+usr/lib/${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt5.so.0
+usr/lib/${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt5.so.0.0
+usr/lib/${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt5.so.0.0.1

debian/libqgcodeeditor-qt5.install

@@ -0,0 +1 @@
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt5.prl

debian/not-installed

@@ -19,7 +19,7 @@ configure-stamp:
 	dh_testdir
 	mkdir -p QGcodeQt5
 	cp -r src/* QGcodeQt5
-	cd QGcodeQt5 && /usr/bin/qmake -qt=5 DESTDIR=../QGcodeQt5 $(QMAKE_FLAGS)
+	cd QGcodeQt5 && /usr/bin/qmake -qt=5 PREFIX=/usr LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH} INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt5 DESTDIR=../QGcodeQt5 $(QMAKE_FLAGS)
 	cp -r designer designer-Qt5
 	cd designer-Qt5 && /usr/bin/qmake -qt=5 INCLUDEPATH+=../src QMAKE_LIBDIR+=../QGcodeQt5 DESTDIR=../designer-Qt5 $(QMAKE_FLAGS)
 ifeq ($(qt6), "yes")
@@ -57,7 +57,9 @@ ifeq ($(qt6), "yes")
 endif
 
 execute_after_dh_installdocs-indep:
-	dh_doxygen
+
+override_dh_makeshlibs:
+	dh_makeshlibs --add-udeb shlibs:Depends -V
 
 override_dh_strip:
 	dh_strip --remaining-packages

debian/rules

@@ -842,7 +842,7 @@ WARNINGS               = YES
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = NO
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as documenting some parameters in
@@ -933,8 +933,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = README.doc \
-                         ../QGCodeEditor
+INPUT                  = ../src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -974,13 +973,13 @@ INPUT_FILE_ENCODING    =
 # provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = qsci*.h
+FILE_PATTERNS          = *.h *.cpp *.hpp *.c *.cc
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
 # The default value is: NO.
 
-RECURSIVE              = NO
+RECURSIVE              = YES
 
 # The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
@@ -1967,7 +1966,7 @@ COMPACT_LATEX          = NO
 # The default value is: a4.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
 # that should be included in the LaTeX output. The package can be specified just

doc/qgcodeeditor.dxy

@@ -143,7 +143,7 @@ QStringList list;
         }
     else if(str2.contains(';') )
         {
-        list = str2.split(";", QString::SkipEmptyParts); // skip because could have 2 or more ;
+        list = str2.split(";", Qt::SkipEmptyParts);
         str = list[0];
         str2 = " ;" + list[1];
         }

src/QGCodeEditor.cpp

@@ -1,7 +1,11 @@
 # Run "qmake; make; make install" to compile and install the library on Unix systems.
 
 TEMPLATE = lib
-TARGET = QGCodeEditor
+greaterThan(QT_MAJOR_VERSION, 5) {
+     TARGET = qgcodeeditor_qt6
+} else {
+     TARGET = qgcodeeditor_qt5
+}
 VERSION  = 0.0.1
 
 QT      *= gui widgets

src/QGCodeEditor.pro

@@ -1,4 +1,4 @@
-QMAKE_PRL_BUILD_DIR = /home/koppi/src/github/QGCoder/libqgcodeeditor/src
+QMAKE_PRL_BUILD_DIR = /home/koppi/libqgcodeeditor/src
 QMAKE_PRO_INPUT = QGCodeEditor.pro
 QMAKE_PRL_TARGET = libQGCodeEditor.so.0.0.1
 QMAKE_PRL_CONFIG = lex yacc exceptions depend_includepath testcase_targets import_plugins import_qpa_plugin file_copies qmake_use qt warn_on release link_prl incremental shared shared release linux unix posix gcc thread create_prl rtti have_target dll uic opengl moc resources