misc fixes

Author: koppi

debian/not-installed

@@ -1,16 +1,16 @@
-usr/lib/x86_64-linux-gnu/qt5/libqgcodeeditor_qt5.prl
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt5.prl
 usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qgcodeeditor.prf
-usr/lib/x86_64-linux-gnu/qt5/libqgcodeeditor_qt5.so
-usr/lib/x86_64-linux-gnu/qt5/libqgcodeeditor_qt5.so.0
-usr/lib/x86_64-linux-gnu/qt5/libqgcodeeditor_qt5.so.0.1
-usr/lib/x86_64-linux-gnu/qt5/libqgcodeeditor_qt5.so.0.1.19
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt5.so
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt5.so.0
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt5.so.0.1
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt5.so.0.1.19
 usr/include/x86_64-linux-gnu/qt5/QGCodeEditor/QGCodeEditor.h
 usr/include/x86_64-linux-gnu/qt5/QGCodeEditor/QGCodeSyntaxHighlighter.h
-usr/lib/x86_64-linux-gnu/qt6/libqgcodeeditor_qt6.prl
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt6.prl
 usr/lib/x86_64-linux-gnu/qt6/mkspecs/features/qgcodeeditor.prf
-usr/lib/x86_64-linux-gnu/qt6/libqgcodeeditor_qt6.so
-usr/lib/x86_64-linux-gnu/qt6/libqgcodeeditor_qt6.so.0
-usr/lib/x86_64-linux-gnu/qt6/libqgcodeeditor_qt6.so.0.1
-usr/lib/x86_64-linux-gnu/qt6/libqgcodeeditor_qt6.so.0.1.19
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt6.so
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt6.so.0
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt6.so.0.1
+usr/lib/x86_64-linux-gnu/libqgcodeeditor_qt6.so.0.1.19
 usr/include/x86_64-linux-gnu/qt6/QGCodeEditor/QGCodeEditor.h
 usr/include/x86_64-linux-gnu/qt6/QGCodeEditor/QGCodeSyntaxHighlighter.h

debian/rules

@@ -24,10 +24,10 @@ configure-stamp:
 	dh_testdir
 	mkdir -p QGcodeQt5
 	cp -r src/* QGcodeQt5
-	cd QGcodeQt5 && /usr/bin/qmake -qt=5 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt5 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH}/qt5 DESTDIR=$$PWD $(QMAKE_FLAGS)
+	cd QGcodeQt5 && /usr/bin/qmake -qt=5 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt5 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH} DESTDIR=$$PWD $(QMAKE_FLAGS)
 	mkdir -p QGcodeQt6
 	cp -r src/* QGcodeQt6
-	cd QGcodeQt6 && /usr/bin/qmake6 QT_QMAKE_VERSION=6 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt6 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH}/qt6 DESTDIR=$$PWD $(QMAKE_FLAGS)
+	cd QGcodeQt6 && /usr/bin/qmake6 QT_QMAKE_VERSION=6 PREFIX=/usr INCLUDE_DIR=/usr/include/$${DEB_HOST_MULTIARCH}/qt6 LIB_DIR=/usr/lib/$${DEB_HOST_MULTIARCH} DESTDIR=$$PWD $(QMAKE_FLAGS)
 	rm -f QGcodeQt6/libqgcodeeditor_qt5.so* QGcodeQt6/libQGCodeEditor.prf QGcodeQt6/libQGCodeEditor.prl
 	touch $@
 
@@ -49,10 +49,10 @@ execute_after_dh_auto_build-indep:
 override_dh_auto_install:
 	$(MAKE) -C QGcodeQt5 install INSTALL_ROOT=$(CURDIR)/debian/tmp
 	$(MAKE) -C QGcodeQt6 install INSTALL_ROOT=$(CURDIR)/debian/tmp
-	install -m0755 -d debian/libqgcodeeditor-qt5/usr/lib/$${DEB_HOST_MULTIARCH}/qt5
-	cp -a debian/tmp/usr/lib/$${DEB_HOST_MULTIARCH}/qt5/libqgcodeeditor_qt5.so* debian/libqgcodeeditor-qt5/usr/lib/$${DEB_HOST_MULTIARCH}/qt5/
-	install -m0755 -d debian/libqgcodeeditor-qt6/usr/lib/$${DEB_HOST_MULTIARCH}/qt6
-	cp -a debian/tmp/usr/lib/$${DEB_HOST_MULTIARCH}/qt6/libqgcodeeditor_qt6.so* debian/libqgcodeeditor-qt6/usr/lib/$${DEB_HOST_MULTIARCH}/qt6/
+	install -m0755 -d debian/libqgcodeeditor-qt5/usr/lib/$${DEB_HOST_MULTIARCH}
+	cp -a debian/tmp/usr/lib/$${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt5.so* debian/libqgcodeeditor-qt5/usr/lib/$${DEB_HOST_MULTIARCH}/
+	install -m0755 -d debian/libqgcodeeditor-qt6/usr/lib/$${DEB_HOST_MULTIARCH}
+	cp -a debian/tmp/usr/lib/$${DEB_HOST_MULTIARCH}/libqgcodeeditor_qt6.so* debian/libqgcodeeditor-qt6/usr/lib/$${DEB_HOST_MULTIARCH}/
 	install -m0755 -d debian/libqgcodeeditor-qt5-dev/usr/lib/$${DEB_HOST_MULTIARCH}/qt5
 	install -m0755 -d debian/libqgcodeeditor-qt5-dev/usr/include/$${DEB_HOST_MULTIARCH}/qt5/QGCodeEditor
 	cp -a debian/tmp/usr/include/$${DEB_HOST_MULTIARCH}/qt5/QGCodeEditor/* debian/libqgcodeeditor-qt5-dev/usr/include/$${DEB_HOST_MULTIARCH}/qt5/QGCodeEditor/