debian/: Build Qt 6 variant alongside Qt 5 variant

7 files changed, 72 insertions, 8 deletions

diff --git a/debian/control b/debian/control
index d0ebe16..d7bed05 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,12 @@ Build-Depends: debhelper-compat (= 13),
                python3-gi:native,
                python3:any,
                qml-module-qtquick2 <!nocheck>,
+               qml6-module-qtquick <!nocheck>,
                qt5-qmake,
                qtbase5-dev,
                qtdeclarative5-dev,
+               qt6-base-dev,
+               qt6-declarative-dev,
 Vcs-Browser: https://github.com/AyatanaIndicators/qmenumodel.git
 Vcs-Git: https://github.com/AyatanaIndicators/qmenumodel.git
 Homepage: https://github.com/AyatanaIndicators/qmenumodel
@@ -27,13 +30,13 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt binding for GMenuModel - shared library
+Description: Qt 5 binding for GMenuModel - shared library
  Qt binding for GMenuModel that allows connecting to a menu model exposed on
  D-Bus and presents it as a list model. It can be used to expose indicator or
  application menus for applications using the Qt framework.
  .
  This package contains the shared library required by applications using
- QMenuModel.
+ QMenuModel (Qt 5 variant).
 
 Package: libqmenumodel-dev
 Architecture: any
@@ -41,22 +44,61 @@ Section: libdevel
 Depends: libqmenumodel1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt binding for GMenuModel - development files
+Description: Qt 5 binding for GMenuModel - development files
  Qt binding for GMenuModel that allows connecting to a menu model exposed on
  D-Bus and presents it as a list model. It can be used to expose indicator or
  application menus for applications using the Qt framework.
  .
- This package contains the development headers for libqmenumodel.
+ This package contains the development headers for libqmenumodel (Qt 5 variant).
 
 Package: qml-module-qmenumodel1
 Architecture: any
 Depends: libqmenumodel1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-Description: Qt binding for GMenuModel - QML module
+Description: Qt 5 binding for GMenuModel - QML module
  Qt binding for GMenuModel that allows connecting to a menu model exposed on
  D-Bus and presents it as a list model. It can be used to expose indicator or
  application menus for applications using the Qt framework.
  .
  This package contains the QML module for building applications using the
- QMenuModel library.
+ QMenuModel library (Qt 5 variant).
+
+Package: libqmenumodel-qt6-1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 6 binding for GMenuModel - shared library
+ Qt binding for GMenuModel that allows connecting to a menu model exposed on
+ D-Bus and presents it as a list model. It can be used to expose indicator or
+ application menus for applications using the Qt framework.
+ .
+ This package contains the shared library required by applications using
+ QMenuModel (Qt 6 variant).
+
+Package: libqmenumodel-qt6-dev
+Architecture: any
+Section: libdevel
+Depends: libqmenumodel1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 6 binding for GMenuModel - development files
+ Qt binding for GMenuModel that allows connecting to a menu model exposed on
+ D-Bus and presents it as a list model. It can be used to expose indicator or
+ application menus for applications using the Qt framework.
+ .
+ This package contains the development headers for libqmenumodel (Qt 6 variant).
+
+Package: qml6-module-qmenumodel
+Architecture: any
+Depends: libqmenumodel-qt6-1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 6 binding for GMenuModel - QML module
+ Qt binding for GMenuModel that allows connecting to a menu model exposed on
+ D-Bus and presents it as a list model. It can be used to expose indicator or
+ application menus for applications using the Qt framework.
+ .
+ This package contains the QML module for building applications using the
+ QMenuModel library (Qt 6 variant).
diff --git a/debian/libqmenumodel-dev.install b/debian/libqmenumodel-dev.install
index 6def511..d970f7e 100644
--- a/debian/libqmenumodel-dev.install
+++ b/debian/libqmenumodel-dev.install
@@ -1,3 +1,3 @@
-usr/include/qmenumodel/*.h
+usr/include/qt5/qmenumodel/*.h
 usr/lib/*/libqmenumodel.so
 usr/lib/*/pkgconfig/qmenumodel.pc
diff --git a/debian/libqmenumodel-qt6-1.install b/debian/libqmenumodel-qt6-1.install
new file mode 100644
index 0000000..393bbaa
--- /dev/null
+++ b/debian/libqmenumodel-qt6-1.install
@@ -0,0 +1 @@
+usr/lib/*/libqmenumodel-qt6.so.*
diff --git a/debian/libqmenumodel-qt6-dev.examples b/debian/libqmenumodel-qt6-dev.examples
new file mode 100644
index 0000000..b7d8508
--- /dev/null
+++ b/debian/libqmenumodel-qt6-dev.examples
@@ -0,0 +1,4 @@
+examples/*.cpp
+examples/*.py
+examples/*.qml
+examples/README
diff --git a/debian/libqmenumodel-qt6-dev.install b/debian/libqmenumodel-qt6-dev.install
new file mode 100644
index 0000000..cfa87c3
--- /dev/null
+++ b/debian/libqmenumodel-qt6-dev.install
@@ -0,0 +1,3 @@
+usr/include/qt6/qmenumodel/*.h
+usr/lib/*/libqmenumodel-qt6.so
+usr/lib/*/pkgconfig/qmenumodel-qt6.pc
diff --git a/debian/qml6-module-qmenumodel.install b/debian/qml6-module-qmenumodel.install
new file mode 100644
index 0000000..2bb9459
--- /dev/null
+++ b/debian/qml6-module-qmenumodel.install
@@ -0,0 +1 @@
+usr/lib/*/qt6/qml/QMenuModel/*
diff --git a/debian/rules b/debian/rules
index f1fea37..1b9ea7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,20 @@ DEB_CMAKE_EXTRA_FLAGS = \
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+	dh_auto_configure --builddirectory=build-qt6 -- $(DEB_CMAKE_EXTRA_FLAGS) -DENABLE_QT6=ON
+	dh_auto_configure --builddirectory=build-qt5 -- $(DEB_CMAKE_EXTRA_FLAGS) -DENABLE_QT6=OFF
+
+override_dh_auto_build:
+	dh_auto_build --builddirectory=build-qt6
+	dh_auto_build --builddirectory=build-qt5
+
+override_dh_auto_install:
+	dh_auto_install --builddirectory=build-qt6
+	dh_auto_install --builddirectory=build-qt5
+
+override_dh_auto_clean:
+	dh_auto_clean --builddirectory=build-qt6
+	dh_auto_clean --builddirectory=build-qt5
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xlibqmenumodel-qml.so