[SCM] KDE Wallpapers packaging branch, kubuntu_vivid_backports, updated. debian/4.14.0-1-16-g86d85b8

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-wallpapers.git;a=commitdiff;h=86d85b8

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 86d85b885f6b11e5f3847798741c876a78471d97
Merge: 05836d2ce7187c288bd7a54eb44981b9cedbec9b b596c3dc766ad8ce09819c155875c9f1064e3eeb
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 13 15:30:24 2015 +0200

    Merge branch 'kubuntu_vivid_archive' into kubuntu_vivid_backports
    
    Conflicts:
    	debian/control
    	debian/copyright

 debian/.gitattributes       |  1 -
 debian/changelog            | 29 ++++++++++++++++++++++++++---
 debian/control              |  2 +-
 debian/source/local-options |  1 -
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index ea3efa7,735cb62..aa5029a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,26 +1,33 @@@
 +kde-wallpapers (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +  * Bump kdelibs version
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 28 Apr 2015 14:47:02 -0700
 +
- kde-wallpapers (4:14.11.95-0ubuntu1) UNRELEASED; urgency=medium
+ kde-wallpapers (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
-   * New upstream beta release
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:13:26 -0700
+ 
+ kde-wallpapers (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:07:31 -0800
+ 
+ kde-wallpapers (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 16:35:43 +0100
+ 
+ kde-wallpapers (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   [ Philip Muškovac ]
+   * New upstream release candidate
    * Fix watch urls for new release location
    * Update Vcs urls for the new repository location
    * Update the maintainer

-- 
KDE Wallpapers packaging