[neon/backports-noble/snapd-glib-noble/Neon/unstable] debian: rebase to salsa for dual build
Carlos De Maine
null at kde.org
Sun May 11 09:42:36 BST 2025
Git commit 10de7571de67f3be526cf1fecbbd7139d5083df6 by Carlos De Maine.
Committed on 11/05/2025 at 08:41.
Pushed by carlosdem into branch 'Neon/unstable'.
rebase to salsa for dual build
M +130 -6 debian/changelog
M +69 -18 debian/control
M +2 -1 debian/copyright
A +526 -0 debian/libsnapd-glib-2-1.symbols
M +2 -2 debian/libsnapd-glib-dev.install
M +2 -2 debian/libsnapd-qt-dev.install
A +1 -0 debian/libsnapd-qt6-2-1.install
A +4 -0 debian/libsnapd-qt6-dev.install
A +108 -0 debian/patches/1001_support-qt5+qt6-dual-builds.patch
A +19 -0 debian/patches/2001_install-docs-to-html-subfolder.patch
A +2 -0 debian/patches/series
A +2 -0 debian/qml-module-snapd.install
M +1 -1 debian/qml6-module-snapd.install
M +60 -5 debian/rules
https://invent.kde.org/neon/backports-noble/snapd-glib-noble/-/commit/10de7571de67f3be526cf1fecbbd7139d5083df6
diff --git a/debian/changelog b/debian/changelog
index 4026f3b..f6c94ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,138 @@
-snapd-glib (1.67-0neon) noble; urgency=medium
+snapd-glib (1.67-1) unstable; urgency=medium
- * New release
+ * New upstream release.
+ * debian/patches:
+ + Add 2001_install-docs-to-html-subfolder.patch. Use a different install
+ target for doc files.
+ * debian/control:
+ + Drop from B-D: gtk-doc-tools, add gi-docgen instead.
+ + Bump Standards-Version: to 4.7.2. No changes needed.
+ * debian/rules:
+ + Drop execute_before_dh_install: override. No need to move doc files
+ around anymore.
+ * debian/libsnapd-glib-2-1.symbols:
+ + Update file.
+
+ -- Mike Gabriel <sunweaver at debian.org> Sun, 04 May 2025 20:51:31 +0200
+
+snapd-glib (1.66-2) unstable; urgency=medium
+
+ * debian/patches:
+ + Update 1001_support-qt5+qt6-dual-builds.patch. Fix filenames of generated
+ .cmake files when building against Qt6. Thanks to Aurélien COUDERC for
+ testing the Qt6 builds of snapd-glib.
+
+ -- Mike Gabriel <sunweaver at debian.org> Tue, 01 Apr 2025 14:31:58 +0200
+
+snapd-glib (1.66-1) unstable; urgency=medium
+
+ * Re-upload to unstable as is.
+
+ -- Mike Gabriel <sunweaver at debian.org> Wed, 12 Mar 2025 08:17:58 +0100
+
+snapd-glib (1.66-1~exp2) experimental; urgency=medium
+
+ * debian/patches:
+ + Update 1001_support-qt5+qt6-dual-builds.patch. CMake folder names required
+ adjustments to be automatically found by CMake.
+ * debian/libsnapd-qt{,6}-dev.install:
+ + Adjust to path name changes of CMake configuration files.
+
+ -- Mike Gabriel <sunweaver at debian.org> Mon, 10 Mar 2025 09:34:09 +0100
+
+snapd-glib (1.66-1~exp1) experimental; urgency=medium
+
+ * Upload to experimental.
+
+ [ Scarlett Moore ]
+ * New upstream release (1.66)
+ * Bump standards version; no changes required.
+
+ [ Mike Gabriel ]
+ * debian/patches:
+ + Add 1001_support-qt5+qt6-dual-builds.patch. Support dually building
+ against Qt5 and Qt6.
+ * debian/:
+ + Dual build against Qt5 and Qt6 (introducing new Qt6-related bin:pkgs.
+ * debian/control:
+ + Drop from B-D: pkg-kde-tools. Not used anymore.
+ + Add ${gir:Provides} to libsnapd-glib-dev.
+ * debian/copyright:
+ + Update copyright attributions for debian/.
+
+ -- Mike Gabriel <sunweaver at debian.org> Mon, 10 Mar 2025 08:37:54 +0100
+
+snapd-glib (1.66-0ubuntu1) plucky; urgency=medium
+
+ * New upstream release (1.66)
+ * Drop no longer required upstream patches.
+ * Update symbols from build logs.
+
+ -- Rik Mills <rikmills at kde.org> Sun, 26 Jan 2025 13:39:01 +0000
+
+snapd-glib (1.65-0ubuntu3) plucky; urgency=medium
+
+ * Rebuild against Qt 6.7.2
+
+ -- Rik Mills <rikmills at kde.org> Wed, 30 Oct 2024 10:42:42 +0000
+
+snapd-glib (1.65-0ubuntu2) oracular; urgency=medium
+
+ * debian/patches: Apply upstream_fix-build-in-armhf.patch to fix tests
+ on armhf. (LP: #2077200)
+ * debian/rules: Make build time tests fatal again.
+
+ -- Rik Mills <rikmills at kde.org> Tue, 10 Sep 2024 11:42:29 +0100
+
+snapd-glib (1.65-0ubuntu1) oracular; urgency=medium
+
+ [ Simon Quigley ]
+ * New upstream release.
+
+ [ Rik Mills ]
+ * Add upstream_install-notice-header.patch to fix plasma-discover
+ FTBFS.
+ * Do not build for Qt6 on i386, as build dependencies are not available.
+ * Make build time tests non fatal for now:
+ https://github.com/canonical/snapd-glib/issues/162
+
+ -- Rik Mills <rikmills at kde.org> Sun, 07 Jul 2024 06:29:35 +0100
+
+snapd-glib (1.64-1ubuntu1) oracular; urgency=medium
+
+ * Merge from Debian unstable. Remaining changes:
+ - debian/tests/control: Unmark unit test as flaky
+ * Dropped changes, no longer needed:
+ - debian/libsnapd-qt1.symbols: Use C++ symbol names.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Thu, 06 Jun 2024 14:39:16 -0700
+
+snapd-glib (1.64-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/libsnapd-qt-2-1.symbols:
+ + Drop file. Resolve various issues with C++ symbols and API derivations
+ related to 3rd party code / compiler changes. (Closes: #1064650, #1067380,
+ #1015665).
+ * debian/libsnapd-glib-2-1.symbols:
+ + Update symbols.
+ * debian/copyright:
+ + Update copyright attribution for debian/.
+
+ -- Mike Gabriel <sunweaver at debian.org> Mon, 25 Mar 2024 14:39:15 +0100
+
+snapd-glib (1.63-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update libsnapd-qt-2-1.symbols to support riscv64. (Closes: #1052429)
- -- Carlos De Maine <carlosd.kde at gmail.com> Sun, 11 May 2025 16:19:00 +1000
+ -- Bo YU <tsu.yubo at gmail.com> Mon, 08 Jan 2024 16:11:01 +0800
-snapd-glib (1.65-0neon) noble; urgency=medium
+snapd-glib (1.64-0ubuntu5) noble; urgency=medium
- * New release
+ * No-change rebuild for CVE-2024-3094
- -- Carlos De Maine <carlosdemaine at gmail.com> Wed, 24 Apr 2024 12:45:13 +1000
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sun, 31 Mar 2024 08:23:03 +0000
snapd-glib (1.64-0ubuntu4) noble; urgency=medium
diff --git a/debian/control b/debian/control
index e0659c4..f9846d5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,26 @@
Source: snapd-glib
Section: libs
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Ayatana Packagers <pkg-ayatana-devel at alioth-lists.debian.net>
+Maintainer: Ayatana Packagers <pkg-ayatana-devel at alioth-lists.debian.net>
Uploaders:
Jeremy Bicha <jbicha at debian.org>,
Mike Gabriel <sunweaver at debian.org>,
Robert Ancell <robert.ancell at canonical.com>
Build-Depends: debhelper-compat (= 13),
dh-sequence-gir,
+ dh-sequence-pkgkde-symbolshelper,
gi-docgen,
- gtk-doc-tools (>= 1.20),
libgirepository1.0-dev,
- libglib2.0-dev (>= 2.46),
- libjson-glib-dev (>= 1.2),
+ libglib2.0-dev,
+ libjson-glib-dev,
libsoup-3.0-dev,
- meson (>= 0.43.0),
- pkg-kde-tools,
+ meson,
+ qtbase5-dev,
+ qtdeclarative5-dev,
qt6-base-dev,
qt6-declarative-dev,
valac
-Standards-Version: 4.6.1
+Standards-Version: 4.7.2
Rules-Requires-Root: no
Homepage: https://github.com/snapcore/snapd-glib
Vcs-Git: https://salsa.debian.org/debian-ayatana-team/snapd-glib.git
@@ -47,7 +47,6 @@ Multi-Arch: same
Depends: ${misc:Depends},
${gir:Depends},
libsnapd-glib-2-1 (= ${binary:Version})
-Replaces: gir1.2-snapd-1
Description: Typelib file for libsnapd-glib1
snapd-glib is a library to allow GLib based applications access to snapd,
the daemon that controls Snaps.
@@ -71,6 +70,7 @@ Depends: ${misc:Depends},
libglib2.0-dev,
libsoup-3.0-dev,
libjson-glib-dev
+Provides: ${gir:Provides},
Description: GLib snapd library (development files)
snapd-glib is a library to allow GLib based applications access to snapd,
the daemon that controls Snaps.
@@ -82,13 +82,29 @@ Description: GLib snapd library (development files)
This package contains header files and development information, which
is useful for building applications that need to communicate with snapd.
+Package: libsnapd-qt6-2-1
+Architecture: linux-any kfreebsd-any
+Multi-Arch: same
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Suggests: snapd
+Description: Qt snapd library (Qt6 version
+ snapd-glib is a library to allow GLib based applications access to snapd,
+ the daemon that controls Snaps.
+ .
+ Snaps are 'universal' packages that work across many different Linux
+ systems, enabling secure distribution of the latest apps and utilities
+ for cloud, servers, desktops and the internet of things.
+ .
+ snapd-qt is a wrapper library for snapd-glib for Qt6 applications.
+
Package: libsnapd-qt-2-1
Architecture: linux-any kfreebsd-any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Suggests: snapd
-Description: Qt snapd library
+Description: Qt snapd library (Qt5 version)
snapd-glib is a library to allow GLib based applications access to snapd,
the daemon that controls Snaps.
.
@@ -96,17 +112,50 @@ Description: Qt snapd library
systems, enabling secure distribution of the latest apps and utilities
for cloud, servers, desktops and the internet of things.
.
- snapd-qt is a wrapper library for snapd-glib for Qt applications.
+ snapd-qt is a wrapper library for snapd-glib for Qt5 applications.
Package: qml6-module-snapd
Architecture: linux-any kfreebsd-any
Depends: ${misc:Depends},
${shlibs:Depends},
-Provides: qml-module-snapd
-Replaces: qml-module-snapd
Suggests: snapd
Multi-Arch: same
-Description: Snapd QML module
+Description: Snapd QML module (Qt6 version)
+ snapd-glib is a library to allow GLib based applications access to snapd,
+ the daemon that controls Snaps.
+ .
+ Snaps are 'universal' packages that work across many different Linux
+ systems, enabling secure distribution of the latest apps and utilities
+ for cloud, servers, desktops and the internet of things.
+ .
+ This is a QML module for Qt6 applications to access snapd.
+
+Package: qml-module-snapd
+Architecture: linux-any kfreebsd-any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+Suggests: snapd
+Multi-Arch: same
+Description: Snapd QML module (Qt5 version)
+ snapd-glib is a library to allow GLib based applications access to snapd,
+ the daemon that controls Snaps.
+ .
+ Snaps are 'universal' packages that work across many different Linux
+ systems, enabling secure distribution of the latest apps and utilities
+ for cloud, servers, desktops and the internet of things.
+ .
+ This is a QML module for Qt5 applications to access snapd.
+
+Package: libsnapd-qt6-dev
+Section: libdevel
+Architecture: linux-any kfreebsd-any
+Multi-Arch: same
+Depends: ${misc:Depends},
+ libsnapd-qt6-2-1 (= ${binary:Version}),
+ qt6-base-dev,
+Breaks: libsnapd-glib-dev (<< 1.46)
+Replaces: libsnapd-glib-dev (<< 1.46)
+Description: Qt snapd library (Qt6 development files)
snapd-glib is a library to allow GLib based applications access to snapd,
the daemon that controls Snaps.
.
@@ -114,7 +163,9 @@ Description: Snapd QML module
systems, enabling secure distribution of the latest apps and utilities
for cloud, servers, desktops and the internet of things.
.
- This is a QML module for Qt applications to access snapd.
+ snapd-qt is a wrapper library for snapd-glib for Qt6 applications.
+ .
+ This package contains the development files.
Package: libsnapd-qt-dev
Section: libdevel
@@ -122,10 +173,10 @@ Architecture: linux-any kfreebsd-any
Multi-Arch: same
Depends: ${misc:Depends},
libsnapd-qt-2-1 (= ${binary:Version}),
- qt6-base-dev,
+ qtbase5-dev,
Breaks: libsnapd-glib-dev (<< 1.46)
Replaces: libsnapd-glib-dev (<< 1.46)
-Description: Qt snapd library (development files)
+Description: Qt snapd library (Qt5 development files)
snapd-glib is a library to allow GLib based applications access to snapd,
the daemon that controls Snaps.
.
@@ -133,7 +184,7 @@ Description: Qt snapd library (development files)
systems, enabling secure distribution of the latest apps and utilities
for cloud, servers, desktops and the internet of things.
.
- snapd-qt is a wrapper library for snapd-glib for Qt applications.
+ snapd-qt is a wrapper library for snapd-glib for Qt5 applications.
.
This package contains the development files.
diff --git a/debian/copyright b/debian/copyright
index 7b6b072..922905f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,8 @@ License: LGPL-2 or LGPL-3
Files: debian/*
Copyright: 2016-2022, Canonical Ltd.
- 2021-2022, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 2021-2025, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 2024-2025, Scarlett Moore <sgmoore at debian.org>
License: GPL-3+
License: GPL-3+
diff --git a/debian/libsnapd-glib-2-1.symbols b/debian/libsnapd-glib-2-1.symbols
new file mode 100644
index 0000000..23a32e5
--- /dev/null
+++ b/debian/libsnapd-glib-2-1.symbols
@@ -0,0 +1,526 @@
+# SymbolsHelper-Confirmed: 1.66 amd64 arm64 armhf i386 ppc64el riscv64 s390x
+libsnapd-glib-2.so.1 libsnapd-glib-2-1 #MINVER#
+* Build-Depends-Package: libsnapd-glib-dev
+ snapd_alias_get_app at Base 1.8
+ snapd_alias_get_app_auto at Base 1.25
+ snapd_alias_get_app_manual at Base 1.25
+ snapd_alias_get_command at Base 1.25
+ snapd_alias_get_name at Base 1.8
+ snapd_alias_get_snap at Base 1.8
+ snapd_alias_get_status at Base 1.8
+ snapd_alias_get_type at Base 1.8
+ snapd_alias_status_get_type at Base 1.8
+ snapd_app_get_active at Base 1.25
+ snapd_app_get_aliases at Base 1.7
+ snapd_app_get_common_id at Base 1.41
+ snapd_app_get_daemon_type at Base 1.9
+ snapd_app_get_desktop_file at Base 1.14
+ snapd_app_get_enabled at Base 1.25
+ snapd_app_get_name at Base 0.1
+ snapd_app_get_snap at Base 1.25
+ snapd_app_get_type at Base 0.1
+ snapd_assertion_get_body at Base 1.8
+ snapd_assertion_get_header at Base 1.8
+ snapd_assertion_get_headers at Base 1.8
+ snapd_assertion_get_signature at Base 1.8
+ snapd_assertion_get_type at Base 1.8
+ snapd_assertion_new at Base 1.8
+ snapd_auth_data_get_discharges at Base 0.1
+ snapd_auth_data_get_macaroon at Base 0.1
+ snapd_auth_data_get_type at Base 0.1
+ snapd_auth_data_new at Base 0.1
+ snapd_autorefresh_change_data_get_refresh_forced at Base 1.65
+ snapd_autorefresh_change_data_get_snap_names at Base 1.65
+ snapd_autorefresh_change_data_get_type at Base 1.65
+ snapd_category_details_get_name at Base 1.64
+ snapd_category_details_get_type at Base 1.64
+ snapd_category_get_featured at Base 1.64
+ snapd_category_get_name at Base 1.64
+ snapd_category_get_type at Base 1.64
+ snapd_change_data_get_type at Base 1.65
+ snapd_change_filter_get_type at Base 1.29
+ snapd_change_get_data at Base 1.65
+ snapd_change_get_error at Base 1.30
+ snapd_change_get_id at Base 1.5
+ snapd_change_get_kind at Base 1.5
+ snapd_change_get_ready at Base 1.5
+ snapd_change_get_ready_time at Base 1.5
+ snapd_change_get_spawn_time at Base 1.5
+ snapd_change_get_status at Base 1.5
+ snapd_change_get_summary at Base 1.5
+ snapd_change_get_tasks at Base 1.5
+ snapd_change_get_type at Base 1.5
+ snapd_channel_get_branch at Base 1.31
+ snapd_channel_get_confinement at Base 1.24
+ snapd_channel_get_epoch at Base 1.24
+ snapd_channel_get_name at Base 1.24
+ snapd_channel_get_released_at at Base 1.46
+ snapd_channel_get_revision at Base 1.24
+ snapd_channel_get_risk at Base 1.31
+ snapd_channel_get_size at Base 1.24
+ snapd_channel_get_track at Base 1.31
+ snapd_channel_get_type at Base 1.24
+ snapd_channel_get_version at Base 1.24
+ snapd_client_abort_change_async at Base 1.30
+ snapd_client_abort_change_finish at Base 1.30
+ snapd_client_abort_change_sync at Base 1.30
+ snapd_client_add_assertions_async at Base 1.8
+ snapd_client_add_assertions_finish at Base 1.8
+ snapd_client_add_assertions_sync at Base 1.8
+ snapd_client_alias_async at Base 1.25
+ snapd_client_alias_finish at Base 1.25
+ snapd_client_alias_sync at Base 1.25
+ snapd_client_buy_async at Base 0.1
+ snapd_client_buy_finish at Base 0.1
+ snapd_client_buy_sync at Base 0.1
+ snapd_client_check_buy_async at Base 1.3
+ snapd_client_check_buy_finish at Base 1.3
+ snapd_client_check_buy_sync at Base 1.3
+ snapd_client_check_themes_async at Base 1.60
+ snapd_client_check_themes_finish at Base 1.60
+ snapd_client_check_themes_sync at Base 1.60
+ snapd_client_connect_async at Base 1.3
+ snapd_client_connect_finish at Base 1.3
+ snapd_client_connect_interface_async at Base 0.1
+ snapd_client_connect_interface_finish at Base 0.1
+ snapd_client_connect_interface_sync at Base 0.1
+ snapd_client_connect_sync at Base 0.1
+ snapd_client_create_user_async at Base 1.3
+ snapd_client_create_user_finish at Base 1.3
+ snapd_client_create_user_sync at Base 1.3
+ snapd_client_create_users_async at Base 1.3
+ snapd_client_create_users_finish at Base 1.3
+ snapd_client_create_users_sync at Base 1.3
+ snapd_client_disable_aliases_async at Base 1.8
+ snapd_client_disable_aliases_finish at Base 1.8
+ snapd_client_disable_aliases_sync at Base 1.8
+ snapd_client_disable_async at Base 0.1
+ snapd_client_disable_finish at Base 0.1
+ snapd_client_disable_sync at Base 0.1
+ snapd_client_disconnect_interface_async at Base 0.1
+ snapd_client_disconnect_interface_finish at Base 0.1
+ snapd_client_disconnect_interface_sync at Base 0.1
+ snapd_client_download_async at Base 1.55
+ snapd_client_download_finish at Base 1.55
+ snapd_client_download_sync at Base 1.55
+ snapd_client_enable_aliases_async at Base 1.8
+ snapd_client_enable_aliases_finish at Base 1.8
+ snapd_client_enable_aliases_sync at Base 1.8
+ snapd_client_enable_async at Base 0.1
+ snapd_client_enable_finish at Base 0.1
+ snapd_client_enable_sync at Base 0.1
+ snapd_client_find_async at Base 0.1
+ snapd_client_find_category_async at Base 1.64
+ snapd_client_find_category_finish at Base 1.64
+ snapd_client_find_category_sync at Base 1.64
+ snapd_client_find_finish at Base 0.1
+ snapd_client_find_refreshable_async at Base 1.5
+ snapd_client_find_refreshable_finish at Base 1.5
+ snapd_client_find_refreshable_sync at Base 1.5
+ snapd_client_find_section_async at Base 1.7
+ snapd_client_find_section_finish at Base 1.7
+ snapd_client_find_section_sync at Base 1.7
+ snapd_client_find_sync at Base 0.1
+ snapd_client_follow_logs_async at Base 1.64
+ snapd_client_follow_logs_finish at Base 1.64
+ snapd_client_follow_logs_sync at Base 1.64
+ snapd_client_get_aliases_async at Base 1.8
+ snapd_client_get_aliases_finish at Base 1.8
+ snapd_client_get_aliases_sync at Base 1.8
+ snapd_client_get_allow_interaction at Base 1.19
+ snapd_client_get_apps2_async at Base 1.45
+ snapd_client_get_apps2_finish at Base 1.45
+ snapd_client_get_apps2_sync at Base 1.45
+ snapd_client_get_apps_async at Base 1.25
+ snapd_client_get_apps_finish at Base 1.25
+ snapd_client_get_apps_sync at Base 1.25
+ snapd_client_get_assertions_async at Base 1.8
+ snapd_client_get_assertions_finish at Base 1.8
+ snapd_client_get_assertions_sync at Base 1.8
+ snapd_client_get_auth_data at Base 0.8
+ snapd_client_get_categories_async at Base 1.64
+ snapd_client_get_categories_finish at Base 1.64
+ snapd_client_get_categories_sync at Base 1.64
+ snapd_client_get_change_async at Base 1.29
+ snapd_client_get_change_finish at Base 1.29
+ snapd_client_get_change_sync at Base 1.29
+ snapd_client_get_changes_async at Base 1.29
+ snapd_client_get_changes_finish at Base 1.29
+ snapd_client_get_changes_sync at Base 1.29
+ snapd_client_get_connections_async at Base 1.48
+ snapd_client_get_connections_finish at Base 1.48
+ snapd_client_get_connections_sync at Base 1.48
+ snapd_client_get_connections2_async at Base 1.49
+ snapd_client_get_connections2_finish at Base 1.49
+ snapd_client_get_connections2_sync at Base 1.49
+ snapd_client_get_icon_async at Base 0.1
+ snapd_client_get_icon_finish at Base 0.1
+ snapd_client_get_icon_sync at Base 0.1
+ snapd_client_get_interfaces2_async at Base 1.48
+ snapd_client_get_interfaces2_finish at Base 1.48
+ snapd_client_get_interfaces2_sync at Base 1.48
+ snapd_client_get_interfaces_async at Base 0.1
+ snapd_client_get_interfaces_finish at Base 0.1
+ snapd_client_get_interfaces_sync at Base 0.1
+ snapd_client_get_logs_async at Base 1.64
+ snapd_client_get_logs_finish at Base 1.64
+ snapd_client_get_logs_sync at Base 1.64
+ snapd_client_get_maintenance at Base 1.45
+ snapd_client_get_model_assertion_async at Base 1.67
+ snapd_client_get_model_assertion_finish at Base 1.67
+ snapd_client_get_model_assertion_sync at Base 1.67
+ snapd_client_get_notices_async at Base 1.65
+ snapd_client_get_notices_finish at Base 1.65
+ snapd_client_get_notices_sync at Base 1.65
+ snapd_client_get_notices_with_filters_async at Base 1.65
+ snapd_client_get_notices_with_filters_finish at Base 1.65
+ snapd_client_get_notices_with_filters_sync at Base 1.65
+ snapd_client_get_sections_async at Base 1.7
+ snapd_client_get_sections_finish at Base 1.7
+ snapd_client_get_sections_sync at Base 1.7
+ snapd_client_get_serial_assertion_async at Base 1.67
+ snapd_client_get_serial_assertion_finish at Base 1.67
+ snapd_client_get_serial_assertion_sync at Base 1.67
+ snapd_client_get_snap_async at Base 1.42
+ snapd_client_get_snap_conf_async at Base 1.48
+ snapd_client_get_snap_conf_finish at Base 1.48
+ snapd_client_get_snap_conf_sync at Base 1.48
+ snapd_client_get_snap_finish at Base 1.42
+ snapd_client_get_snap_sync at Base 1.42
+ snapd_client_get_snaps_async at Base 1.42
+ snapd_client_get_snaps_finish at Base 1.42
+ snapd_client_get_snaps_sync at Base 1.42
+ snapd_client_get_socket_path at Base 1.24
+ snapd_client_get_system_information_async at Base 0.1
+ snapd_client_get_system_information_finish at Base 0.1
+ snapd_client_get_system_information_sync at Base 0.1
+ snapd_client_get_type at Base 0.1
+ snapd_client_get_user_agent at Base 1.16
+ snapd_client_get_users_async at Base 1.26
+ snapd_client_get_users_finish at Base 1.26
+ snapd_client_get_users_sync at Base 1.26
+ snapd_client_install2_async at Base 1.12
+ snapd_client_install2_finish at Base 1.12
+ snapd_client_install2_sync at Base 1.12
+ snapd_client_install_async at Base 0.1
+ snapd_client_install_finish at Base 0.1
+ snapd_client_install_stream_async at Base 1.9
+ snapd_client_install_stream_finish at Base 1.9
+ snapd_client_install_stream_sync at Base 1.9
+ snapd_client_install_sync at Base 0.1
+ snapd_client_install_themes_async at Base 1.60
+ snapd_client_install_themes_finish at Base 1.60
+ snapd_client_install_themes_sync at Base 1.60
+ snapd_client_list_async at Base 0.1
+ snapd_client_list_finish at Base 0.1
+ snapd_client_list_one_async at Base 0.1
+ snapd_client_list_one_finish at Base 0.1
+ snapd_client_list_one_sync at Base 0.1
+ snapd_client_list_sync at Base 0.1
+ snapd_client_login2_async at Base 1.26
+ snapd_client_login2_finish at Base 1.26
+ snapd_client_login2_sync at Base 1.26
+ snapd_client_login_async at Base 0.1
+ snapd_client_login_finish at Base 0.1
+ snapd_client_login_sync at Base 0.1
+ snapd_client_logout_async at Base 1.55
+ snapd_client_logout_finish at Base 1.55
+ snapd_client_logout_sync at Base 1.55
+ snapd_client_new at Base 0.1
+ snapd_client_new_from_socket at Base 1.5
+ snapd_client_notices_set_after_notice at Base 1.66
+ snapd_client_notices_set_since_nanoseconds at Base 1.66
+ snapd_client_prefer_async at Base 1.25
+ snapd_client_prefer_finish at Base 1.25
+ snapd_client_prefer_sync at Base 1.25
+ snapd_client_refresh_all_async at Base 1.5
+ snapd_client_refresh_all_finish at Base 1.5
+ snapd_client_refresh_all_sync at Base 1.5
+ snapd_client_refresh_async at Base 0.1
+ snapd_client_refresh_finish at Base 0.1
+ snapd_client_refresh_sync at Base 0.1
+ snapd_client_remove_async at Base 0.1
+ snapd_client_remove_finish at Base 0.1
+ snapd_client_remove_sync at Base 0.1
+ snapd_client_remove2_async at Base 1.50
+ snapd_client_remove2_finish at Base 1.50
+ snapd_client_remove2_sync at Base 1.50
+ snapd_client_reset_aliases_async at Base 1.8
+ snapd_client_reset_aliases_finish at Base 1.8
+ snapd_client_reset_aliases_sync at Base 1.8
+ snapd_client_run_snapctl2_async at Base 1.59
+ snapd_client_run_snapctl2_finish at Base 1.59
+ snapd_client_run_snapctl2_sync at Base 1.59
+ snapd_client_run_snapctl_async at Base 1.8
+ snapd_client_run_snapctl_finish at Base 1.8
+ snapd_client_run_snapctl_sync at Base 1.8
+ snapd_client_set_allow_interaction at Base 1.19
+ snapd_client_set_auth_data at Base 0.8
+ snapd_client_set_snap_conf_async at Base 1.48
+ snapd_client_set_snap_conf_finish at Base 1.48
+ snapd_client_set_snap_conf_sync at Base 1.48
+ snapd_client_set_socket_path at Base 1.24
+ snapd_client_set_user_agent at Base 1.16
+ snapd_client_switch_async at Base 1.26
+ snapd_client_switch_finish at Base 1.26
+ snapd_client_switch_sync at Base 1.26
+ snapd_client_try_async at Base 1.9
+ snapd_client_try_finish at Base 1.9
+ snapd_client_try_sync at Base 1.9
+ snapd_client_unalias_async at Base 1.25
+ snapd_client_unalias_finish at Base 1.25
+ snapd_client_unalias_sync at Base 1.25
+ snapd_confinement_get_type at Base 0.1
+ snapd_connection_get_gadget at Base 1.48
+ snapd_connection_get_interface at Base 1.48
+ snapd_connection_get_manual at Base 1.48
+ snapd_connection_get_name at Base 0.1
+ snapd_connection_get_plug at Base 1.48
+ snapd_connection_get_plug_attribute at Base 1.48
+ snapd_connection_get_plug_attribute_names at Base 1.48
+ snapd_connection_get_slot at Base 1.48
+ snapd_connection_get_slot_attribute at Base 1.48
+ snapd_connection_get_slot_attribute_names at Base 1.48
+ snapd_connection_get_snap at Base 0.1
+ snapd_connection_get_type at Base 0.1
+ snapd_connection_has_plug_attribute at Base 1.48
+ snapd_connection_has_slot_attribute at Base 1.48
+ snapd_create_user_flags_get_type at Base 1.3
+ snapd_daemon_type_get_type at Base 1.9
+ snapd_error_get_type at Base 0.9
+ snapd_error_quark at Base 0.9
+ snapd_find_flags_get_type at Base 0.1
+ snapd_get_aliases_get_type at Base 1.25
+ snapd_get_apps_flags_get_type at Base 1.25
+ snapd_get_apps_get_type at Base 1.25
+ snapd_get_assertions_get_type at Base 1.25
+ snapd_get_buy_ready_get_type at Base 1.25
+ snapd_get_categories_get_type at Base 1.64
+ snapd_get_change_get_type at Base 1.25
+ snapd_get_changes_get_type at Base 1.29
+ snapd_get_connections_flags_get_type at Base 1.49
+ snapd_get_connections_get_type at Base 1.48
+ snapd_get_find_get_type at Base 1.25
+ snapd_get_icon_get_type at Base 1.25
+ snapd_get_interfaces_flags_get_type at Base 1.48
+ snapd_get_interfaces_get_type at Base 1.25
+ snapd_get_interfaces_legacy_get_type at Base 1.48
+ snapd_get_logs_get_type at Base 1.64
+ snapd_get_model_get_type at Base 1.67
+ snapd_get_model_serial_get_type at Base 1.67
+ snapd_get_notices_get_type at Base 1.65
+ snapd_get_sections_get_type at Base 1.25
+ snapd_get_snap_conf_get_type at Base 1.48
+ snapd_get_snap_get_type at Base 1.25
+ snapd_get_snaps_flags_get_type at Base 1.42
+ snapd_get_snaps_get_type at Base 1.25
+ snapd_get_system_info_get_type at Base 1.25
+ snapd_get_themes_get_type at Base 1.60
+ snapd_get_users_get_type at Base 1.26
+ snapd_icon_get_data at Base 0.1
+ snapd_icon_get_mime_type at Base 0.1
+ snapd_icon_get_type at Base 0.1
+ snapd_install_flags_get_type at Base 1.9
+ snapd_interface_get_doc_url at Base 1.48
+ snapd_interface_get_name at Base 1.48
+ snapd_interface_get_plugs at Base 1.48
+ snapd_interface_get_slots at Base 1.48
+ snapd_interface_get_summary at Base 1.48
+ snapd_interface_get_type at Base 1.48
+ snapd_interface_make_label at Base 1.58
+ snapd_log_get_message at Base 1.64
+ snapd_log_get_pid at Base 1.64
+ snapd_log_get_sid at Base 1.64
+ snapd_log_get_timestamp at Base 1.64
+ snapd_log_get_type at Base 1.64
+ snapd_login_async at Base 0.9
+ snapd_login_finish at Base 0.9
+ snapd_login_sync at Base 0.9
+ snapd_maintenance_get_kind at Base 1.45
+ snapd_maintenance_get_message at Base 1.45
+ snapd_maintenance_get_type at Base 1.45
+ snapd_maintenance_kind_get_type at Base 1.45
+ snapd_markdown_node_get_children at Base 1.48
+ snapd_markdown_node_get_node_type at Base 1.48
+ snapd_markdown_node_get_text at Base 1.48
+ snapd_markdown_node_get_type at Base 1.48
+ snapd_markdown_node_type_get_type at Base 1.48
+ snapd_markdown_parser_get_preserve_whitespace at Base 1.48
+ snapd_markdown_parser_get_type at Base 1.48
+ snapd_markdown_parser_new at Base 1.48
+ snapd_markdown_parser_parse at Base 1.48
+ snapd_markdown_parser_set_preserve_whitespace at Base 1.48
+#MISSING: 1.67# snapd_markdown_version_get_type at Base 1.48
+ snapd_media_get_height at Base 1.45
+ snapd_media_get_media_type at Base 1.45
+ snapd_media_get_type at Base 1.45
+ snapd_media_get_url at Base 1.45
+ snapd_media_get_width at Base 1.45
+ snapd_media_new at Base 1.45
+ snapd_notice_compare_last_occurred at Base 1.66
+ snapd_notice_get_expire_after at Base 1.65
+ snapd_notice_get_first_occurred2 at Base 1.66
+ snapd_notice_get_first_occurred at Base 1.65
+ snapd_notice_get_id at Base 1.65
+ snapd_notice_get_key at Base 1.65
+ snapd_notice_get_last_data2 at Base 1.66
+ snapd_notice_get_last_data at Base 1.65
+ snapd_notice_get_last_occurred2 at Base 1.66
+ snapd_notice_get_last_occurred at Base 1.65
+ snapd_notice_get_last_occurred_nanoseconds at Base 1.66
+ snapd_notice_get_last_repeated2 at Base 1.66
+ snapd_notice_get_last_repeated at Base 1.65
+ snapd_notice_get_notice_type at Base 1.65
+ snapd_notice_get_occurrences at Base 1.65
+ snapd_notice_get_repeat_after at Base 1.65
+ snapd_notice_get_type at Base 1.65
+ snapd_notice_get_user_id at Base 1.65
+ snapd_notice_type_get_type at Base 1.65
+ snapd_notices_monitor_get_type at Base 1.66
+ snapd_notices_monitor_new at Base 1.66
+ snapd_notices_monitor_new_with_client at Base 1.66
+ snapd_notices_monitor_start at Base 1.66
+ snapd_notices_monitor_stop at Base 1.66
+ snapd_plug_get_attribute at Base 1.3
+ snapd_plug_get_attribute_names at Base 1.3
+ snapd_plug_get_connected_slots at Base 1.48
+ snapd_plug_get_connections at Base 0.1
+ snapd_plug_get_interface at Base 0.1
+ snapd_plug_get_label at Base 0.1
+ snapd_plug_get_name at Base 0.1
+ snapd_plug_get_snap at Base 0.1
+ snapd_plug_get_type at Base 0.1
+ snapd_plug_has_attribute at Base 1.3
+ snapd_plug_ref_get_plug at Base 1.48
+ snapd_plug_ref_get_snap at Base 1.48
+ snapd_plug_ref_get_type at Base 1.48
+ snapd_post_aliases_get_type at Base 1.25
+ snapd_post_assertions_get_type at Base 1.25
+ snapd_post_buy_get_type at Base 1.25
+ snapd_post_change_get_type at Base 1.25
+ snapd_post_create_user_get_type at Base 1.25
+ snapd_post_create_users_get_type at Base 1.25
+ snapd_post_download_get_type at Base 1.55
+ snapd_post_interfaces_get_type at Base 1.25
+ snapd_post_login_get_type at Base 1.25
+ snapd_post_logout_get_type at Base 1.55
+ snapd_post_snap_get_type at Base 1.25
+ snapd_post_snap_stream_get_type at Base 1.25
+ snapd_post_snap_try_get_type at Base 1.25
+ snapd_post_snapctl_get_type at Base 1.25
+ snapd_post_snaps_get_type at Base 1.25
+ snapd_post_themes_get_type at Base 1.60
+ snapd_price_get_amount at Base 0.1
+ snapd_price_get_currency at Base 0.1
+ snapd_price_get_type at Base 0.1
+ snapd_publisher_validation_get_type at Base 1.42
+ snapd_put_snap_conf_get_type at Base 1.48
+ snapd_remove_flags_get_type at Base 1.50
+ snapd_request_async_get_type at Base 1.25
+ snapd_request_get_type at Base 0.7
+ snapd_screenshot_get_height at Base 1.0
+ snapd_screenshot_get_type at Base 1.0
+ snapd_screenshot_get_url at Base 1.0
+ snapd_screenshot_get_width at Base 1.0
+ snapd_screenshot_new at Base 1.0
+ snapd_slot_get_attribute at Base 1.3
+ snapd_slot_get_attribute_names at Base 1.3
+ snapd_slot_get_connected_plugs at Base 1.48
+ snapd_slot_get_connections at Base 0.1
+ snapd_slot_get_interface at Base 0.1
+ snapd_slot_get_label at Base 0.1
+ snapd_slot_get_name at Base 0.1
+ snapd_slot_get_snap at Base 0.1
+ snapd_slot_get_type at Base 0.1
+ snapd_slot_has_attribute at Base 1.3
+ snapd_slot_ref_get_slot at Base 1.48
+ snapd_slot_ref_get_snap at Base 1.48
+ snapd_slot_ref_get_type at Base 1.48
+ snapd_snap_get_apps at Base 0.1
+ snapd_snap_get_base at Base 1.45
+ snapd_snap_get_broken at Base 1.25
+ snapd_snap_get_categories at Base 1.64
+ snapd_snap_get_channel at Base 0.1
+ snapd_snap_get_channels at Base 1.24
+ snapd_snap_get_common_ids at Base 0.41
+ snapd_snap_get_confinement at Base 0.1
+ snapd_snap_get_contact at Base 1.13
+ snapd_snap_get_description at Base 0.1
+ snapd_snap_get_developer at Base 0.1
+ snapd_snap_get_devmode at Base 0.1
+ snapd_snap_get_download_size at Base 0.1
+ snapd_snap_get_hold at Base 1.64
+ snapd_snap_get_icon at Base 0.1
+ snapd_snap_get_id at Base 0.1
+ snapd_snap_get_install_date at Base 0.1
+ snapd_snap_get_installed_size at Base 0.1
+ snapd_snap_get_jailmode at Base 1.8
+ snapd_snap_get_license at Base 1.19
+ snapd_snap_get_media at Base 1.45
+ snapd_snap_get_mounted_from at Base 1.45
+ snapd_snap_get_name at Base 0.1
+ snapd_snap_get_prices at Base 0.1
+ snapd_snap_get_private at Base 0.1
+ snapd_snap_get_proceed_time at Base 1.65
+ snapd_snap_get_publisher_display_name at Base 1.42
+ snapd_snap_get_publisher_id at Base 1.42
+ snapd_snap_get_publisher_username at Base 1.42
+ snapd_snap_get_publisher_validation at Base 1.42
+ snapd_snap_get_revision at Base 0.1
+ snapd_snap_get_screenshots at Base 1.0
+ snapd_snap_get_snap_type at Base 0.1
+ snapd_snap_get_status at Base 0.1
+ snapd_snap_get_store_url at Base 1.60
+ snapd_snap_get_summary at Base 0.1
+ snapd_snap_get_title at Base 1.14
+ snapd_snap_get_tracking_channel at Base 1.7
+ snapd_snap_get_tracks at Base 1.24
+ snapd_snap_get_trymode at Base 0.1
+ snapd_snap_get_type at Base 0.1
+ snapd_snap_get_version at Base 0.1
+ snapd_snap_get_website at Base 1.50
+ snapd_snap_match_channel at Base 1.24
+ snapd_snap_status_get_type at Base 0.1
+ snapd_snap_type_get_type at Base 0.1
+ snapd_system_confinement_get_type at Base 1.14
+ snapd_system_information_get_architecture at Base 1.64
+ snapd_system_information_get_binaries_directory at Base 1.11
+ snapd_system_information_get_build_id at Base 1.40
+ snapd_system_information_get_confinement at Base 1.14
+ snapd_system_information_get_managed at Base 1.7
+ snapd_system_information_get_mount_directory at Base 1.11
+ snapd_system_information_get_on_classic at Base 0.1
+ snapd_system_information_get_os_id at Base 0.1
+ snapd_system_information_get_kernel_version at Base 1.11
+ snapd_system_information_get_os_version at Base 0.1
+ snapd_system_information_get_refresh_hold at Base 1.42
+ snapd_system_information_get_refresh_last at Base 1.42
+ snapd_system_information_get_refresh_next at Base 1.42
+ snapd_system_information_get_refresh_schedule at Base 1.42
+ snapd_system_information_get_refresh_timer at Base 1.42
+ snapd_system_information_get_sandbox_features at Base 1.42
+ snapd_system_information_get_series at Base 0.1
+ snapd_system_information_get_store at Base 1.7
+ snapd_system_information_get_type at Base 0.1
+ snapd_system_information_get_version at Base 0.1
+ snapd_task_data_get_affected_snaps at Base 1.66
+ snapd_task_data_get_type at Base 1.66
+ snapd_task_get_data at Base 1.66
+ snapd_task_get_id at Base 0.4
+ snapd_task_get_kind at Base 0.4
+ snapd_task_get_progress_done at Base 0.4
+ snapd_task_get_progress_label at Base 1.5
+ snapd_task_get_progress_total at Base 0.4
+ snapd_task_get_ready at Base 0.4
+ snapd_task_get_ready_time at Base 0.7
+ snapd_task_get_spawn_time at Base 0.4
+ snapd_task_get_status at Base 0.4
+ snapd_task_get_summary at Base 0.4
+ snapd_task_get_type at Base 0.4
+ snapd_theme_status_get_type at Base 1.60
+ snapd_user_information_get_auth_data at Base 1.26
+ snapd_user_information_get_email at Base 1.26
+ snapd_user_information_get_id at Base 1.26
+ snapd_user_information_get_ssh_keys at Base 1.3
+ snapd_user_information_get_type at Base 1.3
+ snapd_user_information_get_username at Base 1.3
diff --git a/debian/libsnapd-glib-dev.install b/debian/libsnapd-glib-dev.install
index 267924d..8ef08e6 100644
--- a/debian/libsnapd-glib-dev.install
+++ b/debian/libsnapd-glib-dev.install
@@ -1,6 +1,6 @@
-usr/include/snapd-glib-2
+usr/include/*/snapd-glib-2
usr/lib/*/pkgconfig/snapd-glib-2.pc
-usr/lib/*/libsnapd-glib-2.so
+usr/lib/*/libsnapd-glib*.so
usr/share/gir-1.0
usr/share/doc/libsnapd-glib-dev/html
usr/share/vala
diff --git a/debian/libsnapd-qt-dev.install b/debian/libsnapd-qt-dev.install
index fc82747..db0fafa 100644
--- a/debian/libsnapd-qt-dev.install
+++ b/debian/libsnapd-qt-dev.install
@@ -1,4 +1,4 @@
-usr/include/snapd-qt-2/
-usr/lib/*/cmake/
+usr/include/*/qt5/snapd-qt-2
+usr/lib/*/cmake/Snapd-2/
usr/lib/*/pkgconfig/snapd-qt-2.pc
usr/lib/*/libsnapd-qt-2.so
diff --git a/debian/libsnapd-qt6-2-1.install b/debian/libsnapd-qt6-2-1.install
new file mode 100644
index 0000000..8f334a5
--- /dev/null
+++ b/debian/libsnapd-qt6-2-1.install
@@ -0,0 +1 @@
+usr/lib/*/libsnapd-qt6-2.so.*
diff --git a/debian/libsnapd-qt6-dev.install b/debian/libsnapd-qt6-dev.install
new file mode 100644
index 0000000..bf2c052
--- /dev/null
+++ b/debian/libsnapd-qt6-dev.install
@@ -0,0 +1,4 @@
+usr/include/*/qt6/snapd-qt-2
+usr/lib/*/cmake/SnapdQt6-2/
+usr/lib/*/pkgconfig/snapd-qt6-2.pc
+usr/lib/*/libsnapd-qt6-2.so
diff --git a/debian/patches/1001_support-qt5+qt6-dual-builds.patch b/debian/patches/1001_support-qt5+qt6-dual-builds.patch
new file mode 100644
index 0000000..de6229d
--- /dev/null
+++ b/debian/patches/1001_support-qt5+qt6-dual-builds.patch
@@ -0,0 +1,108 @@
+Description: Support dually building against Qt5 and Qt6.
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Forwarded: pending
+
+--- a/snapd-qt/meson.build
++++ b/snapd-qt/meson.build
+@@ -6,9 +6,12 @@
+ qt_min_version = '5.9.5'
+ qt_version = 'qt5'
+ qt_core_camel = 'Qt5Core'
+- description = 'Snapd Qt'
++ description = 'Snapd Qt5'
+ cmake_base_name = 'SnapdQt5'
++ cmake_name = 'Snapd'
++ cmake_name_dir = 'Snapd'
+ library_name = 'snapd-qt'
++ include_name = 'snapd-qt'
+ qt_core_dep = dependency ('qt5', modules: [ 'Core' ])
+ qt_network_dep = dependency ('qt5', modules: [ 'Network' ])
+ qml_dep = dependency ('qt5', modules: [ 'Qml' ])
+@@ -18,9 +21,12 @@
+ qt_min_version = '6.2.4'
+ qt_version = 'qt6'
+ qt_core_camel = 'Qt6Core'
+- description = 'Snapd Qt'
++ description = 'Snapd Qt6'
+ cmake_base_name = 'SnapdQt6'
+- library_name = 'snapd-qt'
++ cmake_name = 'SnapdQt6'
++ cmake_name_dir = 'SnapdQt6'
++ library_name = 'snapd-qt6'
++ include_name = 'snapd-qt'
+ qt6_core_dep = dependency ('qt6', modules: [ 'Core' ])
+ qt6_network_dep = dependency ('qt6', modules: [ 'Network' ])
+ qml_dep = dependency ('qt6', modules: [ 'Qml' ])
+@@ -29,6 +35,8 @@
+ qt_name = 'Snapd'
+ if not get_option('soup2')
+ library_name += '-2'
++ include_name += '-2'
++ cmake_name_dir += '-2'
+ qt_name += '2'
+ endif
+
+@@ -40,9 +48,9 @@
+ include_type: 'system'
+ )
+
+-install_header_dir = join_paths (includedir, library_name, 'Snapd')
++install_header_dir = join_paths (includedir, f'@qt_version@', include_name, 'Snapd')
+ qml_dir = join_paths (libdir, f'@qt_version@', 'qml', f'@qt_name@')
+-cmake_dir = join_paths (libdir, 'cmake', qt_name)
++cmake_dir = join_paths (libdir, 'cmake', cmake_name_dir)
+
+ source_cpp = [
+ 'alias.cpp',
+@@ -176,10 +184,11 @@
+ pc_required_qt=f'@qt_core_camel@'
+ pc.generate (libraries: snapd_qt_lib,
+ filebase: library_name,
+- name: 'Snapd Qt',
++ name: f'@description@',
+ description: 'Library for accessing snapd',
+ version: meson.project_version (),
+- requires: pc_required_qt,)
++ requires: pc_required_qt,
++ subdirs: join_paths (f'@qt_version@', include_name),)
+
+ install_data ('qmldir',
+ install_dir: qml_dir)
+@@ -189,11 +198,13 @@
+ cmake_conf.set ('includedir', includedir)
+ cmake_conf.set ('version', meson.project_version ())
+ cmake_conf.set ('library_name', library_name)
++cmake_conf.set ('include_name', include_name)
++cmake_conf.set ('qt_version', qt_version)
+ cmake_file = configure_file (input: f'@cmake_base_name at Config.cmake.in',
+- output: 'SnapdConfig.cmake',
++ output: f'@cmake_name at Config.cmake',
+ configuration: cmake_conf)
+ cmake_version_file = configure_file (input: f'@cmake_base_name at ConfigVersion.cmake.in',
+- output: 'SnapdConfigVersion.cmake',
++ output: f'@cmake_name at ConfigVersion.cmake',
+ configuration: cmake_conf)
+ install_data (cmake_file, cmake_version_file,
+ install_dir: cmake_dir)
+--- a/snapd-qt/SnapdQt5Config.cmake.in
++++ b/snapd-qt/SnapdQt5Config.cmake.in
+@@ -2,7 +2,7 @@
+ # SNAPD_LIBRARIES - The libraries needed to use snapd-qt
+
+ set(SNAPD_LIBRARIES @libdir@/lib at library_name@.so)
+-set(SNAPD_INCLUDE_DIRS @includedir@/@library_name@/)
++set(SNAPD_INCLUDE_DIRS @includedir@/@qt_version@/@include_name@/)
+
+ add_library(Snapd::Core SHARED IMPORTED)
+ set_target_properties(Snapd::Core PROPERTIES
+--- a/snapd-qt/SnapdQt6Config.cmake.in
++++ b/snapd-qt/SnapdQt6Config.cmake.in
+@@ -2,7 +2,7 @@
+ # SNAPD_LIBRARIES - The libraries needed to use snapd-qt
+
+ set(SNAPD_LIBRARIES @libdir@/lib at library_name@.so)
+-set(SNAPD_INCLUDE_DIRS @includedir@/@library_name@/)
++set(SNAPD_INCLUDE_DIRS @includedir@/@qt_version@/@include_name@/)
+
+ add_library(Snapd::Core SHARED IMPORTED)
+ set_target_properties(Snapd::Core PROPERTIES
diff --git a/debian/patches/2001_install-docs-to-html-subfolder.patch b/debian/patches/2001_install-docs-to-html-subfolder.patch
new file mode 100644
index 0000000..09153b0
--- /dev/null
+++ b/debian/patches/2001_install-docs-to-html-subfolder.patch
@@ -0,0 +1,19 @@
+Description: Install doc files to /usr/share/doc/libsnapd-glib-dev/html
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Forwarded: no, Debian-specific
+
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -8,9 +8,9 @@
+ configuration: doc_conf)
+ custom_target('documentation',
+ depends: snapd_glib_gir,
+- command : [docgen, 'generate', '--config', settings_file, '--no-namespace-dir', '--output-dir', join_paths('@OUTDIR@', 'snapd-glib'), join_paths (meson.project_build_root (), 'snapd-glib', 'Snapd-2.gir')],
+- output: 'snapd-glib',
++ command : [docgen, 'generate', '--config', settings_file, '--no-namespace-dir', '--output-dir', join_paths('@OUTDIR@', 'html'), join_paths (meson.project_build_root (), 'snapd-glib', 'Snapd-2.gir')],
++ output: 'html',
+ build_by_default: true,
+ install: true,
+- install_dir: get_option('prefix') / get_option('datadir') / 'doc',) # installs to PREFIX/share/doc/snapd-glib
++ install_dir: get_option('prefix') / get_option('datadir') / 'doc' / 'libsnapd-glib-dev',) # installs to PREFIX/share/doc/libsnapd-glib-dev/html
+ endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bb24d52
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+1001_support-qt5+qt6-dual-builds.patch
+2001_install-docs-to-html-subfolder.patch
diff --git a/debian/qml-module-snapd.install b/debian/qml-module-snapd.install
new file mode 100644
index 0000000..0607edc
--- /dev/null
+++ b/debian/qml-module-snapd.install
@@ -0,0 +1,2 @@
+usr/lib/*/qt5/qml/Snapd2/*.so
+usr/lib/*/qt5/qml/Snapd2/qmldir
diff --git a/debian/qml6-module-snapd.install b/debian/qml6-module-snapd.install
index 5fcb189..548b8d4 100644
--- a/debian/qml6-module-snapd.install
+++ b/debian/qml6-module-snapd.install
@@ -1,2 +1,2 @@
+usr/lib/*/qt6/qml/Snapd2/*.so
usr/lib/*/qt6/qml/Snapd2/qmldir
-usr/lib/*/qt6/qml/Snapd2/libSnapd2.so
diff --git a/debian/rules b/debian/rules
index 80df30d..4e38fa2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,72 @@
#!/usr/bin/make -f
+NULL =
+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
%:
dh $@
+override_dh_auto_configure:
+ dh_auto_configure --builddirectory=build-qt6 \
+ --buildsystem=meson \
+ -- \
+ -Dqt6=true \
+ -Dqt5=false \
+ -Ddocs=true \
+ -Dexamples=true \
+ -Dintrospection=true \
+ -Dvala-bindings=true \
+ -Dincludedir=/usr/include/$(DEB_HOST_MULTIARCH)
+ $(meson_opts) \
+ $(NULL)
+ dh_auto_configure --builddirectory=build-qt5 \
+ --buildsystem=meson \
+ -- \
+ -Dqt6=false \
+ -Dqt5=true \
+ -Ddocs=false \
+ -Dexamples=false \
+ -Dintrospection=false \
+ -Dvala-bindings=false \
+ -Dincludedir=/usr/include/$(DEB_HOST_MULTIARCH)
+ $(meson_opts) \
+ $(NULL)
+
+override_dh_auto_build:
+ dh_auto_build --builddirectory=build-qt6 \
+ --buildsystem=meson \
+ $(NULL)
+ dh_auto_build --builddirectory=build-qt5 \
+ --buildsystem=meson \
+ $(NULL)
+
override_dh_auto_test:
- dh_auto_test --no-parallel
+ dh_auto_test --builddirectory=build-qt6 \
+ --buildsystem=meson \
+ --no-parallel \
+ $(NULL)
+ dh_auto_test --builddirectory=build-qt5 \
+ --buildsystem=meson \
+ --no-parallel \
+ $(NULL)
+
+override_dh_auto_install:
+ dh_auto_install --builddirectory=build-qt6 \
+ --buildsystem=meson \
+ $(NULL)
+ dh_auto_install --builddirectory=build-qt5 \
+ --buildsystem=meson \
+ $(NULL)
-execute_before_dh_install:
- mkdir -p debian/tmp/usr/share/doc/libsnapd-glib-dev/
- mv debian/tmp/usr/share/gtk-doc/html/snapd-glib debian/tmp/usr/share/doc/libsnapd-glib-dev/html
+override_dh_auto_clean:
+ dh_auto_clean --builddirectory=build-qt6 \
+ --buildsystem=meson \
+ $(NULL)
+ dh_auto_clean --builddirectory=build-qt5 \
+ --buildsystem=meson \
+ $(NULL)
get-orig-source:
- uscan --noconf --force-download --rename --download-current-version --destdir=..
\ No newline at end of file
+ uscan --noconf --force-download --rename --download-current-version --destdir=..
More information about the Neon-commits
mailing list