[SCM] KDE Wallpapers packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-wallpapers.git;a=commitdiff;h=56dd2ee

The following commit has been merged in the master branch:
commit 56dd2ee812ca7205ab7500e2d888ab349b0a5735
Author: Pino Toscano <pino at debian.org>
Date:   Sat Apr 20 15:43:11 2013 +0200

    set Elarun as the default wallpaper
    
    ... as it is set upstream.
    
    Since Ariya and Elarun swaps places between kde-wallpapers and kde-wallpapers-default, set proper breaks/replaces in both against previous versions of each other.
---
 debian/changelog |    5 +++++
 debian/control   |    6 ++++--
 debian/rules     |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d790e85..d5f4182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kde-wallpapers (4:4.10.2-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Correctly set Elarun as the default wallpaper, as it is set upstream.
+    Since Ariya and Elarun swaps places between kde-wallpapers and
+    kde-wallpapers-default, set proper breaks/replaces in both against
+    previous versions of the other.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Apr 2013 15:33:00 +0200
 
diff --git a/debian/control b/debian/control
index 1f77fe0..0f5b9bf 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,10 @@ Package: kde-wallpapers
 Architecture: all
 Depends: kde-wallpapers-default (>= ${source:Version}), ${misc:Depends}
 Breaks: kdebase-workspace-data (<< 4:4.6.80),
+ kde-wallpapers-default (<< 4:4.10.2-2~),
  kdm (<< 4:4.6.0)
 Replaces: kdebase-workspace-data (<< 4:4.6.80),
+ kde-wallpapers-default (<< 4:4.10.2-2~),
  kdm (<< 4:4.6.0)
 Description: set of wallpapers for the KDE Plasma Workspaces
  This package contains additional wallpapers for KDE Plasma Workspaces.
@@ -26,9 +28,9 @@ Description: set of wallpapers for the KDE Plasma Workspaces
 Package: kde-wallpapers-default
 Architecture: all
 Depends: ${misc:Depends}
-Breaks: kde-wallpapers (<< 4:4.7.2),
+Breaks: kde-wallpapers (<< 4:4.10.2-2~),
  kdebase-workspace-data (<< 4:4.6.80),
-Replaces: kde-wallpapers (<< 4:4.7.2),
+Replaces: kde-wallpapers (<< 4:4.10.2-2~),
  kdebase-workspace-data (<< 4:4.6.80),
 Description: default wallpaper for the Plasma workspace
  This package contains a default wallpaper for KDE Plasma Workspaces.
diff --git a/debian/rules b/debian/rules
index 8b105b4..73fc0c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-KDE_DEFAULT_WALLPAPER := Ariya
+KDE_DEFAULT_WALLPAPER := Elarun
 
 walldir := usr/share/wallpapers
 

-- 
KDE Wallpapers packaging