[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.10.5-1-2-g73ad78e

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=73ad78e

The following commit has been merged in the master branch:
commit 73ad78e9ca050cbcc86552a03911b78845157028
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 13 15:35:25 2013 +0200

    drop patch marble-4.7-compat.diff, obsolete now
---
 debian/changelog                      |    2 ++
 debian/patches/marble-4.7-compat.diff |   31 -------------------------------
 debian/patches/series                 |    1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b33bec..d21739b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdeplasma-addons (4:4.10.5-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Drop patch marble-4.7-compat.diff, obsolete now.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 13 Jul 2013 15:34:16 +0200
 
diff --git a/debian/patches/marble-4.7-compat.diff b/debian/patches/marble-4.7-compat.diff
deleted file mode 100644
index 975914c..0000000
--- a/debian/patches/marble-4.7-compat.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-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
- 
-         // These settings apply to Marble's "satellite" view mostly, e.g. make it beautiful
-         m_map->setShowClouds(true);
-+#if MARBLE_VERSION >= 0x000d00
-         m_map->setShowCityLights(false);
-         m_map->setShowSunShading(true);
-+#else
-+        m_map->model()->sunLocator()->setCitylights(false);
-+        m_map->model()->sunLocator()->setShow(true);
-+#endif
- 
-         // 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
-     m_ui.showPlacemarks->setChecked(m_showPlacemarks);
- 
-     MapThemeManager themeManager;
-+#if MARBLE_VERSION < 0x000d00
-+    themeManager.updateMapThemeModel();
-+#endif
-     // FIXME: Going manually through the model is ugly as hell, but plugging the
-     //        model into the view didn't work for me
-     for (int i = 0; i < themeManager.mapThemeModel()->rowCount(); i++) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 05cb868..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-marble-4.7-compat.diff

-- 
KDE Plasma Addons module packaging