[SCM] kwindowsystem packaging branch, kubuntu_unstable, updated. cd01b87e60b5dd6863a4896af4c5440635bfffb4

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwindowsystem.git;a=commitdiff;h=cd01b87

The following commit has been merged in the kubuntu_unstable branch:
commit cd01b87e60b5dd6863a4896af4c5440635bfffb4
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Oct 10 17:38:21 2014 +0200

    drop upstream applied patches
---
 debian/patches/series                              |  1 -
 ...pstream_fix-incorrect-count-of-netwm-atoms.diff | 30 ----------------------
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3bf2c96..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_fix-incorrect-count-of-netwm-atoms.diff
diff --git a/debian/patches/upstream_fix-incorrect-count-of-netwm-atoms.diff b/debian/patches/upstream_fix-incorrect-count-of-netwm-atoms.diff
deleted file mode 100644
index aacef8e..0000000
--- a/debian/patches/upstream_fix-incorrect-count-of-netwm-atoms.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix incorrect count of netwm atoms
- The commit added 4 new atoms but only incremented the atom count by 3.
- Which can cause a crash as soon as the NET classes are used.
-Author: Martin Gräßlin
-Origin: upstream, https://git.reviewboard.kde.org/r/120539
-Bug: https://bugs.kde.org/show_bug.cgi?id=339771
-Last-Update: 2014-10-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/src/netwm.cpp b/src/netwm.cpp
-index 3107a2388c2fb3f1a8ad97e466be40e6977e064b..7b398d46e9da2c85a96ab67b6c0f97b22ceae4a3 100644
---- a/src/netwm.cpp
-+++ b/src/netwm.cpp
-@@ -386,7 +386,7 @@ static QByteArray get_atom_name(xcb_connection_t *c, xcb_atom_t atom)
- }
- #endif
- 
--static const int netAtomCount = 91;
-+static const int netAtomCount = 92;
- 
- static void create_netwm_atoms(xcb_connection_t *c)
- {
-@@ -498,6 +498,7 @@ static void create_netwm_atoms(xcb_connection_t *c)
-     };
- 
-     assert(!netwm_atoms_created);
-+    assert(sizeof(atoms)/sizeof(atoms[0]) == netAtomCount + 1);
- 
-     // Send the intern atom requests
-     xcb_intern_atom_cookie_t cookies[netAtomCount];

-- 
kwindowsystem packaging