[SCM] kinfocenter packaging branch, kubuntu_utopic_next, updated. 6e1ed94190a7363d593ffe19387d0514acbfb48c

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kinfocenter.git;a=commitdiff;h=e346f47

The following commit has been merged in the kubuntu_utopic_next branch:
commit e346f470d05c560d2920661f17c58cfac25d7c39
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Nov 7 13:38:52 2014 +0100

    wrap and sort
---
 debian/control             | 9 ++++-----
 debian/copyright           | 2 +-
 debian/kinfocenter.install | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index dfb14df..e7a5117 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cmake,
                kgendesignerplugin (>= 5.2.0),
                kinit-dev (>= 5.2.0),
                kio-dev (>= 5.2.0),
+               kwayland-dev (>= 5.0.95),
                libkf5attica-dev (>= 5.2.0),
                libkf5auth-dev (>= 5.2.0),
                libkf5bookmarks-dev (>= 5.2.0),
@@ -40,7 +41,6 @@ Build-Depends: cmake,
                libkf5widgetsaddons-dev (>= 5.2.0),
                libkf5windowsystem-dev (>= 5.2.0),
                libkf5xmlgui-dev (>= 5.2.0),
-               kwayland-dev (>= 5.0.95),
                libpci-dev,
                libraw1394-dev,
                pkg-config,
@@ -52,12 +52,11 @@ Homepage: https://projects.kde.org/projects/playground/libs/libkscreen
 
 Package: kinfocenter
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
- kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
+        kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3)
 Replaces: kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
- kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
+          kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3)
 Description: overview of your system library
  The kinfocenter provides you with a centralized and convenient
  overview of your system and desktop environment.
diff --git a/debian/copyright b/debian/copyright
index 7a3a969..97fd81e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -419,7 +419,7 @@ License: BSD-BY-LC-NE
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: Modules/opengl/openglconfig.h.cmake
-Copyright: 2011 Linaro Limited           
+Copyright: 2011 Linaro Limited
 License: LGPL-2+
  | This library is free software; you can redistribute it and/or modify it under
  | the terms of the GNU Library General Public License as published by the Free
diff --git a/debian/kinfocenter.install b/debian/kinfocenter.install
index 66f95c9..286d3c4 100644
--- a/debian/kinfocenter.install
+++ b/debian/kinfocenter.install
@@ -1,2 +1,2 @@
-usr/*
 etc/xdg/menus/kinfocenter.menu
+usr/*

-- 
kinfocenter packaging