[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=b09ecf4

The following commit has been merged in the master branch:
commit b09ecf4389068f0bd180dadb37f426d79aa50ee1
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sun Dec 6 21:59:25 2009 -0500

    kdeplasma-addons (4:4.3.80-0ubuntu2) lucid; urgency=low
    
      [ Michał Zając ]
      * Added shared-desktop-ontologies as a Build-Depend
    
      [ Scott Kitterman ]
      * Revert mistaken liblancelot1 transition and return to liblancelot0
    
     -- Scott Kitterman <scott at kitterman.com>  Sun, 06 Dec 2009 21:42:35 -0500
---
 debian/changelog               | 12 ++++++------
 debian/control                 |  6 +++---
 debian/liblancelot-dev.install |  3 ---
 debian/liblancelot0.install    |  2 ++
 debian/rules                   |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e78e346..fedc579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
 kdeplasma-addons (4:4.3.80-0ubuntu2) lucid; urgency=low
 
-  * Added two libs in liblancelot-dev.install
-  * ${sameVersionDep:kdelibs5-dev:liblancelot1} has been removed from
-    debian/control
+  [ Michał Zając ]
   * Added shared-desktop-ontologies as a Build-Depend
 
- -- Michał Zając <michal.zajac at gmail.com>  Sun, 06 Dec 2009 15:12:49 +0100
+  [ Scott Kitterman ]
+  * Revert mistaken liblancelot1 transition and return to liblancelot0
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 06 Dec 2009 21:42:35 -0500
 
 kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
 
@@ -17,7 +18,6 @@ kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
   * Added 99_fix_ftbfs_on_marble_wallpaper.diff
   * Dropped plasma-dataengines-dev since no files are produced
 
-
   [ Scott Kitterman ]
   * Bump KDE build depends to 4.3.80 or later
   * Switch to boost 1.40
@@ -30,7 +30,7 @@ kdeplasma-addons (4:4.3.80-0ubuntu1) lucid; urgency=low
     - Update kdeplasma-addons-dbg depends
     - Update debian/rules
 
- -- Michał Zając <michal.zajac at gmail.com>  Sun, 06 Dec 2009 14:11:42 +0100
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 05 Dec 2009 23:30:01 -0500
 
 kdeplasma-addons (4:4.3.3-0ubuntu1) lucid; urgency=low
 
diff --git a/debian/control b/debian/control
index 418515e..41abd3e 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Description: addons for KDE 4 Plasma - lancelot widget
  .
  This package is part of the KDE 4 plasma addons module.
 
-Package: liblancelot1
+Package: liblancelot0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -122,7 +122,7 @@ Architecture: any
 Section: libdevel
 Replaces: kdeplasma-addons-dev
 Conflicts: kdeplasma-addons-dev
-Depends: liblancelot1 (= ${binary:Version})
+Depends: liblancelot0 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:liblancelot0}
 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
@@ -145,7 +145,7 @@ Conflicts: kdeplasmoids-dbg
 Replaces: kdeplasmoids-dbg
 Depends: plasma-widgets-addons (= ${binary:Version}), plasma-dataengines-addons (= ${binary:Version}),
  plasma-runners-addons (= ${binary:Version}), plasma-widget-lancelot (= ${binary:Version}),
- liblancelot1 (= ${binary:Version}), plasma-wallpapers-addons (= ${binary:Version}), kdebase-workspace-dbg
+ liblancelot0 (= ${binary:Version}), plasma-wallpapers-addons (= ${binary:Version}), kdebase-workspace-dbg
 Description: debugging symbols for kdeplasma-addons
  This package contains the debugging symbols associated with kdeplasma-addons.
  They will automatically be used by gdb for debugging kdeplasma-addons related
diff --git a/debian/liblancelot-dev.install b/debian/liblancelot-dev.install
index 9bdbe81..7430b5b 100644
--- a/debian/liblancelot-dev.install
+++ b/debian/liblancelot-dev.install
@@ -21,6 +21,3 @@ 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
-
diff --git a/debian/liblancelot0.install b/debian/liblancelot0.install
new file mode 100644
index 0000000..face569
--- /dev/null
+++ b/debian/liblancelot0.install
@@ -0,0 +1,2 @@
+usr/lib/liblancelot.so.0
+usr/lib/liblancelot.so.1.7.0
diff --git a/debian/rules b/debian/rules
index ace0706..77bfd7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
-DEB_DH_MAKESHLIBS_ARGS_liblancelot1 := -V
+DEB_DH_MAKESHLIBS_ARGS_liblancelot0 := -V
 
 clean::
 	find applets/lancelot/tools/puck -name *.pyc -delete

-- 
KDE Plasma Addons module packaging