[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Aug 1 09:05:42 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=6dc5044
The following commit has been merged in the master branch:
commit 6dc504497c9b8c1e10730c1b365e71e214bb9dd2
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Fri Sep 27 17:24:58 2013 +0100
4.11.2
---
debian/changelog | 4 +--
...001-spin-event-loop-before-destroying-menu.diff | 41 ----------------------
.../0002-fix-show-a-launcher-when-not-running.diff | 41 ----------------------
debian/patches/kubuntu_01_news_applet_name.diff | 8 ++---
debian/patches/marble-4.7-compat.diff | 10 +++---
debian/patches/series | 2 --
6 files changed, 12 insertions(+), 94 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fa30712..a976992 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-kdeplasma-addons (4:4.11.2-0ubuntu1) UNRELEASED; urgency=low
+kdeplasma-addons (4:4.11.2-0ubuntu1~ubuntu13.10~ppa1) saucy; urgency=low
* New upstream bugfix release
- -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 27 Sep 2013 15:02:02 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 27 Sep 2013 17:22:20 +0100
kdeplasma-addons (4:4.11.1-0ubuntu2) saucy; urgency=low
diff --git a/debian/patches/0001-spin-event-loop-before-destroying-menu.diff b/debian/patches/0001-spin-event-loop-before-destroying-menu.diff
deleted file mode 100644
index ae3807c..0000000
--- a/debian/patches/0001-spin-event-loop-before-destroying-menu.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Spin the event loop before destroying the menu.
- This allows the menu implementation to complete toggling the
- launcher before the instance is destroyed. It's extremely un-
- fortunate that the library currently requires this careful
- handling; see e944d7ae in kde-workspace for a note on what
- needs to be cleaned up there.
- Author: Eike Hein <hein at kde.org>
-Origin: upstream, https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6
-Bug: https://bugs.kde.org/show_bug.cgi?id=324661
-Applied-Upstream: 4.11.2
-Reviewed-by: Howard Chan <smartboyhw at gmail.com>
-Last-Update: 2013-09-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp
-index 970c19f..61b39ef 100644
---- a/applets/icontasks/windowtaskitem.cpp
-+++ b/applets/icontasks/windowtaskitem.cpp
-@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu)
- actionList.append(configAction);
- }
-
-- TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
-- menu.adjustSize();
-+ TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
-+ menu->adjustSize();
-
- if (m_applet->formFactor() != Plasma::Vertical) {
-- menu.setMinimumWidth(size().width());
-+ menu->setMinimumWidth(size().width());
- }
-
- Q_ASSERT(m_applet->containment());
- Q_ASSERT(m_applet->containment()->corona());
- stopWindowHoverEffect();
-- menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos);
-+ menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos);
-+ menu->deleteLater();
- delete a;
- }
-
diff --git a/debian/patches/0002-fix-show-a-launcher-when-not-running.diff b/debian/patches/0002-fix-show-a-launcher-when-not-running.diff
deleted file mode 100644
index d592381..0000000
--- a/debian/patches/0002-fix-show-a-launcher-when-not-running.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix it for non-running items too.
- This allows the menu implementation to complete toggling the
- launcher before the instance is destroyed. It's extremely un-
- fortunate that the library currently requires this careful
- handling; see e944d7ae in kde-workspace for a note on what
- needs to be cleaned up there.
-Author: Eike Hein <hein at kde.org>
-Origin: upstream, https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/b56d1552e9a8f8efe8fb8fd641126e78627c61a9
-Bug: https://bugs.kde.org/show_bug.cgi?id=324661
-Applied-Upstream: 4.11.2
-Reviewed-by: Howard Chan <smartboyhw at gmail.com>
-Last-Update: 2013-09-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp
-index b5f646c..f721b5a 100644
---- a/applets/icontasks/applauncheritem.cpp
-+++ b/applets/icontasks/applauncheritem.cpp
-@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
- actionList.append(configAction);
- }
-
-- TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
-- menu.adjustSize();
-+ TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
-+ menu->adjustSize();
-
- if (m_applet->formFactor() != Plasma::Vertical) {
-- menu.setMinimumWidth(size().width());
-+ menu->setMinimumWidth(size().width());
- }
-
- Q_ASSERT(m_applet->containment());
- Q_ASSERT(m_applet->containment()->corona());
- stopWindowHoverEffect();
-- menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
-+ menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size()));
-+ menu->deleteLater();
- }
-
-
diff --git a/debian/patches/kubuntu_01_news_applet_name.diff b/debian/patches/kubuntu_01_news_applet_name.diff
index cf5894a..e52e32d 100644
--- a/debian/patches/kubuntu_01_news_applet_name.diff
+++ b/debian/patches/kubuntu_01_news_applet_name.diff
@@ -1,8 +1,8 @@
-Index: kdeplasma-addons-4.9.2/applets/news/plasma-applet-news.desktop
+Index: kdeplasma-addons-4.11.2/applets/news/plasma-applet-news.desktop
===================================================================
---- kdeplasma-addons-4.9.2.orig/applets/news/plasma-applet-news.desktop 2012-09-28 01:39:43.000000000 +0100
-+++ kdeplasma-addons-4.9.2/applets/news/plasma-applet-news.desktop 2012-10-11 17:27:02.488278904 +0100
-@@ -116,7 +116,7 @@
+--- kdeplasma-addons-4.11.2.orig/applets/news/plasma-applet-news.desktop 2013-09-27 17:22:45.752875933 +0100
++++ kdeplasma-addons-4.11.2/applets/news/plasma-applet-news.desktop 2013-09-27 17:22:45.744875933 +0100
+@@ -118,7 +118,7 @@
X-KDE-Library=plasma_applet_news
X-KDE-PluginInfo-Author=Petri Damstén
X-KDE-PluginInfo-Email=damu at iki.fi
diff --git a/debian/patches/marble-4.7-compat.diff b/debian/patches/marble-4.7-compat.diff
index 975914c..c6cf5c9 100644
--- a/debian/patches/marble-4.7-compat.diff
+++ b/debian/patches/marble-4.7-compat.diff
@@ -3,9 +3,11 @@ Description: compatibility with Marble < 0.13
Forwarded: not-needed
Last-Update: 2012-02-15
---- a/wallpapers/marble/marble.cpp
-+++ b/wallpapers/marble/marble.cpp
-@@ -80,8 +80,13 @@ void MarbleWallpaper::init(const KConfig
+Index: kdeplasma-addons-4.11.2/wallpapers/marble/marble.cpp
+===================================================================
+--- kdeplasma-addons-4.11.2.orig/wallpapers/marble/marble.cpp 2013-09-27 17:22:49.544875897 +0100
++++ kdeplasma-addons-4.11.2/wallpapers/marble/marble.cpp 2013-09-27 17:22:49.536875897 +0100
+@@ -80,8 +80,13 @@
// These settings apply to Marble's "satellite" view mostly, e.g. make it beautiful
m_map->setShowClouds(true);
@@ -19,7 +21,7 @@ Last-Update: 2012-02-15
// Disable all render plugins (scale bar, compass, etc.) except the "stars" plugin
foreach (RenderPlugin *item, m_map->renderPlugins()) {
-@@ -137,6 +142,9 @@ QWidget *MarbleWallpaper::createConfigur
+@@ -137,6 +142,9 @@
m_ui.showPlacemarks->setChecked(m_showPlacemarks);
MapThemeManager themeManager;
diff --git a/debian/patches/series b/debian/patches/series
index 2d47165..203c746 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
kubuntu_01_news_applet_name.diff
marble-4.7-compat.diff
-0001-spin-event-loop-before-destroying-menu.diff
-0002-fix-show-a-launcher-when-not-running.diff
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list