[SCM] KDE Artwork module packaging branch, kde4.9, updated. debian/4.8.4-4-12-g52d139b

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit f68a7f9d676699a883c729c4505f0784f46ae4cc
Merge: 9f215bfe71a6cc8293c11ff6e638bc91a86bf8f5 47a14e2be4a646964d4dab15725b5a5f77348555
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Jan 26 19:08:44 2013 +0100

    Merge branch 'master' into kde4.9
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |   19 +++++++++++++++++++
 debian/control   |    5 +++--
 debian/copyright |   48 ++++++++++++++++++++++++++++++++++--------------
 3 files changed, 56 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index fd62deb,c19c050..7670f1a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,22 +1,32 @@@
 +kdeartwork (4:4.9.5-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.9.5.
 +  * Bump kde-workspace-dev build dependency to 4:4.9.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Jan 2013 19:07:52 +0100
 +
+ kdeartwork (4:4.8.4-5) unstable; urgency=low
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * I still missed a "lesser" in the GPL-3+ license on debian/copyright.
+   * Add a missing Copyright field in debian/copyright.
+ 
+   [ José Manuel Santamaría Lema ]
+   * Fix some lintian warnings about the copyright file: a couple of sytax
+     errors, and add the "Expat" license.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 26 Jan 2013 15:04:37 -0300
+ 
+ kdeartwork (4:4.8.4-4) unstable; urgency=low
+ 
+   * Add myself to Uploaders.
+   * Fix GPL-3+ license on debian/copyright. Thanks Adam Barratt for noticing.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 26 Jan 2013 12:50:33 -0300
+ 
  kdeartwork (4:4.8.4-3) unstable; urgency=low
  
    * Update debian/copyright (Closes: #697554).
diff --cc debian/control
index c77daff,19f1f06..608a382
--- a/debian/control
+++ b/debian/control
@@@ -7,10 -7,11 +7,11 @@@ Uploaders: Sune Vuorela <sune at debian.or
   Modestas Vainius <modax at debian.org>,
   George Kiagiadakis <kiagiadakis.george at gmail.com>,
   José Manuel Santamaría Lema <panfaust at gmail.com>,
-  Eshat Cakar <info at eshat.de>
- Build-Depends: kde-sc-dev-latest (>= 4:4.9.5),
+  Eshat Cakar <info at eshat.de>,
+  Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+ Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
   cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
 - kde-workspace-dev (>= 4:4.8), libxt-dev, libstreamanalyzer-dev (>= 0.6.3),
 + kde-workspace-dev (>= 4:4.9), libxt-dev, libstreamanalyzer-dev (>= 0.6.3),
   xscreensaver, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl, xscreensaver-gl-extra, 
   libqt4-opengl-dev, libeigen2-dev, xscreensaver-screensaver-bsod,
   xscreensaver-screensaver-webcollage, libkexiv2-dev, pkg-config

-- 
KDE Artwork module packaging