[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8dd76277f59beab869621d53f777e30cf1d406df
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Wed Dec 9 14:58:09 2009 +0000

    Remove 99_fix_ftbfs_on_marble_wallpaper.diff, fixes fail to build
---
 debian/changelog                                     |  6 ++++++
 debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff | 13 -------------
 debian/patches/series                                |  1 -
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cad405..7c48717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdeplasma-addons (4:4.3.80-0ubuntu5) lucid; urgency=low
+
+  * Remove 99_fix_ftbfs_on_marble_wallpaper.diff, fixes fail to build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 09 Dec 2009 14:57:57 +0000
+
 kdeplasma-addons (4:4.3.80-0ubuntu4) lucid; urgency=low
 
   * Fix libkexiv2 build-dep to libkexiv2-8
diff --git a/debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff b/debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff
deleted file mode 100644
index db638c2..0000000
--- a/debian/patches/99_fix_ftbfs_on_marble_wallpaper.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdeplasma-addons-4.3.80/wallpapers/marble/marble.cpp
-===================================================================
---- kdeplasma-addons-4.3.80.orig/wallpapers/marble/marble.cpp	2009-12-05 22:13:12.958174158 +0100
-+++ kdeplasma-addons-4.3.80/wallpapers/marble/marble.cpp	2009-12-05 22:13:35.018798637 +0100
-@@ -98,7 +98,7 @@
-     m_positionLon = config.readEntry(POSITION_LON_KEY, home_lon);
-     m_positionLat = config.readEntry(POSITION_LAT_KEY, home_lat);
-     m_projection = static_cast<Projection>(config.readEntry(PROJECTION_KEY, static_cast<int>(Spherical)));
--    m_quality = static_cast<MapQuality>(config.readEntry(QUALITY_KEY, static_cast<int>(NormalQuality)));
-+    m_quality = static_cast<MapQuality>(config.readEntry(QUALITY_KEY, static_cast<int>(Normal)));
-     m_rotationLat = config.readEntry(ROTATION_LAT_KEY, 0.0);
-     m_rotationLon = config.readEntry(ROTATION_LON_KEY, 0.025);
-     m_rotationTimeout = config.readEntry(ROTATION_TIMEOUT_KEY, 10000);
diff --git a/debian/patches/series b/debian/patches/series
index fcdec85..28f7671 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 #kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
-99_fix_ftbfs_on_marble_wallpaper.diff

-- 
KDE Plasma Addons module packaging