[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=6c0a49e

The following commit has been merged in the master branch:
commit 6c0a49eaabca7f3a7bb0d8d2e68ea9e49a8c26e6
Author: unknown <michal.zajac at gmail.com>
Date:   Sun Dec 6 14:13:59 2009 +0100

    Added two libs in liblancelot-dev.install. ${sameVersionDep:kdelibs5-dev:liblancelot1} has been removed from debian/control. Added shared-desktop-ontologies as a Build-Depend.
---
 debian/changelog               | 6 +++++-
 debian/control                 | 4 ++--
 debian/liblancelot-dev.install | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73f729c..a3564ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
   * Commented out social from the start patch, needs rewriting, it causes FTBFS
   * Added 99_fix_ftbfs_on_marble_wallpaper.diff
   * Dropped plasma-dataengines-dev since no files are produced
+  * Added two libs in liblancelot-dev.install
+  * ${sameVersionDep:kdelibs5-dev:liblancelot1} has been removed from
+    debian/control
+  * Added shared-desktop-ontologies as a Build-Depend
 
   [ Scott Kitterman ]
   * Bump KDE build depends to 4.3.80 or later
@@ -20,7 +24,7 @@ kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
     - Update kdeplasma-addons-dbg depends
     - Update debian/rules
 
- -- Scott Kitterman <scott at kitterman.com>  Sat, 05 Dec 2009 23:30:01 -0500
+ -- Michał Zając <michal.zajac at gmail.com>  Sun, 06 Dec 2009 14:11:42 +0100
 
 kdeplasma-addons (4:4.3.3-0ubuntu1) lucid; urgency=low
 
diff --git a/debian/control b/debian/control
index 34a8c13..418515e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.
  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),
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, libattica-dev, libxtst-dev,
- libmarble-dev
+ libmarble-dev, shared-desktop-ontologies
 Standards-Version: 3.8.3
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu
@@ -122,7 +122,7 @@ Architecture: any
 Section: libdevel
 Replaces: kdeplasma-addons-dev
 Conflicts: kdeplasma-addons-dev
-Depends: liblancelot1 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:liblancelot1}
+Depends: liblancelot1 (= ${binary:Version})
 Description: development headers for liblancelot
  Liblancelot is a base framework for everything in the world of Lancelot.
  It is built on top of Plasma. It provides a set of custom widgets, layouts
diff --git a/debian/liblancelot-dev.install b/debian/liblancelot-dev.install
index 7430b5b..9bdbe81 100644
--- a/debian/liblancelot-dev.install
+++ b/debian/liblancelot-dev.install
@@ -21,3 +21,6 @@ usr/include/lancelot/widgets/PopupMenu.h
 usr/include/lancelot/widgets/ResizeBordersPanel.h
 usr/include/lancelot/widgets/Widget.h
 usr/lib/liblancelot.so
+usr/lib/liblancelot.so.0
+usr/lib/liblancelot.so.1.7.0
+

-- 
KDE Plasma Addons module packaging