[SCM] KDE Base Workspace module packaging branch, kde4.8, updated. debian/4.7.4-2-28-ge0617f1

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.8 branch:
commit 12c0163e85379309752579c423429ce122d3e07a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun Apr 8 18:49:58 2012 +0200

    Drop kwin gles compositing.
---
 debian/changelog                  |    2 ++
 debian/control                    |    3 ++-
 debian/kde-window-manager.install |    5 -----
 debian/kde-workspace-dev.install  |    1 -
 debian/not-installed              |    1 -
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9410ac..444b8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ kde-workspace (4:4.8.2-0r1) UNRELEASED; urgency=low
     - libtaskmanager4abi2 -> libtaskmanager4abi3
     - libkworkspace4 -> libkworkspace4abi1
     - libkwineffects1abi2 -> libkwineffects1abi3
+  * Drop libgles2-mesa-dev [linux-any kfreebsd-any] build dependency for now and
+    add it to Build-Conflicts, this disables Open GL ES compositing in kwin.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Jan 2012 18:52:11 +0100
 
diff --git a/debian/control b/debian/control
index 3bf0728..29c7c4e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.8.2),
  libdbusmenu-qt-dev (>= 0.6.0),
  libfontconfig-dev,
  libggadget-1.0-dev (>= 0.11.2), libggadget-qt-1.0-dev (>= 0.11.2),
- libglu1-mesa-dev, libqt4-opengl-dev, libgles2-mesa-dev [linux-any kfreebsd-any],
+ libglu1-mesa-dev, libqt4-opengl-dev,
  python-dev (>= 2.6.6-3~),
  shared-desktop-ontologies (>= 0.8),
  libpam0g-dev,
@@ -33,6 +33,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.8.2),
  libqalculate-dev, libglib2.0-dev,
  libqtwebkit-dev,
  libprison-dev
+Build-Conflicts: libgles2-mesa-dev
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
 Homepage: http://www.kde.org/
diff --git a/debian/kde-window-manager.install b/debian/kde-window-manager.install
index 1ea8e44..b7a828d 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/lib/kconf_update_bin/kwin_update_default_rules
 usr/lib/kconf_update_bin/kwin_update_tabbox_qml_settings
 usr/lib/kconf_update_bin/kwin_update_tabbox_settings
@@ -19,7 +18,6 @@ usr/lib/kde4/kwin3_oxygen.so
 usr/lib/kde4/kwin3_plastik.so
 usr/lib/kde4/kwin3_tabstrip.so
 usr/lib/kde4/kwin4_effect_builtins.so
-usr/lib/kde4/kwin4_effect_gles_builtins.so
 usr/lib/kde4/kwin_b2_config.so
 usr/lib/kde4/kwin_oxygen_config.so
 usr/lib/kde4/kwin_plastik_config.so
@@ -28,10 +26,7 @@ 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.1
-usr/lib/libkwinglesutils.so.1.0.0
 usr/lib/libkwinglutils.so.1
 usr/lib/libkwinglutils.so.1.0.0
 usr/lib/libkwinnvidiahack.so.4
diff --git a/debian/kde-workspace-dev.install b/debian/kde-workspace-dev.install
index ad17b84..276f555 100644
--- a/debian/kde-workspace-dev.install
+++ b/debian/kde-workspace-dev.install
@@ -108,7 +108,6 @@ usr/lib/libkscreensaver.so
 usr/lib/libksgrd.so
 usr/lib/libksignalplotter.so
 usr/lib/libkwineffects.so
-usr/lib/libkwinglesutils.so
 usr/lib/libkwinglutils.so
 usr/lib/libkworkspace.so
 usr/lib/liblsofui.so
diff --git a/debian/not-installed b/debian/not-installed
index 94b37be..5732ba6 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -422,7 +422,6 @@
 ./usr/lib/libkdeinit4_ksmserver.so
 ./usr/lib/libkdeinit4_ksysguard.so
 ./usr/lib/libkdeinit4_kwin.so
-./usr/lib/libkdeinit4_kwin_gles.so
 ./usr/lib/libkdeinit4_kwin_rules_dialog.so
 ./usr/lib/libkdeinit4_plasma-desktop.so
 ./usr/lib/libkdeinit4_plasma-netbook.so

-- 
KDE Base Workspace module packaging