[SCM] kwin packaging branch, master, updated. 0265db3829cef64d20e4de0460e7d29079e13b40

Maximiliano Curia maxy at moszumanska.debian.org
Wed Mar 25 09:48:53 UTC 2015 

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

The following commit has been merged in the master branch:
commit e8841bddf67f5cac1786bd30964c63c136e4720a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Mar 24 17:54:16 2015 +0100

    Split kwin package in common, x11 and wayland.
---
 debian/changelog                             |  1 +
 debian/control                               | 42 ++++++++++++++++++++++++++--
 debian/{kwin.install => kwin-common.install} |  3 +-
 debian/kwin-common.lintian-overrides         |  4 +++
 debian/kwin-wayland.install                  |  2 ++
 debian/kwin-wayland.lintian-overrides        |  4 +++
 debian/kwin-x11.install                      |  2 ++
 debian/kwin-x11.lintian-overrides            |  4 +++
 debian/kwin.lintian-overrides                | 10 -------
 9 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ee2553..e8fc684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kwin (4:5.2.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.2.1).
+  * Split kwin package in common, x11 and wayland.
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 21 Mar 2015 09:50:43 +0100
 
diff --git a/debian/control b/debian/control
index df7c35d..ba0c31b 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kwin.git
 Package: kwin-dev
 Section: libdevel
 Architecture: any
-Depends: kwin (= ${binary:Version}),
+Depends: kwin-common (= ${binary:Version}),
          libegl1-mesa-dev,
          libepoxy-dev (>= 1.2),
          libkf5coreaddons-dev (>= 5.3.0),
@@ -91,7 +91,7 @@ Description: KDE window manager - devel files
  .
  This package is part of the KDE base workspace module.
 
-Package: kwin
+Package: kwin-common
 Architecture: any
 Depends: kwin-data (= ${source:Version}),
          qml-module-qtmultimedia,
@@ -99,7 +99,43 @@ Depends: kwin-data (= ${source:Version}),
          ${shlibs:Depends}
 Recommends: libqt5multimedia5
 Suggests: kwin-addons
-Description: KDE window manager
+Breaks: kwin (<= 4:5.2.0.1-1)
+Replaces: kwin (<= 4:5.2.0.1-1)
+Description: KDE window manager, common files
+ KWin (pronounced as one syllable "kwin") is the window
+ manager for the KDE Plasma Desktop. It gives you complete
+ control over your windows, making sure they're not in the way
+ but aid you in your task. It paints the window decoration,
+ the bar on top of every window with (configurable) buttons
+ like close, maximize and minimize. It also handles placing
+ of windows and switching between them.
+ .
+ This package is part of the KDE base workspace module.
+
+Package: kwin-x11
+Architecture: any
+Depends: kwin-common (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: kwin
+Description: KDE window manager, X11 version
+ KWin (pronounced as one syllable "kwin") is the window
+ manager for the KDE Plasma Desktop. It gives you complete
+ control over your windows, making sure they're not in the way
+ but aid you in your task. It paints the window decoration,
+ the bar on top of every window with (configurable) buttons
+ like close, maximize and minimize. It also handles placing
+ of windows and switching between them.
+ .
+ This package is part of the KDE base workspace module.
+
+Package: kwin-wayland
+Architecture: any
+Depends: kwin-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Provides: kwin
+Description: KDE window manager, wayland version
  KWin (pronounced as one syllable "kwin") is the window
  manager for the KDE Plasma Desktop. It gives you complete
  control over your windows, making sure they're not in the way
diff --git a/debian/kwin.install b/debian/kwin-common.install
similarity index 88%
rename from debian/kwin.install
rename to debian/kwin-common.install
index 914d3bc..2129684 100644
--- a/debian/kwin.install
+++ b/debian/kwin-common.install
@@ -1,9 +1,8 @@
 etc/xdg/aurorae.knsrc
 etc/xdg/kwin*.knsrc
-usr/bin/kwin*
 usr/lib/*/kconf_update_bin/kwin5_update_default_rules
 usr/lib/*/libexec/kwin*
-usr/lib/*/libkdeinit5_kwin_*.so
+usr/lib/*/libkdeinit5_kwin_rules_dialog.so
 usr/lib/*/libkwin.so.5
 usr/lib/*/libkwin.so.5.*
 usr/lib/*/qt5/plugins/kcm_kwin*.so
diff --git a/debian/kwin-common.lintian-overrides b/debian/kwin-common.lintian-overrides
new file mode 100644
index 0000000..e1e8f51
--- /dev/null
+++ b/debian/kwin-common.lintian-overrides
@@ -0,0 +1,4 @@
+kwin-common: package-name-doesnt-match-sonames libkdeinit5-kwin-rules-dialog libkwin5
+kwin-common: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_rules_dialog.so usr/lib/*/libkdeinit5_kwin_rules_dialog.so
+kwin-common: dev-pkg-without-shlib-symlink usr/lib/*/libkwin.so
+kwin-common: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_rules_dialog.so libkdeinit5_kwin_rules_dialog.so
diff --git a/debian/kwin-wayland.install b/debian/kwin-wayland.install
new file mode 100644
index 0000000..a770911
--- /dev/null
+++ b/debian/kwin-wayland.install
@@ -0,0 +1,2 @@
+usr/bin/kwin_wayland
+usr/lib/*/libkdeinit5_kwin_wayland.so
diff --git a/debian/kwin-wayland.lintian-overrides b/debian/kwin-wayland.lintian-overrides
new file mode 100644
index 0000000..1593ffd
--- /dev/null
+++ b/debian/kwin-wayland.lintian-overrides
@@ -0,0 +1,4 @@
+kwin-wayland: package-name-doesnt-match-sonames libkdeinit5-kwin-wayland
+kwin-wayland: binary-without-manpage usr/bin/kwin_wayland
+kwin-wayland: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_wayland.so
+kwin-wayland: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_wayland.so libkdeinit5_kwin_wayland.so
diff --git a/debian/kwin-x11.install b/debian/kwin-x11.install
new file mode 100644
index 0000000..538e8fd
--- /dev/null
+++ b/debian/kwin-x11.install
@@ -0,0 +1,2 @@
+usr/bin/kwin_x11
+usr/lib/*/libkdeinit5_kwin_x11.so
diff --git a/debian/kwin-x11.lintian-overrides b/debian/kwin-x11.lintian-overrides
new file mode 100644
index 0000000..fcc8310
--- /dev/null
+++ b/debian/kwin-x11.lintian-overrides
@@ -0,0 +1,4 @@
+kwin-x11: package-name-doesnt-match-sonames libkdeinit5-kwin-x11
+kwin-x11: binary-without-manpage usr/bin/kwin_x11
+kwin-x11: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_x11.so
+kwin-x11: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_x11.so libkdeinit5_kwin_x11.so
diff --git a/debian/kwin.lintian-overrides b/debian/kwin.lintian-overrides
deleted file mode 100644
index fad6ea8..0000000
--- a/debian/kwin.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-kwin: package-name-doesnt-match-sonames libkdeinit5-kwin-rules-dialog libkdeinit5-kwin-wayland libkdeinit5-kwin-x11 libkwin5
-kwin: binary-without-manpage usr/bin/kwin_wayland
-kwin: binary-without-manpage usr/bin/kwin_x11
-kwin: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_rules_dialog.so usr/lib/*/libkdeinit5_kwin_rules_dialog.so
-kwin: dev-pkg-without-shlib-symlink usr/lib/*/libkwin.so.5.* usr/lib/*/libkwin.so
-kwin: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_wayland.so usr/lib/*/libkdeinit5_kwin_wayland.so
-kwin: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_x11.so usr/lib/*/libkdeinit5_kwin_x11.so
-kwin: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_rules_dialog.so libkdeinit5_kwin_rules_dialog.so
-kwin: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_wayland.so libkdeinit5_kwin_wayland.so
-kwin: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_x11.so libkdeinit5_kwin_x11.so

-- 
kwin packaging

More information about the pkg-kde-commits mailing list