[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.3-3-10-g38197ba

Maximiliano Curia maxy at moszumanska.debian.org
Mon Jan 27 13:00:09 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=38197ba

The following commit has been merged in the master branch:
commit 38197bac33e7f63d6da34c8b93f4610d821455d0
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jan 27 12:03:03 2014 +0100

    Split libkwinglesutils package.
---
 debian/changelog                  |  1 +
 debian/control                    | 13 ++++++++++++-
 debian/kde-window-manager.install | 13 +++----------
 debian/kde-workspace-dev.install  |  2 +-
 debian/libkwinglesutils1.install  |  2 ++
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 317b87b..2838935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ kde-workspace (4:4.11.5-1) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * Add autopkgtests.
   * Add abi-compliance-checker info.
+  * Split libkwinglesutils package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 12 Jan 2014 21:12:20 -0300
 
diff --git a/debian/control b/debian/control
index 2a8c992..d01961a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: cmake (>= 2.8.6),
                libdevstat-dev [kfreebsd-any],
                libdlrestrictions-dev (>= 0.14),
                libfontconfig-dev,
-               libgles2-mesa-dev,
+               libgles2-mesa-dev [!hurd-i386 !m68k !powerpcspe !x32],
                libglib2.0-dev,
                libglu1-mesa-dev,
                libgps-dev (>= 2.90),
@@ -604,6 +604,17 @@ Description: library with OpenGL utilities for the KDE window manager
  .
  This package is part of the KDE base workspace module.
 
+Package: libkwinglesutils1
+Section: libs
+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sh4 sparc
+X-Debian-ABI: 0
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: library with OpenGL/ES utilities for the KDE window manager
+ This package contains a library with OpenGL/ES utilities used by the KDE
+ window manager.
+ .
+ This package is part of the KDE base workspace module.
+
 Package: libplasmagenericshell4
 Section: libs
 Architecture: any
diff --git a/debian/kde-window-manager.install b/debian/kde-window-manager.install
index 3a6f5c1..5011476 100644
--- a/debian/kde-window-manager.install
+++ b/debian/kde-window-manager.install
@@ -1,5 +1,4 @@
-usr/bin/kwin
-usr/bin/kwin_gles
+usr/bin/kwin*
 usr/lib/kconf_update_bin/kwin_update_default_rules
 usr/lib/kconf_update_bin/kwin_update_settings_410
 usr/lib/kconf_update_bin/kwin_update_settings_411
@@ -29,19 +28,13 @@ usr/lib/kde4/kwin3_aurorae.so
 usr/lib/kde4/kwin3_b2.so
 usr/lib/kde4/kwin3_laptop.so
 usr/lib/kde4/kwin3_oxygen.so
-usr/lib/kde4/kwin4_effect_builtins.so
-usr/lib/kde4/kwin4_effect_gles_builtins.so
+usr/lib/kde4/kwin4_effect_*builtins.so
 usr/lib/kde4/kwin_b2_config.so
 usr/lib/kde4/kwin_oxygen_config.so
 usr/lib/kde4/libexec/kwin_killer_helper
 usr/lib/kde4/libexec/kwin_opengl_test
 usr/lib/kde4/libexec/kwin_rules_dialog
-usr/lib/libkdeinit4_kwin.so
-usr/lib/libkdeinit4_kwin_gles.so
-usr/lib/libkdeinit4_kwin_rules_dialog.so
-usr/lib/libkwinglesutils.so
-usr/lib/libkwinglesutils.so.1
-usr/lib/libkwinglesutils.so.1.0.0
+usr/lib/libkdeinit4_kwin*.so
 usr/share/doc/kde/HTML/*/kcontrol/desktop/
 usr/share/doc/kde/HTML/*/kcontrol/kwincompositing/
 usr/share/doc/kde/HTML/*/kcontrol/kwindecoration/
diff --git a/debian/kde-workspace-dev.install b/debian/kde-workspace-dev.install
index 4ecb504..1185851 100644
--- a/debian/kde-workspace-dev.install
+++ b/debian/kde-workspace-dev.install
@@ -65,7 +65,7 @@ usr/lib/libkscreensaver.so
 usr/lib/libksgrd.so
 usr/lib/libksignalplotter.so
 usr/lib/libkwineffects.so
-usr/lib/libkwinglutils.so
+usr/lib/libkwingl*utils.so
 usr/lib/libkworkspace.so
 usr/lib/liblsofui.so
 usr/lib/libplasma-geolocation-interface.so
diff --git a/debian/libkwinglesutils1.install b/debian/libkwinglesutils1.install
new file mode 100644
index 0000000..8c13a89
--- /dev/null
+++ b/debian/libkwinglesutils1.install
@@ -0,0 +1,2 @@
+usr/lib/libkwinglesutils.so.1
+usr/lib/libkwinglesutils.so.1.*

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list