[SCM] kwin packaging branch, kubuntu_utopic_next, updated. 95a244437428794d0d22570dc5d69154d9fec51b

[Harald Sitter]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 95a244437428794d0d22570dc5d69154d9fec51b
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 7 09:36:49 2014 +0200

    wrap and sort
---
 debian/control           | 2 +-
 debian/copyright         | 4 ++--
 debian/kwin-data.install | 6 +++---
 debian/kwin.install      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 3628068..a3a9839 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cmake,
                kinit-dev ( >= 5.2.0),
                kinit-dev (>= 5.2.0),
                kio-dev (>= 5.2.0),
+               kwayland-dev,
                libegl1-mesa-dev,
                libepoxy-dev (>= 1.2),
                libice-dev,
@@ -56,7 +57,6 @@ Build-Depends: cmake,
                libqt5x11extras5-dev,
                libsm-dev,
                libwayland-dev,
-               kwayland-dev,
                libx11-xcb-dev,
                libxcb-composite0-dev,
                libxcb-damage0-dev,
diff --git a/debian/copyright b/debian/copyright
index 2fff1ce..9796c27 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -324,7 +324,7 @@ License: GPL-2.0+
 
 Files: kcmkwin/kwincompositing/test/modeltest.cpp
        kcmkwin/kwincompositing/test/modeltest.h
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies).    
+Copyright: 2013 Digia Plc and/or its subsidiary(-ies).
 License: LGPL-2.1 or GPL-3
  ** Commercial License Usage
  ** Licensees holding valid commercial Qt licenses may use this file in
@@ -397,7 +397,7 @@ Files: paintredirector.cpp
        libkdecorations/* excluding:
         -? libkdecorations/CMakeLists.txt
 Copyright: 2003, 2009 Lubos Lunak <l.lunak at kde.org>
-           2012 Martin Gräßlin <mgraesslin at kde.org>          
+           2012 Martin Gräßlin <mgraesslin at kde.org>
            2005 Sandro Giessl <sandro at giessl.com>
            1999, 2000    Daniel M. Duley <mosfet at kde.org>
 License: MIT
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
index b6cf7cc..fd685af 100644
--- a/debian/kwin-data.install
+++ b/debian/kwin-data.install
@@ -1,9 +1,9 @@
-usr/share/icons/
-usr/share/kwin/
+usr/share/config.kcfg/
 usr/share/doc/
+usr/share/icons/
 usr/share/knotifications5/
 usr/share/kservices5/
 usr/share/kservicetypes5/
+usr/share/kwin/
 usr/share/kwincompositing/
-usr/share/config.kcfg/
 usr/share/locale/
diff --git a/debian/kwin.install b/debian/kwin.install
index a20488f..12ec54b 100644
--- a/debian/kwin.install
+++ b/debian/kwin.install
@@ -2,6 +2,6 @@ etc/xdg
 usr/bin
 usr/lib/*/kconf_update_bin
 usr/lib/*/libexec
-usr/lib/*/qt5
 usr/lib/*/libkdeinit5_kwin_*.so
 usr/lib/*/libkwin.so.5*
+usr/lib/*/qt5

-- 
kwin packaging