[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.7-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b55b77f70166cb3f655170235f4210c78ebee15b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Mar 2 11:21:50 2014 +0100

    Remove upstream patch: upstream_explicitly_request_a_window-drawable
---
 debian/changelog                                     |  1 +
 debian/patches/series                                |  1 -
 .../upstream_explicitly_request_a_window-drawable    | 20 --------------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77c4bef..0ad7d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kde-workspace (4:4.11.7-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * New patch: effect_gles_link_against_gles
+  * Remove upstream patch: upstream_explicitly_request_a_window-drawable
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 02 Mar 2014 11:20:51 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index ab1c574..4d9e8fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,5 +22,4 @@ add_kdefakes_for_strlcpy_and_strlcat.diff
 krunner_iceweasel_bookmarks.patch
 kubuntu_kcm_display_add_kscreen.diff
 kubuntu_no_krandr.diff
-upstream_explicitly_request_a_window-drawable
 effect_gles_link_against_gles
diff --git a/debian/patches/upstream_explicitly_request_a_window-drawable b/debian/patches/upstream_explicitly_request_a_window-drawable
deleted file mode 100644
index 338ee26..0000000
--- a/debian/patches/upstream_explicitly_request_a_window-drawable
+++ /dev/null
@@ -1,20 +0,0 @@
-commit ea7653821e83dc691ebcf8254c03eedc82c02d5f
-Author: Ralf Jung <post at ralfj.de>
-Date:   Fri Feb 21 17:42:40 2014 +0100
-
-    Explicitly request a Window-drawable
-    
-    REVIEW: 115937
-
-diff --git a/kwin/glxbackend.cpp b/kwin/glxbackend.cpp
-index ef2a989..172b32a 100644
---- a/kwin/glxbackend.cpp
-+++ b/kwin/glxbackend.cpp
-@@ -265,6 +265,7 @@ bool GlxBackend::initFbConfig()
- {
-     const int attribs[] = {
-         GLX_RENDER_TYPE,    GLX_RGBA_BIT,
-+        GLX_DRAWABLE_TYPE,  GLX_WINDOW_BIT,
-         GLX_RED_SIZE,       1,
-         GLX_GREEN_SIZE,     1,
-         GLX_BLUE_SIZE,      1,

-- 
KDE Base Workspace module packaging