[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=1652b05

The following commit has been merged in the master branch:
commit 1652b051c79ae642d89510165e4d90e98ebcb2c9
Author: Michał Zając <quintasan at kubuntu.org>
Date:   Fri Jan 21 22:19:47 2011 +0100

    * New upstream release
    * Merged debian/control
    * Refreshed *.install and not-installed files
    * Removed theme files from plasma-widget-lancelot.install as they are no
      longer there
---
 debian/changelog                          | 10 ++++++
 debian/control                            |  9 +++++
 debian/not-installed                      |  3 ++
 debian/plasma-containments-addons.install |  1 +
 debian/plasma-widget-lancelot.install     | 58 -------------------------------
 5 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fb04f4..a8a7aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kdeplasma-addons (4:4.6.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Merged debian/control
+  * Refreshed *.install and not-installed files
+  * Removed theme files from plasma-widget-lancelot.install as they are no
+    longer there
+
+ -- Michał Zając <quintasan at kubuntu.org>  Fri, 21 Jan 2011 22:18:07 +0100
+
 kdeplasma-addons (4:4.5.95-0ubuntu1) natty; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 6701d61..1069af9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,21 @@ Section: utils
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+<<<<<<< TREE
+Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
+ Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
+Build-Depends: kde-sc-dev-latest (>= 4:4.4.92),
+ cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), quilt, pkg-kde-tools (>= 0.6.4),
+ kdelibs5-dev (>= 4:4.5), kdepimlibs5-dev (>= 4:4.5), kdebase-workspace-dev (>= 4:4.5),
+ libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.4), python, libmarble-dev (>= 4:4.4),
+=======
 Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.5.90),
  cdbs (>= 0.4.51), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.9),
  kdelibs5-dev (>= 4:4.5.2-0ubuntu1), kdepimlibs5-dev (>= 4:4.5), kdebase-workspace-dev (>= 4:4.5),
  libqt4-opengl-dev, libboost1.42-dev, libkexiv2-dev (>= 4:4.5), python, libmarble-dev (>= 4:4.5),
+>>>>>>> MERGE-SOURCE
  libqimageblitz-dev, libeigen2-dev, libxrender-dev, shared-desktop-ontologies, libattica-dev,
  libxtst-dev, libqalculate-dev, libqwt5-qt4-dev, shared-mime-info, libglib2.0-dev, libqca2-dev,
  libxml2-dev
diff --git a/debian/not-installed b/debian/not-installed
index 3f38ee2..f437e57 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -102,6 +102,9 @@
 ./usr/include/lancelot/layouts/FullBorderLayout.h
 ./usr/include/lancelot/layouts/NodeLayout.h
 ./usr/include/lancelot/widgets/TabBar.h
+./usr/include/lancelot/widgets/CustomListView.h
+./usr/include/lancelot/widgets/ScrollBar.h
+./usr/include/lancelot/widgets/ScrollPane.h
 ./usr/lib/liblancelot-datamodels.so
 ./usr/share/kde4/apps/cmake/modules/FindLancelot.cmake
 ./usr/share/kde4/apps/cmake/modules/FindLancelot-Datamodels.cmake
diff --git a/debian/plasma-containments-addons.install b/debian/plasma-containments-addons.install
index 2780f2d..a13668e 100644
--- a/debian/plasma-containments-addons.install
+++ b/debian/plasma-containments-addons.install
@@ -1,6 +1,7 @@
 usr/share/kde4/services/plasma-containment-groupingdesktop.desktop
 usr/share/kde4/services/plasma-containment-groupingpanel.desktop
 usr/share/kde4/services/plasma-containment-griddesktop.desktop
+usr/lib/libplasma_groupingcontainment.so
 usr/lib/libplasma_groupingcontainment.so.4
 usr/lib/libplasma_groupingcontainment.so.4.6.0
 usr/lib/kde4/plasma_containment_groupingpanel.so
diff --git a/debian/plasma-widget-lancelot.install b/debian/plasma-widget-lancelot.install
index 64b7750..3e65198 100644
--- a/debian/plasma-widget-lancelot.install
+++ b/debian/plasma-widget-lancelot.install
@@ -77,62 +77,4 @@ usr/share/kde4/apps/lancelot/lancelot.notifyrc
 usr/share/kde4/services/plasma-applet-lancelot-launcher.desktop
 usr/share/kde4/services/plasma-applet-lancelot-part.desktop
 usr/share/mime/packages/lancelotpart-mime.xml
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/section-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/action-list-view-headers.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/theme.config
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/category-triangle.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/system-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/section-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/action-list-view-headers.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/theme.config
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/category-triangle.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/lancelot-context.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/lancelot-context-extender.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-inactivebuttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz
-usr/share/kde4/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/system-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/section-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/action-list-view-headers.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/theme.config
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/category-triangle.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/lancelot-context.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/lancelot-context-extender.svgz
-usr/share/kde4/apps/desktoptheme/Androbit/lancelot/passageway-view-inactivebuttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/system-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/section-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/action-list-view-drop-indicator.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/action-list-view-headers.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/theme.config
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/category-triangle.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/system-buttons-extender.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/extender-button-icon.svgz
-usr/share/kde4/apps/desktoptheme/Tibanna/lancelot/passageway-view-inactivebuttons.svgz
 usr/share/kde4/services/lancelot.desktop

-- 
KDE Plasma Addons module packaging