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

The following commit has been merged in the master branch:
commit 7ab9741e2a61329bb811dd31c270605e188c341b
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sun Dec 6 01:14:58 2009 -0500

      [ Scott Kitterman ]
      * Bump KDE build depends to 4.3.80 or later
      * Switch to boost 1.40
      * Clean up commented out entry in debian/plasma-widget-lancelot.install
      * Remove left over generated files from debian dir
      * liblancelot0 to liblancelot1 transition
        - Change library package name in debian/control
        - Update liblancelot-dev depends
        - Rename install file
        - Update kdeplasma-addons-dbg depend
---
 debian/changelog                      | 17 ++++++++++++++---
 debian/control                        | 10 +++++-----
 debian/installgen                     | 21 ---------------------
 debian/liblancelot0.install           |  2 --
 debian/plasma-widget-lancelot.install |  1 -
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46ab836..1a48330 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,25 @@
-kdeplasma-addons (4:4.3.80-0ubuntu1~ppa1) lucid; urgency=low
+kdeplasma-addons (4:4.3.80-0ubuntu1~ppa4) lucid; urgency=low
 
+  [ Michał Zając ]
   * New upstream beta
-  * Bump on Build-Depends
   * Changes in install files.
   * Dropped netbook patch, already implemented upstream
   * 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
 
- -- Michał Zając <michal.zajac at gmail.com>  Sun, 06 Dec 2009 02:48:11 +0100
+  [ Scott Kitterman ]
+  * Bump KDE build depends to 4.3.80 or later
+  * Switch to boost 1.40
+  * Clean up commented out entry in debian/plasma-widget-lancelot.install
+  * Remove left over generated files from debian dir
+  * liblancelot0 to liblancelot1 transition
+    - Change library package name in debian/control
+    - Update liblancelot-dev depends
+    - Rename install file
+    - Update kdeplasma-addons-dbg depends
+
+ -- 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 73e197e..8176dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  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.4), kdepimlibs5-dev (>= 4:4.3.4), libqt4-opengl-dev,
- kdebase-workspace-dev (>= 4:4.3.4), libboost1.38-dev, libkexiv2-7-dev, python, libmarble-dev (>> 4:4.3.0),
+ 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
 Standards-Version: 3.8.3
@@ -99,7 +99,7 @@ Description: addons for KDE 4 Plasma - lancelot widget
  .
  This package is part of the KDE 4 plasma addons module.
 
-Package: liblancelot0
+Package: liblancelot1
 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: liblancelot0 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:liblancelot0}
+Depends: liblancelot1 (= ${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}),
- liblancelot0 (= ${binary:Version}), plasma-wallpapers-addons (= ${binary:Version}), kdebase-workspace-dbg
+ liblancelot1 (= ${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/installgen b/debian/installgen
deleted file mode 100644
index e87d7a7..0000000
--- a/debian/installgen
+++ /dev/null
@@ -1,21 +0,0 @@
-[liblancelot-dev]
-from:/applets/lancelot/ dst:usr/include/lancelot
-from:/applets/lancelot/ dst:usr/lib/liblancelot.so$ link:
-
-[useless-dev_virtual]
-miss dst:usr/lib/lib[^/]+.so$ link:
-
-[liblancelot0]
-from:/applets/lancelot/ dst:usr/lib/liblancelot.so.0($|\.)
-
-[plasma-widget-lancelot]
-from:/applets/lancelot/
-
-[plasma-widgets-addons]
-from:/applets/
-
-[plasma-dataengines-addons]
-from:/dataengines/
-
-[plasma-runners-addons]
-from:/runners/
diff --git a/debian/liblancelot0.install b/debian/liblancelot0.install
deleted file mode 100644
index face569..0000000
--- a/debian/liblancelot0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/liblancelot.so.0
-usr/lib/liblancelot.so.1.7.0
diff --git a/debian/plasma-widget-lancelot.install b/debian/plasma-widget-lancelot.install
index 746b8a8..ab30ecd 100644
--- a/debian/plasma-widget-lancelot.install
+++ b/debian/plasma-widget-lancelot.install
@@ -60,7 +60,6 @@ usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-items-extende
 usr/share/kde4/apps/desktoptheme/default/lancelot/action-list-view-items.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/extender-button-icon.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/inner-background.svgz
-#usr/share/kde4/apps/desktoptheme/default/lancelot/main-background.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-buttons-extender.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-buttons.svgz
 usr/share/kde4/apps/desktoptheme/default/lancelot/passageway-view-inactivebuttons.svgz

-- 
KDE Plasma Addons module packaging