diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/changelog libdbusmenu-qt-0.9.3+16.04.20160218/debian/changelog --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/changelog 2018-01-30 12:58:55.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/changelog 2019-08-25 16:07:44.000000000 +0000 @@ -1,10 +1,11 @@ -libdbusmenu-qt (0.9.3+16.04.20160218-1ubuntu1) bionic; urgency=medium +libdbusmenu-qt (0.9.3+16.04.20160218-2) unstable; urgency=medium - * Breaks/Replaces on libdbusmenu-qt5 for libdbusmenu-qt5-2. - libdbusmenu-qt5 exists in Ubuntu archive, but not debian history. - Can be dropped after 18.04. + * Team upload. + * Drop Qt4 support (Closes: #875021) + * Update Vcs-* to point to salsa + * Update symbols files - -- Rik Mills Tue, 30 Jan 2018 12:58:55 +0000 + -- Scott Kitterman Sun, 25 Aug 2019 12:07:44 -0400 libdbusmenu-qt (0.9.3+16.04.20160218-1) unstable; urgency=medium diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/control libdbusmenu-qt-0.9.3+16.04.20160218/debian/control --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/control 2018-01-30 11:11:11.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/control 2019-08-25 16:07:02.000000000 +0000 @@ -3,9 +3,7 @@ Priority: optional Build-Depends: debhelper (>= 9), cmake (>= 2.8.11), - libqt4-dev (>= 4:4.6.2), qtbase5-dev, - libqjson-dev, pkg-config, doxygen Maintainer: Debian Krap Maintainers @@ -14,30 +12,14 @@ Pino Toscano Standards-Version: 3.9.6 Homepage: https://launchpad.net/libdbusmenu-qt -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/krap/libdbusmenu-qt.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/krap/libdbusmenu-qt.git - -Package: libdbusmenu-qt2 -Architecture: any -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, - ${shlibs:Depends} -Multi-Arch: same -Description: Qt implementation of the DBusMenu protocol - This library provides a Qt implementation of the DBusMenu protocol. - . - The DBusMenu protocol makes it possible for applications to export - and import their menus over D-Bus. - . - This package provides the libdbusmenu-qt2 shared library. +Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/libdbusmenu-qt.git +Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/libdbusmenu-qt Package: libdbusmenu-qt5-2 Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libdbusmenu-qt5 -Replaces: libdbusmenu-qt5 Multi-Arch: same Description: Qt implementation of the DBusMenu protocol This library provides a Qt implementation of the DBusMenu protocol. @@ -47,21 +29,6 @@ . This package provides the libdbusmenu-qt2 shared library. -Package: libdbusmenu-qt-dev -Section: libdevel -Architecture: any -Depends: libdbusmenu-qt2 (= ${binary:Version}), - libqt4-dev, - ${misc:Depends} -Description: Qt implementation of the DBusMenu protocol (development) - This library provides a Qt implementation of the DBusMenu protocol. - . - The DBusMenu protocol makes it possible for applications to export - and import their menus over D-Bus. - . - This package provides header files and CMake configuration files for - development. - Package: libdbusmenu-qt5-dev Section: libdevel Architecture: any @@ -77,20 +44,6 @@ This package provides header files and CMake configuration files for development. -Package: libdbusmenu-qt-doc -Section: doc -Architecture: all -Depends: libjs-jquery, - ${misc:Depends} -Suggests: w3m | www-browser -Description: Qt implementation of the DBusMenu protocol (documentation) - This library provides a Qt implementation of the DBusMenu protocol. - . - The DBusMenu protocol makes it possible for applications to export - and import their menus over D-Bus. - . - This package provides API documentation in HTML format. - Package: libdbusmenu-qt5-doc Section: doc Architecture: all diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.docs libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.docs --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.docs 2015-06-08 18:11:24.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -NEWS -README diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.install libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.install --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.install 2015-06-08 18:11:24.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libdbusmenu-qt.so.2* diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.symbols libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.symbols --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.symbols 2016-03-28 11:13:05.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt2.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -# SymbolsHelper-Confirmed: 0.9.3+15.10.20150604 amd64 -libdbusmenu-qt.so.2 libdbusmenu-qt2 #MINVER# -* Build-Depends-Package: libdbusmenu-qt-dev - _ZN16DBusMenuExporter11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.3.2 - _ZN16DBusMenuExporter11qt_metacastEPKc@Base 0.3.2 - _ZN16DBusMenuExporter14activateActionEP7QAction@Base 0.6.6 - _ZN16DBusMenuExporter15doUpdateActionsEv@Base 0.3.2 - _ZN16DBusMenuExporter16staticMetaObjectE@Base 0.3.2 - _ZN16DBusMenuExporter17iconNameForActionEP7QAction@Base 0.3.2 - _ZN16DBusMenuExporter19doEmitLayoutUpdatedEv@Base 0.5.1 - _ZN16DBusMenuExporter19slotActionDestroyedEP7QObject@Base 0.6.6 - _ZN16DBusMenuExporter9setStatusERK7QString@Base 0.9.0 - _ZN16DBusMenuExporterC1ERK7QStringP5QMenuRK15QDBusConnection@Base 0.3.2 - _ZN16DBusMenuExporterC2ERK7QStringP5QMenuRK15QDBusConnection@Base 0.3.2 - _ZN16DBusMenuExporterD0Ev@Base 0.3.2 - _ZN16DBusMenuExporterD1Ev@Base 0.3.2 - _ZN16DBusMenuExporterD2Ev@Base 0.3.2 - _ZN16DBusMenuImporter10createMenuEP7QWidget@Base 0.3.2 - _ZN16DBusMenuImporter10updateMenuEv@Base 0.5.1 - _ZN16DBusMenuImporter11iconForNameERK7QString@Base 0.3.2 - _ZN16DBusMenuImporter11menuUpdatedEv@Base 0.5.1 - _ZN16DBusMenuImporter11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.3.2 - _ZN16DBusMenuImporter11qt_metacastEPKc@Base 0.3.2 - _ZN16DBusMenuImporter16sendClickedEventEi@Base 0.3.2 - _ZN16DBusMenuImporter16staticMetaObjectE@Base 0.3.2 - _ZN16DBusMenuImporter17slotLayoutUpdatedEji@Base 0.3.3 - _ZN16DBusMenuImporter18menuReadyToBeShownEv@Base 0.3.3 - _ZN16DBusMenuImporter19slotMenuAboutToHideEv@Base 0.9.2 - _ZN16DBusMenuImporter19slotMenuAboutToShowEv@Base 0.3.2 - _ZN16DBusMenuImporter21slotGetLayoutFinishedEP23QDBusPendingCallWatcher@Base 0.9.2 - _ZN16DBusMenuImporter25actionActivationRequestedEP7QAction@Base 0.6.6 - _ZN16DBusMenuImporter27processPendingLayoutUpdatesEv@Base 0.5.1 - _ZN16DBusMenuImporter27slotItemActivationRequestedEij@Base 0.6.6 - _ZN16DBusMenuImporter31slotAboutToShowDBusCallFinishedEP23QDBusPendingCallWatcher@Base 0.3.2 - _ZN16DBusMenuImporterC1ERK7QStringS2_20DBusMenuImporterTypeP7QObject@Base 0.9.3+14.10.20140619 - _ZN16DBusMenuImporterC1ERK7QStringS2_P7QObject@Base 0.3.2 - _ZN16DBusMenuImporterC2ERK7QStringS2_20DBusMenuImporterTypeP7QObject@Base 0.9.3+14.10.20140619 - _ZN16DBusMenuImporterC2ERK7QStringS2_P7QObject@Base 0.3.2 - _ZN16DBusMenuImporterD0Ev@Base 0.3.2 - _ZN16DBusMenuImporterD1Ev@Base 0.3.2 - _ZN16DBusMenuImporterD2Ev@Base 0.3.2 - _ZN16DBusMenuShortcut15fromKeySequenceERK12QKeySequence@Base 0.3.4 - (optional=gccinternal)_ZN18DBusMenuLayoutItemD1Ev@Base 0.9.3+15.10.20150604 - (optional=gccinternal)_ZN18DBusMenuLayoutItemD2Ev@Base 0.9.3+15.10.20150604 - _ZNK16DBusMenuExporter10metaObjectEv@Base 0.3.2 - _ZNK16DBusMenuExporter6statusEv@Base 0.9.0 - _ZNK16DBusMenuImporter10metaObjectEv@Base 0.3.2 - _ZNK16DBusMenuImporter4menuEv@Base 0.3.2 - _ZNK16DBusMenuShortcut13toKeySequenceEv@Base 0.3.4 - _ZTI16DBusMenuExporter@Base 0.3.2 - _ZTI16DBusMenuImporter@Base 0.3.2 - _ZTS16DBusMenuExporter@Base 0.3.2 - _ZTS16DBusMenuImporter@Base 0.3.2 - _ZTV16DBusMenuExporter@Base 0.3.2 - _ZTV16DBusMenuImporter@Base 0.3.2 - _ZlsR13QDBusArgumentRK12DBusMenuItem@Base 0.3.2 - _ZlsR13QDBusArgumentRK16DBusMenuItemKeys@Base 0.8.0 - _ZlsR13QDBusArgumentRK18DBusMenuLayoutItem@Base 0.8.0 - _ZrsRK13QDBusArgumentR12DBusMenuItem@Base 0.3.2 - _ZrsRK13QDBusArgumentR16DBusMenuItemKeys@Base 0.8.0 - _ZrsRK13QDBusArgumentR18DBusMenuLayoutItem@Base 0.8.0 diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt5-2.symbols libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt5-2.symbols --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt5-2.symbols 2016-03-28 11:13:05.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt5-2.symbols 2019-08-25 16:07:44.000000000 +0000 @@ -42,8 +42,6 @@ _ZN16DBusMenuImporterD1Ev@Base 0.3.2 _ZN16DBusMenuImporterD2Ev@Base 0.3.2 _ZN16DBusMenuShortcut15fromKeySequenceERK12QKeySequence@Base 0.3.4 - (optional=gccinternal)_ZN6QDebugD1Ev@Base 0.9.3+14.10.20140619 - (optional=gccinternal)_ZN6QDebugD2Ev@Base 0.9.3+14.10.20140619 (optional=gccinternal)_ZN6QDebuglsEPKc@Base 0.9.3+15.10.20150604 (optional=gccinternal)_ZN7QStringD1Ev@Base 0.9.3+14.10.20140619 (optional=gccinternal)_ZN7QStringD2Ev@Base 0.9.3+14.10.20140619 diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-dev.install libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-dev.install --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-dev.install 2015-06-08 18:11:39.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -usr/include/dbusmenu-qt/ -usr/lib/*/libdbusmenu-qt.so -usr/lib/*/pkgconfig/dbusmenu-qt.pc -usr/lib/*/cmake/dbusmenu-qt/ diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.doc-base.dbusmenu-qt libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.doc-base.dbusmenu-qt --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.doc-base.dbusmenu-qt 2015-06-08 18:11:24.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.doc-base.dbusmenu-qt 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Document: dbusmenu-qt -Title: DBusMenu Qt API Documentation -Author: Canonical DX Team, Aurélien Gâteau -Abstract: This library provides a Qt implementation of the DBusMenu protocol. - The DBusMenu protocol makes it possible for applications to export and import - their menus over D-Bus. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libdbusmenu-qt-doc/html/index.html -Files: /usr/share/doc/libdbusmenu-qt-doc/html/*.html - /usr/share/doc/libdbusmenu-qt-doc/html/search/*.html diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.install libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.install --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.install 2015-06-08 18:11:39.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/doc/libdbusmenu-qt-doc/* usr/share/doc/libdbusmenu-qt-doc/html diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.links libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.links --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.links 2015-06-08 18:11:24.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/libdbusmenu-qt-doc/html/jquery.js diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.lintian-overrides libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.lintian-overrides --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.lintian-overrides 2015-06-08 18:11:24.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/libdbusmenu-qt-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# doxygen generated files -libdbusmenu-qt-doc binary: duplicate-files diff -Nru libdbusmenu-qt-0.9.3+16.04.20160218/debian/rules libdbusmenu-qt-0.9.3+16.04.20160218/debian/rules --- libdbusmenu-qt-0.9.3+16.04.20160218/debian/rules 2016-03-28 11:17:32.000000000 +0000 +++ libdbusmenu-qt-0.9.3+16.04.20160218/debian/rules 2019-08-25 16:02:07.000000000 +0000 @@ -7,19 +7,14 @@ dh $@ --parallel --buildsystem=cmake override_dh_auto_configure: - QT_SELECT=qt4 dh_auto_configure -- -DUSE_QT4=True - QT_SELECT=qt5 dh_auto_configure --builddirectory=build-qt5 -- -DUSE_QT5=True + QT_SELECT=qt5 dh_auto_configure -- -DUSE_QT5=True override_dh_auto_build: dh_auto_build - dh_auto_build --builddirectory=build-qt5 override_dh_auto_install: dh_auto_install # Removing embedded jquery javascript library - rm debian/tmp/usr/share/doc/libdbusmenu-qt-doc/jquery.js - dh_auto_install --builddirectory=build-qt5 - # Removing embedded jquery javascript library rm debian/tmp/usr/share/doc/libdbusmenu-qt5-doc/jquery.js override_dh_install: