summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS67
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog51
-rw-r--r--NEWS65
-rw-r--r--debian/changelog4
5 files changed, 124 insertions, 65 deletions
diff --git a/AUTHORS b/AUTHORS
index 43cf36c..62927ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,34 +1,33 @@
-Albert Astals <albert.astals@canonical.com>
-Albert Astals Cid <albert.astals@canonical.com>
-Alberto Mardegan <alberto.mardegan@canonical.com>
-Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
-Bileto Bot <ci-train-bot@canonical.com>
-Bill Filler <bill.filler@canonical.com>
-Charles Kerr <charles.kerr@canonical.com>
-CI Train Bot <${CITRAIN_USER}@canonical.com>
-CI Train Bot <ci-train-bot@canonical.com>
-Dalton Durst <dalton@ubports.com>
-Florian Boucault <florian.boucault@canonical.com>
-Florian Leeber <flori@bin.org.in>
-Gustavo Pichorim Boiko <gustavo.boiko@canonical.com>
-Ivan Semkin <ivan@semkin.ru>
-Lars Uebernickel <lars.uebernickel@canonical.com>
-Luca Weiss <luca@z3ntu.xyz>
-Lukáš Tinkl <lukas.tinkl@canonical.com>
-Marco Trevisan (Treviño) <mail@3v1n0.net>
-Marcus Tomlinson <marcus.tomlinson@canonical.com>
-Marius Gripsgard <mariogrip@ubuntu.com>
-Marius Gripsgard <marius@ubports.com>
-Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
-Michael Terry <michael.terry@canonical.com>
-Michał Sawicz <michal.sawicz@canonical.com>
-Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Mirco Müller <mirco.mueller@ubuntu.com>
-Nick Dedekind <nicholas.dedekind@gmail.com>
-Nick Dedekind <nick.dedekind@canonical.com>
-Olivier Tilloy <olivier.tilloy@canonical.com>
-Pete Woods <pete.woods@canonical.com>
-Ratchanan Srirattanamet <ratchanan@ubports.com>
-Renato Araujo Oliveira Filho <renato.filho@canonical.com>
-Ricardo Mendoza <ricardo.mendoza@canonical.com>
-Robert Tari <robert@tari.in>
+Albert Astals
+Albert Astals Cid
+Alberto Mardegan
+Antti Kaijanmäki
+Aurelien Jarno
+Bill Filler
+Charles Kerr
+Dalton Durst
+Florian Boucault
+Florian Leeber
+Gustavo Pichorim Boiko
+Ivan Semkin
+Jeremy Bícha
+Lars Uebernickel
+Luca Weiss
+Lukáš Tinkl
+Marco Trevisan (Treviño)
+Marcus Tomlinson
+Marius Gripsgard
+Mathieu Trudel-Lapierre
+Michael Terry
+Michał Sawicz
+Mike Gabriel
+Mirco Müller
+Nick Dedekind
+Olivier Tilloy
+OPNA2608
+Pete Woods
+Ratchanan Srirattanamet
+Renato Araujo Oliveira Filho
+Ricardo Mendoza
+Robert Tari
+Sergey Chupligin
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a816d4d..da52521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.13)
-project (qmenumodel VERSION 0.9.2)
+project (qmenumodel VERSION 0.10.0)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
diff --git a/ChangeLog b/ChangeLog
index 872a160..911f5a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,55 @@
+2026-06-11 Mike Gabriel
+
+ * Release 0.10.0 (HEAD -> main, tag: 0.10.0)
+ * d/changelog: prepare release v0.10.0 (057eb26)
+ * d/rules: Enable unit tests for Qt 5 + Qt 6 (727a02d)
+ * debian/: Build Qt 6 variant alongside Qt 5 variant (3ab0271)
+ * libqmenumodel/src/CMakeLists.txt: Ship Qt 5 and Qt 6 includes in
+ different paths; eases packaging (2c34f4e)
+ * libqmenumodel/QMenuModel/CMakeLists.txt: Omit API version from
+ QMenuModel module name when building Qt 6 variant
+ (710e67e)
+ * libqmenumodel/: White-space fixes (d4dc874)
+ * .gitignore: Don't ignore files that stem from DEB packaging.
+ (0a00214)
+ * Merge branch 'OPNA2608-port-qt6' (d20734d)
+
+2026-03-26 OPNA2608
+
+ * {libqmenumodel/src,tests/client}: Fix warnings with Qt6 (5f421cc)
+ * libqmenumodel/src: Fix build errors with Qt6 (07e7bde)
+ * treewide: Allow Qt6 build to be configured via CMake (f619b88)
+
+2026-06-11 Mike Gabriel
+
+ * Revert "src/gtk Update gtk part to version 3.24.8" (f33cda5)
+ * Merge branch 'jbicha-personal/jbicha/increase-test-timeout'
+ (4fd46b9)
+
+2024-11-02 Aurelien Jarno
+
+ * tests: Increase test timeout (c3f100c)
+
+2026-06-11 Mike Gabriel
+
+ * Merge branch 'jbicha-personal/jbicha/debian-sync-20260403'
+ (187d02d)
+
+2026-04-03 Jeremy Bícha
+
+ * debian: Sync with Debian (ed50241)
+
+2023-08-24 Mike Gabriel
+
+ * Merge branch 'neochapay-update_gtk' (c8b25f7)
+
+2022-06-14 Sergey Chupligin
+
+ * src/gtk Update gtk part to version 3.24.8 (ceaa2df)
+
2023-08-24 Mike Gabriel
- * release 0.9.2 (HEAD -> main, tag: 0.9.2)
+ * release 0.9.2 (017363f) (tag: 0.9.2)
2023-08-07 Mike Gabriel
diff --git a/NEWS b/NEWS
index 5abd1d4..a2b04dd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,44 +1,55 @@
-Overview of changes in ayatana-indicator-session 0.9.2
+Overview of changes in qmenumodel 0.10.0
- * tests/client/CMakeLists.txt: Only enable coverage reporting if the
+ - treewide: Allow Qt6 build to be configured via CMake.
+ - libqmenumodel/src: Fix build errors with Qt6.
+ - {libqmenumodel/src,tests/client}: Fix warnings with Qt6.
+ - libqmenumodel/QMenuModel/CMakeLists.txt: Omit API version from
+ QMenuModel module name when building Qt 6 variant.
+ - libqmenumodel/src/CMakeLists.txt: Ship Qt 5 and Qt 6 includes in
+ different paths; eases packaging.
+ - tests: Increase test timeout.
+
+Overview of changes in qmenumodel 0.9.2
+
+ - tests/client/CMakeLists.txt: Only enable coverage reporting if the
flag is set for it.
- * ayatanamenumodel: add support for {u,}int of all sizes.
- * Fix build errors.
+ - ayatanamenumodel: add support for {u,}int of all sizes.
+ - Fix build errors.
-Overview of changes in ayatana-indicator-session 0.9.1
+Overview of changes in qmenumodel 0.9.1
- * CMakeLists.txt: Rewrite and enable Ayatana-style options.
- * Fix naming of AyatanaMenuModel qml type.
- * Fix versioning in examples and tests.
- * Make the qmltests test imports, at least.
- * Fix all build warnings.
- * CMakeLists.txt: Clean up compilation flags.
+ - CMakeLists.txt: Rewrite and enable Ayatana-style options.
+ - Fix naming of AyatanaMenuModel qml type.
+ - Fix versioning in examples and tests.
+ - Make the qmltests test imports, at least.
+ - Fix all build warnings.
+ - CMakeLists.txt: Clean up compilation flags.
-Overview of changes in ayatana-indicator-session 0.9.0
+Overview of changes in qmenumodel 0.9.0
- * Rename Unity* symbols.
- * Rename unity* source files.
- * libqmenumodel/src/CMakeLists.txt: Bump the SOVERSION of
+ - Rename Unity* symbols.
+ - Rename unity* source files.
+ - libqmenumodel/src/CMakeLists.txt: Bump the SOVERSION of
libqmenumodel.
- * Bump QMenuModel QML module to 1.0.
- * Rename com.ubuntu.menu.
- * examples/exportmenu.py: Rename x-canonical-currentvalue.
- * examples/unityqmlmenumodel.qml: Rename
+ - Bump QMenuModel QML module to 1.0.
+ - Rename com.ubuntu.menu.
+ - examples/exportmenu.py: Rename x-canonical-currentvalue.
+ - examples/unityqmlmenumodel.qml: Rename
com.canonical.indicator.sound.
- * libqmenumodel/QMenuModel/plugin.h: Rename com.canonical.qmenumodel.
- * Rename com.canonical.test*.
+ - libqmenumodel/QMenuModel/plugin.h: Rename com.canonical.qmenumodel.
+ - Rename com.canonical.test*.
-Overview of changes in ayatana-indicator-session 0.8.1
+Overview of changes in qmenumodel 0.8.1
- * Move glib includes outside of extern "C".
- * Add Travis CI builds configuration.
+ - Move glib includes outside of extern "C".
+ - Add Travis CI builds configuration.
-Overview of changes in ayatana-indicator-session 0.8.0
+Overview of changes in qmenumodel 0.8.0
- * Move qmenumodel from UBports' project context over to
+ - Move qmenumodel from UBports' project context over to
Ayatana Indicators' project context. Same maintainers,
same people involved, but the project is now maintained
together with the other Indicators' related projects.
- * Upstream version bump (to go along with the other
+ - Upstream version bump (to go along with the other
indicator related projects maintained by the Ayatana
Indicators project). Next official release will be 0.8.0.
diff --git a/debian/changelog b/debian/changelog
index f9aa07e..dcea8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-qmenumodel (0.10.0) UNRELEASED; urgency=medium
+qmenumodel (0.10.0) unstable; urgency=medium
* Upstream-provided Debian package for qmenumodel. See upstream ChangeLog
for recent changes.
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 11 Jun 2026 21:42:40 +0200
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 11 Jun 2026 21:49:35 +0200
qmenumodel (0.9.2-0) unstable; urgency=medium