From 3e40248f305bc00f42c8740bb840e5eaffe54077 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Tue, 18 Jun 2024 20:05:18 -0500 Subject: [PATCH] Rename, soname bump, bump build deps --- debian/changelog | 2 + debian/control | 39 +++++++++---------- ...all => liblxqt-globalkeys-ui2-dev.install} | 0 ...install => liblxqt-globalkeys-ui2.install} | 0 ...symbols => liblxqt-globalkeys-ui2.symbols} | 4 +- ...nstall => liblxqt-globalkeys2-dev.install} | 0 ...s1.install => liblxqt-globalkeys2.install} | 0 ...s1.symbols => liblxqt-globalkeys2.symbols} | 4 +- 8 files changed, 25 insertions(+), 24 deletions(-) rename debian/{liblxqt-globalkeys-ui1-dev.install => liblxqt-globalkeys-ui2-dev.install} (100%) rename debian/{liblxqt-globalkeys-ui1.install => liblxqt-globalkeys-ui2.install} (100%) rename debian/{liblxqt-globalkeys-ui1.symbols => liblxqt-globalkeys-ui2.symbols} (90%) rename debian/{liblxqt-globalkeys1-dev.install => liblxqt-globalkeys2-dev.install} (100%) rename debian/{liblxqt-globalkeys1.install => liblxqt-globalkeys2.install} (100%) rename debian/{liblxqt-globalkeys1.symbols => liblxqt-globalkeys2.symbols} (96%) diff --git a/debian/changelog b/debian/changelog index 5f59a9f..fcc8d9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ lxqt-globalkeys (2.0.0-0ubuntu1) UNRELEASED; urgency=medium * New upstream release. * Update copyright file. * Bump Standards-Version to 4.7.0, no changes necessary. + * Rename and soname-bump library packages. + * Update build dependencies. -- Aaron Rainbolt Tue, 18 Jun 2024 19:52:57 -0500 diff --git a/debian/control b/debian/control index 76502e0..3449dc9 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,10 @@ Uploaders: Alf Gaida , Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), - libkf5windowsystem-dev, - liblxqt1-dev (>= 1.4.0), - libqt5svg5-dev, - libqt5x11extras5-dev, + libkf6windowsystem-dev, + liblxqt2-dev (>= 2.0.0), libx11-dev, + qt6-svg-dev, xserver-xorg-input-libinput-dev Standards-Version: 4.7.0 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-globalkeys-packaging @@ -33,56 +32,56 @@ Description: daemon used to register global keyboard shortcuts (appl.) . This package contain the program files for LXQt globalskeys. -Package: liblxqt-globalkeys1 +Package: liblxqt-globalkeys2 Architecture: any Multi-Arch: same Section: libs Pre-Depends: ${misc:Pre-Depends}, Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: liblxqt-globalkeys0 (<< 0.99.0) -Replaces: liblxqt-globalkeys0 (<< 0.99.0) +Breaks: liblxqt-globalkeys0 (<< 0.99.0), liblxqt-globalkeys1 +Replaces: liblxqt-globalkeys0 (<< 0.99.0), liblxqt-globalkeys1 Description: daemon used to register global keyboard shortcuts (shared libs) Daemon used to register global keyboard shortcuts. . This package contain the shared libs for LXQt globalkeys. -Package: liblxqt-globalkeys1-dev +Package: liblxqt-globalkeys2-dev Architecture: any Section: libdevel -Depends: liblxqt-globalkeys1 (= ${binary:Version}), +Depends: liblxqt-globalkeys2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: liblxqt-globalkeys0-dev (<< 0.99.0) -Replaces: liblxqt-globalkeys0-dev (<< 0.99.0) +Breaks: liblxqt-globalkeys0-dev (<< 0.99.0), liblxqt-globalkeys1-dev +Replaces: liblxqt-globalkeys0-dev (<< 0.99.0), liblxqt-globalkeys1-dev Description: daemon used to register global keyboard shortcuts (dev files) Daemon used to register global keyboard shortcuts. . This package contain the development files. -Package: liblxqt-globalkeys-ui1 +Package: liblxqt-globalkeys-ui2 Architecture: any Multi-Arch: same Section: libs Pre-Depends: ${misc:Pre-Depends}, Depends: ${misc:Depends}, ${shlibs:Depends}, - liblxqt-globalkeys1 (= ${binary:Version}) -Breaks: liblxqt-globalkeys-ui0 (<< 0.99.0) -Replaces: liblxqt-globalkeys-ui0 (<< 0.99.0) + liblxqt-globalkeys2 (= ${binary:Version}) +Breaks: liblxqt-globalkeys-ui0 (<< 0.99.0), liblxqt-globalkeys-ui1 +Replaces: liblxqt-globalkeys-ui0 (<< 0.99.0), liblxqt-globalkeys-ui1 Description: daemon used to register global keyboard shortcuts (ui files) Daemon used to register global keyboard shortcuts. . This package contain the ui for LXQt globalkeys. -Package: liblxqt-globalkeys-ui1-dev +Package: liblxqt-globalkeys-ui2-dev Architecture: any Section: libdevel -Depends: liblxqt-globalkeys-ui1 (= ${binary:Version}), +Depends: liblxqt-globalkeys-ui2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Breaks: liblxqt-globalkeys-ui0-dev (<< 0.99.0) -Replaces: liblxqt-globalkeys-ui0-dev (<< 0.99.0) +Breaks: liblxqt-globalkeys-ui0-dev (<< 0.99.0), liblxqt-globalkeys-ui1-dev +Replaces: liblxqt-globalkeys-ui0-dev (<< 0.99.0), liblxqt-globalkeys-ui1-dev Description: daemon used to register global keyboard shortcuts (ui dev files) Daemon used to register global keyboard shortcuts. . @@ -92,7 +91,7 @@ Package: lxqt-globalkeys-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: qttranslations5-l10n, ${misc:Depends} +Depends: qt6-translations-l10n, ${misc:Depends} Description: Language package for lxqt-globalkeys The l10n files for lxqt-globalkeys. . diff --git a/debian/liblxqt-globalkeys-ui1-dev.install b/debian/liblxqt-globalkeys-ui2-dev.install similarity index 100% rename from debian/liblxqt-globalkeys-ui1-dev.install rename to debian/liblxqt-globalkeys-ui2-dev.install diff --git a/debian/liblxqt-globalkeys-ui1.install b/debian/liblxqt-globalkeys-ui2.install similarity index 100% rename from debian/liblxqt-globalkeys-ui1.install rename to debian/liblxqt-globalkeys-ui2.install diff --git a/debian/liblxqt-globalkeys-ui1.symbols b/debian/liblxqt-globalkeys-ui2.symbols similarity index 90% rename from debian/liblxqt-globalkeys-ui1.symbols rename to debian/liblxqt-globalkeys-ui2.symbols index f172210..b8f48d2 100644 --- a/debian/liblxqt-globalkeys-ui1.symbols +++ b/debian/liblxqt-globalkeys-ui2.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 1.1.0 amd64 -liblxqt-globalkeys-ui.so.1 liblxqt-globalkeys-ui1 #MINVER# -* Build-Depends-Package: liblxqt0-globalkeys-ui1-dev +liblxqt-globalkeys-ui.so.2 liblxqt-globalkeys-ui2 #MINVER# +* Build-Depends-Package: liblxqt-globalkeys-ui2-dev (c++)"ShortcutSelector::ShortcutSelector(QWidget*)@Base" 0.8.0 (c++)"ShortcutSelector::addMenuAction(QString const&)@Base" 0.8.0 (c++)"ShortcutSelector::cancelNow()@Base" 0.8.0 diff --git a/debian/liblxqt-globalkeys1-dev.install b/debian/liblxqt-globalkeys2-dev.install similarity index 100% rename from debian/liblxqt-globalkeys1-dev.install rename to debian/liblxqt-globalkeys2-dev.install diff --git a/debian/liblxqt-globalkeys1.install b/debian/liblxqt-globalkeys2.install similarity index 100% rename from debian/liblxqt-globalkeys1.install rename to debian/liblxqt-globalkeys2.install diff --git a/debian/liblxqt-globalkeys1.symbols b/debian/liblxqt-globalkeys2.symbols similarity index 96% rename from debian/liblxqt-globalkeys1.symbols rename to debian/liblxqt-globalkeys2.symbols index aee6a0d..3191d9c 100644 --- a/debian/liblxqt-globalkeys1.symbols +++ b/debian/liblxqt-globalkeys2.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 1.1.0 amd64 -liblxqt-globalkeys.so.1 liblxqt-globalkeys1 #MINVER# -* Build-Depends-Package: liblxqt-globalkeys1-dev +liblxqt-globalkeys.so.2 liblxqt-globalkeys2 #MINVER# +* Build-Depends-Package: liblxqt-globalkeys2-dev (c++)"GlobalKeyShortcut::Action::Action(QObject*)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::activated()@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::changeDescription(QString const&)@Base" 0.8.0