diff -pruN 0.1.17-1/CMakeLists.txt 0.1.18-0ubuntu2/CMakeLists.txt --- 0.1.17-1/CMakeLists.txt 2012-04-03 15:56:34.000000000 +0000 +++ 0.1.18-0ubuntu2/CMakeLists.txt 2012-06-01 15:02:50.000000000 +0000 @@ -25,7 +25,7 @@ add_subdirectory(src) add_subdirectory(tests) # Packaging -set(PROJECT_VERSION "0.1.17") +set(PROJECT_VERSION "0.1.18") set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}) add_custom_target(dist COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 diff -pruN 0.1.17-1/debian/changelog 0.1.18-0ubuntu2/debian/changelog --- 0.1.17-1/debian/changelog 2012-05-16 20:29:20.000000000 +0000 +++ 0.1.18-0ubuntu2/debian/changelog 2013-03-28 17:36:20.000000000 +0000 @@ -1,16 +1,155 @@ -plasma-widget-menubar (0.1.17-1) unstable; urgency=low +plasma-widget-menubar (0.1.18-0ubuntu2) raring; urgency=low + + * Add X-Ubuntu-Use-Langpack: yes + + -- Jonathan Riddell Thu, 28 Mar 2013 17:36:01 +0000 + +plasma-widget-menubar (0.1.18-0ubuntu1) quantal; urgency=low + + * New upstream release + * Bump Standards-Version to 3.9.3.1, no changes required + + -- Jonathan Thomas Mon, 04 Jun 2012 22:10:03 -0400 + +plasma-widget-menubar (0.1.17-0ubuntu1) precise; urgency=low + + * New upstream release + * Drop patch to disable tests as test suite does not require X anymore + * Add build dependency on gnome-icon-theme-full so that gtkicontabletest + finds the necessary images + + -- Aurélien Gâteau Wed, 04 Apr 2012 10:13:50 +0200 + +plasma-widget-menubar (0.1.16-0ubuntu1) oneiric; urgency=low + + * New upstream bugfix release + - Change Vcs-Browser and Vcs-Bzr + + -- Romain Perier Mon, 12 Sep 2011 11:45:31 +0200 + +plasma-widget-menubar (0.1.15-0ubuntu2) oneiric; urgency=low + + * Fix FTBFS by adding missing build-depends on libx11-dev (LP: #829503) + + -- Scott Kitterman Sat, 20 Aug 2011 11:19:03 -0400 + +plasma-widget-menubar (0.1.15-0ubuntu1) natty; urgency=low + + * New upstream release + + -- Jonathan Riddell Thu, 24 Mar 2011 14:00:43 +0000 + +plasma-widget-menubar (0.1.14-0ubuntu1) natty; urgency=low + + * New upstream release + - Add kubuntu_01_disable_tests.diff to disable failing tests + * Switch from kde.mk to the debhelper short rules with the kde addon: + - Bump pkg-kde-tools build-depend version to 0.5.0 or higher + * Bump debhelper/compat version to 8 + * Bump Standards-Version to 3.9.1 + + -- Jonathan Thomas Mon, 17 Jan 2011 12:01:35 -0500 + +plasma-widget-menubar (0.1.13-0ubuntu4) natty; urgency=low + + * Add dependency on appmenu-qt + + -- Jonathan Riddell Wed, 12 Jan 2011 21:53:17 +0000 + +plasma-widget-menubar (0.1.13-0ubuntu3) natty; urgency=low + + * Actually add the missing build-dep on pkg-kde-tools + + -- Scott Kitterman Thu, 23 Dec 2010 01:08:45 -0500 + +plasma-widget-menubar (0.1.13-0ubuntu2) natty; urgency=low + + * Add missing build-depends on pkg-kde-tools + + -- Scott Kitterman Thu, 23 Dec 2010 01:00:11 -0500 + +plasma-widget-menubar (0.1.13-0ubuntu1) maverick; urgency=low + + * New upstream release + * Remove kubuntu_01_fix_translation_template.diff, now upstream + + -- Jonathan Riddell Thu, 09 Sep 2010 16:18:02 +0100 + +plasma-widget-menubar (0.1.12-0ubuntu2) maverick; urgency=low + + * Add kubuntu_01_fix_translation_template.diff to create correct + translation template, LP: #633446 + + -- Jonathan Riddell Wed, 08 Sep 2010 20:07:36 +0100 + +plasma-widget-menubar (0.1.12-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Fri, 03 Sep 2010 17:21:24 +0100 + +plasma-widget-menubar (0.1.11-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Thu, 19 Aug 2010 15:08:21 +0100 + +plasma-widget-menubar (0.1.10-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Thu, 05 Aug 2010 16:12:24 +0100 + +plasma-widget-menubar (0.1.9-0ubuntu2) maverick; urgency=low + + * Add build-dep on libqjson-dev + + -- Jonathan Riddell Fri, 23 Jul 2010 10:05:37 +0100 + +plasma-widget-menubar (0.1.9-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Fri, 23 Jul 2010 09:25:36 +0100 + +plasma-widget-menubar (0.1.8-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Thu, 08 Jul 2010 21:10:52 +0100 + +plasma-widget-menubar (0.1.7-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Mon, 28 Jun 2010 17:00:01 +0100 + +plasma-widget-menubar (0.1.6-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Fri, 25 Jun 2010 14:27:25 +0100 + +plasma-widget-menubar (0.1.5-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Thu, 17 Jun 2010 14:37:07 +0100 + +plasma-widget-menubar (0.1.3-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Jonathan Riddell Thu, 10 Jun 2010 23:52:56 +0100 + +plasma-widget-menubar (0.1.2-0ubuntu1) maverick; urgency=low * New upstream release - * Upload to unstable - * [ab2d37b] Imported Upstream version 0.1.17 - * [0349cd4] update standards version to 3.9.3 - - [9239fe8] update copyright to machine readable format 1.0 - - [e69a5f4] add Vcs headers - -- Ritesh Raj Sarraf Thu, 17 May 2012 01:30:31 +0530 + -- Jonathan Riddell Wed, 02 Jun 2010 17:25:21 +0100 -plasma-widget-menubar (0.1.16-1) experimental; urgency=low +plasma-widget-menubar (0.1.1-0ubuntu1) maverick; urgency=low - * Initial release. (Closes: #666495) + * Initial release - -- Ritesh Raj Sarraf Sat, 31 Mar 2012 13:29:55 +0530 + -- Aurélien Gâteau Wed, 19 May 2010 17:56:38 +0200 diff -pruN 0.1.17-1/debian/compat 0.1.18-0ubuntu2/debian/compat --- 0.1.17-1/debian/compat 2012-05-16 20:29:20.000000000 +0000 +++ 0.1.18-0ubuntu2/debian/compat 2012-06-05 02:09:21.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -pruN 0.1.17-1/debian/control 0.1.18-0ubuntu2/debian/control --- 0.1.17-1/debian/control 2012-05-16 20:29:20.000000000 +0000 +++ 0.1.18-0ubuntu2/debian/control 2013-03-28 17:35:26.000000000 +0000 @@ -1,19 +1,17 @@ Source: plasma-widget-menubar Section: kde Priority: extra -Maintainer: Debian KDE Extras Team -Uploaders: Ritesh Raj Sarraf -Build-Depends: debhelper (>= 7.0.50~), libqt4-dev (>= 4:4.8), kdelibs-bin, cmake, kdelibs5-dev, kde-workspace-dev, libx11-dev, libxext-dev, pkg-config, libqjson-dev, libdbusmenu-qt-dev -Standards-Version: 3.9.3 +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Aurélien Gâteau +X-Ubuntu-Use-Langpack: yes +Build-Depends: debhelper (>= 8.0.0~), cmake, kdelibs5-dev, libdbusmenu-qt-dev (>= 0.6.0), pkg-config, libqjson-dev, pkg-kde-tools (>= 0.5.0), libx11-dev, gnome-icon-theme-full +Standards-Version: 3.9.3.1 Homepage: https://launchpad.net/plasma-widget-menubar -Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/plasma-widget-menubar.git -Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/plasma-widget-menubar.git +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/plasma-widget-menubar +Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/plasma-widget-menubar Package: plasma-widget-menubar Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: plasma widget to display menubar of application windows - plamsa-widget-menubar provides a unified global menubar for all KDE - and Qt applications - . - It is provided as a widget which can be added to the panel +Depends: ${shlibs:Depends}, ${misc:Depends}, appmenu-qt +Description: A Plasma applet to display application menubars + A Plasma applet to displays application menubars. diff -pruN 0.1.17-1/debian/copyright 0.1.18-0ubuntu2/debian/copyright --- 0.1.17-1/debian/copyright 2012-05-16 20:29:20.000000000 +0000 +++ 0.1.18-0ubuntu2/debian/copyright 2012-06-05 02:09:21.000000000 +0000 @@ -1,43 +1,37 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: plasma-widget-menubar -Upstream-Contact: Aurélien Gâteau -Source: https://launchpad.net/plasma-widget-menubar - -Files: * -Copyright: Aurélien Gâteau -License: GPL - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 3, as - published by the Free Software Foundation - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-3 - - -Files: debian/* -Copyright: 2012 Ritesh Raj Sarraf -License: GPL - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License, as - published by the Free Software Foundation - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-3 +This package was debianized by Aurélien Gâteau on +Fri, 31 Jul 2009 16:53:04 +0200. + +It was downloaded from + +Upstream Author: + + Aurélien Gâteau + +Copyright: + + Copyright (C) 2009 Canonical Ltd. + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is: + + Copyright (C) 2009 Canonical Ltd. + +and is licensed under the GPL version 3, +see `/usr/share/common-licenses/GPL-3'. diff -pruN 0.1.17-1/debian/rules 0.1.18-0ubuntu2/debian/rules --- 0.1.17-1/debian/rules 2012-05-16 20:29:20.000000000 +0000 +++ 0.1.18-0ubuntu2/debian/rules 2012-06-05 02:09:21.000000000 +0000 @@ -1,14 +1,7 @@ #!/usr/bin/make -f -# -*- makefile -*- - -# export DH_VERBOSE=1 -export DH_OPTIONS %: - dh $@ + dh $@ --with kde override_dh_auto_test: - # don't run the tests - -override_dh_installchangelogs: - dh_installchangelogs NEWS + make -C obj-*/tests check diff -pruN 0.1.17-1/debian/watch 0.1.18-0ubuntu2/debian/watch --- 0.1.17-1/debian/watch 2012-05-16 20:29:20.000000000 +0000 +++ 0.1.18-0ubuntu2/debian/watch 2012-06-05 02:09:21.000000000 +0000 @@ -1,2 +1,3 @@ -# upstream seems to ship with kde-apps. -# TODO: Need to figure out a way to track it +version=3 +https://launchpad.net/plasma-widget-menubar/+download \ +http://launchpad.net/plasma-widget-menubar/trunk/\d.\d.\d/\+download/plasma-widget-menubar-(.*)\.tar\.bz2 diff -pruN 0.1.17-1/NEWS 0.1.18-0ubuntu2/NEWS --- 0.1.17-1/NEWS 2012-04-03 15:56:34.000000000 +0000 +++ 0.1.18-0ubuntu2/NEWS 2012-06-01 15:02:50.000000000 +0000 @@ -1,3 +1,6 @@ +# 0.1.18 - 2012.06.01 +- Fix crash which can happen when system is loaded (LP BUG #998630) (Aurélien Gâteau) + # 0.1.17 - 2012.04.03 - Fix keyboard navigation when cursor is over a button (LP BUG #878786) (Aurélien Gâteau) - Prevent multiple menus from being open at once if menubar is updated while opened (Aurélien Gâteau) diff -pruN 0.1.17-1/src/registrar.cpp 0.1.18-0ubuntu2/src/registrar.cpp --- 0.1.17-1/src/registrar.cpp 2012-04-03 15:56:34.000000000 +0000 +++ 0.1.18-0ubuntu2/src/registrar.cpp 2012-06-01 15:02:50.000000000 +0000 @@ -80,6 +80,7 @@ Registrar::Registrar(QObject* parent) : QObject(parent) , mServiceWatcher(new QDBusServiceWatcher(this)) { + qDBusRegisterMetaType(); qDBusRegisterMetaType(); qDBusRegisterMetaType(); mServiceWatcher->setConnection(QDBusConnection::sessionBus()); @@ -168,13 +169,34 @@ void Registrar::slotLayoutUpdated(uint / // See: https://bugs.launchpad.net/plasma-widget-menubar/+bug/878165 if (parentId == 0) { //root menu - QDBusInterface iface(message().service(), message().path(), "com.canonical.dbusmenu"); - QDBusMessage reply = iface.call("GetLayout", 0, 1, QStringList()); - QDBusArgument arg = reply.arguments()[1].value(); - DBusMenuLayoutItem root; - arg >> root; - Q_FOREACH(const DBusMenuLayoutItem& dbusMenuItem, root.children) { - iface.asyncCall("AboutToShow", dbusMenuItem.id); - } + fakeUnityAboutToShow(); + } +} + +void Registrar::fakeUnityAboutToShow() +{ + QDBusInterface iface(message().service(), message().path(), "com.canonical.dbusmenu"); + QDBusPendingCall call = iface.asyncCall("GetLayout", 0, 1, QStringList()); + QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call, this); + watcher->setProperty("service", message().service()); + watcher->setProperty("path", message().path()); + connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), + SLOT(finishFakeUnityAboutToShow(QDBusPendingCallWatcher*))); +} + +void Registrar::finishFakeUnityAboutToShow(QDBusPendingCallWatcher* watcher) +{ + QDBusPendingReply reply = *watcher; + if (reply.isError()) { + kWarning() << "Call to GetLayout failed:" << reply.error().message(); + return; + } + QString service = watcher->property("service").toString(); + QString path = watcher->property("path").toString(); + DBusMenuLayoutItem root = reply.argumentAt<1>(); + + QDBusInterface iface(service, path, "com.canonical.dbusmenu"); + Q_FOREACH(const DBusMenuLayoutItem& dbusMenuItem, root.children) { + iface.asyncCall("AboutToShow", dbusMenuItem.id); } } diff -pruN 0.1.17-1/src/registrar.h 0.1.18-0ubuntu2/src/registrar.h --- 0.1.17-1/src/registrar.h 2012-04-03 15:56:34.000000000 +0000 +++ 0.1.18-0ubuntu2/src/registrar.h 2012-06-01 15:02:50.000000000 +0000 @@ -18,6 +18,7 @@ #include // For WId class QDBusObjectPath; +class QDBusPendingCallWatcher; class QDBusServiceWatcher; class QMenu; @@ -72,12 +73,15 @@ public Q_SLOTS: private Q_SLOTS: void slotServiceUnregistered(const QString& service); void slotLayoutUpdated(uint revision, int parentId); + void finishFakeUnityAboutToShow(QDBusPendingCallWatcher*); private: QDBusServiceWatcher* mServiceWatcher; typedef QHash MenuInfoDb; MenuInfoDb mDb; QString mService; + + void fakeUnityAboutToShow(); }; #endif /* REGISTRAR_H */