[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=644d81a

The following commit has been merged in the master branch:
commit 644d81a10b7bf86186fe26adcb21b743e073af94
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Wed Dec 9 12:34:21 2009 +0000

    Fix libkexiv2 build-dep to libkexiv2-8
---
 debian/changelog | 4 ++++
 debian/control   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fedc579..c729a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ kdeplasma-addons (4:4.3.80-0ubuntu2) lucid; urgency=low
   [ Scott Kitterman ]
   * Revert mistaken liblancelot1 transition and return to liblancelot0
 
+  [ Jonathan Riddell ]
+  * Fix libkexiv2 build-dep to libkexiv2-8
+
  -- Scott Kitterman <scott at kitterman.com>  Sun, 06 Dec 2009 21:42:35 -0500
 
 kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
@@ -32,6 +35,7 @@ kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
 
  -- Scott Kitterman <scott at kitterman.com>  Sat, 05 Dec 2009 23:30:01 -0500
 
+>>>>>>> MERGE-SOURCE
 kdeplasma-addons (4:4.3.3-0ubuntu1) lucid; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 41abd3e..ec1a63e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pus
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
  kdelibs5-dev (>= 4:4.3.80), kdepimlibs5-dev (>= 4:4.3.80), libqt4-opengl-dev,
- kdebase-workspace-dev (>= 4:4.3.80), libboost1.40-dev, libkexiv2-7-dev, python, libmarble-dev (>= 4:4.3.0),
+ kdebase-workspace-dev (>= 4:4.3.80), libboost1.40-dev, libkexiv2-8-dev (>= 4:4.3.80-0ubuntu2), python, libmarble-dev (>= 4:4.3.0),
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, libattica-dev, libxtst-dev,
- libmarble-dev, shared-desktop-ontologies
+ shared-desktop-ontologies
 Standards-Version: 3.8.3
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu

-- 
KDE Plasma Addons module packaging