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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit da46adb6a164494c331c5c186981f77352eb82d3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jan 15 22:53:15 2014 -0300

    Enable KWin EGLS.
    
    Remove the build-conflict against libgles2-mesa-dev and add it as a
    dependency.
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 65f9014..1d787fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ kde-workspace (4:4.11.3-4) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove extra comma in debian/changelog's Uploaders field.
+  * Enable EGLS version of KWin. This option may benefit some of our user base.
+    - Remove the build-conflict against libgles2-mesa-dev and add it as a
+      dependency.
 
   [ Dmitry Shachnev ]
   * Build-depend on libxcb-sync-dev instead of removed libxcb-sync0-dev.
diff --git a/debian/control b/debian/control
index f04f324..da135cd 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: cmake (>= 2.8.6),
                libdevstat-dev [kfreebsd-any],
                libdlrestrictions-dev (>= 0.14),
                libfontconfig-dev,
+               libgles2-mesa-dev,
                libglib2.0-dev,
                libglu1-mesa-dev,
                libgps-dev (>= 2.90),
@@ -77,7 +78,6 @@ Build-Depends: cmake (>= 2.8.6),
                shared-desktop-ontologies (>= 0.8),
                udev [linux-any],
                zlib1g-dev
-Build-Conflicts: libgles2-mesa-dev
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.5
 Homepage: http://www.kde.org/

-- 
KDE Base Workspace module packaging