[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=62ca579

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

    Merged the debian/control...
---
 debian/control | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 1069af9..ce37c06 100644
--- a/debian/control
+++ b/debian/control
@@ -3,25 +3,15 @@ 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),
+Build-Depends: kde-sc-dev-latest (>= 4:4.6.0),
  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
-#libscim-dev
+ libxml2-dev, libscim-dev
 Standards-Version: 3.8.4
 Homepage: http://plasma.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdeplasma-addons/ubuntu

-- 
KDE Plasma Addons module packaging