[SCM] kwin packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.1-0ubuntu1-10-gd85e254

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Tue Sep 15 09:53:20 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit d85e2545d55d825464a40c34b19dc2e7dae34b6f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 15 10:53:17 2015 +0100

    Multi-archify the package
---
 debian/changelog           |  7 +++++++
 debian/control             | 20 ++++++++++++++++++++
 debian/kwin-common.install |  3 ---
 debian/kwin-data.install   |  3 +++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad5c298..2fa595b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kwin (4:5.4.80-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Harald Sitter ]
+  * Multi-archify the package
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 15 Sep 2015 10:52:54 +0100
+
 kwin (4:5.4.1-0ubuntu1) wily; urgency=medium
 
   * new upstream release
diff --git a/debian/control b/debian/control
index d208558..2c04de8 100644
--- a/debian/control
+++ b/debian/control
@@ -75,6 +75,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kwin.git
 Package: kwin-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: no
 Depends: kwin-common (= ${binary:Version}),
          libegl1-mesa-dev (>= 1.2~),
          libepoxy-dev (>= 1.2),
@@ -98,6 +99,7 @@ Description: KDE window manager - devel files
 
 Package: kwin-common
 Architecture: any
+Multi-Arch: same
 Depends: kwin-data (= ${source:Version}),
          qml-module-org-kde-kquickcontrolsaddons,
          qml-module-qtmultimedia,
@@ -120,6 +122,7 @@ Description: KDE window manager, common files
 
 Package: kwin-x11
 Architecture: any
+Multi-Arch: foreign
 Depends: kwin-common (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Provides: kwin
 Breaks: kwin (<< 4:5.3.2+git20150715)
@@ -137,6 +140,7 @@ Description: KDE window manager, X11 version
 
 Package: kwin-wayland
 Architecture: any
+Multi-Arch: foreign
 Depends: kwin-common (= ${binary:Version}),
          kwin-wayland-backend-drm (= ${binary:Version}) | kwin-wayland-backend-hwcomposer (= ${binary:Version}) | kwin-wayland-backend,
          ${misc:Depends},
@@ -158,6 +162,7 @@ Description: KDE window manager, wayland version
 Package: libkwin4-effect-builtins1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE window manager effect builtins library
  KWin (pronounced as one syllable "kwin") is the window
@@ -173,6 +178,7 @@ Description: KDE window manager effect builtins library
 Package: libkwineffects7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libkwineffects5 (<< 4:5.2.0), libkwineffects6 (<< 4:5.4.1+git20150907)
 Replaces: libkwineffects5 (<< 4:5.2.0),
@@ -191,6 +197,7 @@ Description: KDE window manager effects library
 Package: libkwinglutils7
 Section: libs
 Architecture: amd64 arm64 i386 powerpc ppc64el
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libkwinglutils5 (<< 4:5.2.0), libkwinglutils6 (<< 4:5.4.1+git20150907)
 Replaces: libkwinglutils5 (<< 4:5.2.0),
@@ -209,6 +216,7 @@ Description: KDE window manager gl utils library
 Package: libkwinglesutils7
 Section: libs
 Architecture: armhf
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libkwinglesutils5 (<< 4:5.2.0),
         libkwinglesutils6 (<< 4:5.4.1+git20150907)
@@ -228,6 +236,7 @@ Description: KDE window manager gl utils library
 Package: libkwinxrenderutils7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libkwinxrenderutils5 (<< 4:5.2.0),
         libkwinxrenderutils6 (<< 4:5.4.1+git20150907)
@@ -247,6 +256,7 @@ Description: KDE window manager render utils library
 Package: kwin-hwcomposer-backend
 Depends: kwin-wayland-backend-hwcomposer, ${misc:Depends}
 Architecture: all
+Multi-Arch: foreign
 Priority: extra
 Section: oldlibs
 Description: transitional dummy package
@@ -255,6 +265,7 @@ Description: transitional dummy package
 Package: kwin-wayland-backend-hwcomposer
 Section: libs
 Architecture: amd64 armhf i386
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)
 Replaces: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)
@@ -273,6 +284,7 @@ Description: KDE window manager hwcompositor plugin
 Package: kwin-wayland-backend-drm
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: kwin-wayland-backend
 Description: KDE window manager drm plugin
@@ -289,6 +301,7 @@ Description: KDE window manager drm plugin
 Package: kwin-wayland-backend-fbdev
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: kwin-wayland-backend
 Description: KDE window manager fbdev plugin
@@ -305,6 +318,7 @@ Description: KDE window manager fbdev plugin
 Package: kwin-wayland-backend-x11
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: kwin-wayland-backend
 Description: KDE window manager x11 plugin
@@ -321,6 +335,7 @@ Description: KDE window manager x11 plugin
 Package: kwin-wayland-backend-wayland
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: kwin-wayland-backend
 Description: KDE window manager nested wayland plugin
@@ -336,12 +351,15 @@ Description: KDE window manager nested wayland plugin
 
 Package: kwin-data
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: plasma-framework,
             qml-module-qtmultimedia,
             qml-module-qtquick-layouts,
             qml-module-qtquick-window2,
             qml-module-qtquick2
+Breaks: kwin-common (<< 4:5.4.1+git20150913)
+Replaces: kwin-common (<< 4:5.4.1+git20150913)
 Description: KDE window manager data files
  KWin (pronounced as one syllable "kwin") is the window
  manager for the KDE Plasma Desktop. It gives you complete
@@ -355,6 +373,7 @@ Description: KDE window manager data files
 
 Package: kwin
 Architecture: all
+Multi-Arch: foreign
 Depends: kwin-x11, ${misc:Depends}
 Priority: extra
 Section: oldlibs
@@ -366,6 +385,7 @@ Package: kwin-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Recommends: qtbase5-dbg
 Depends: kwin-x11 (= ${binary:Version}) | kwin-wayland (= ${binary:Version}),
          ${misc:Depends}
diff --git a/debian/kwin-common.install b/debian/kwin-common.install
index 2a2ea80..84021cf 100644
--- a/debian/kwin-common.install
+++ b/debian/kwin-common.install
@@ -1,6 +1,3 @@
-etc/xdg/aurorae.knsrc
-etc/xdg/kwin*.knsrc
-etc/xdg/org_kde_kwin.categories
 usr/lib/*/kconf_update_bin/kwin5_update_default_rules
 usr/lib/*/libexec/kwin*
 usr/lib/*/libkdeinit5_kwin_rules_dialog.so
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
index ce016df..fcd0db3 100644
--- a/debian/kwin-data.install
+++ b/debian/kwin-data.install
@@ -1,3 +1,6 @@
+etc/xdg/aurorae.knsrc
+etc/xdg/kwin*.knsrc
+etc/xdg/org_kde_kwin.categories
 usr/share/config.kcfg/kwin.kcfg
 usr/share/doc/*/*/kcontrol/
 usr/share/icons/*/*/apps/kwin.*

-- 
kwin packaging



More information about the pkg-kde-commits mailing list