[SCM] libkscreen packaging branch, master, updated. debian/1.0.5-1

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkscreen.git;a=commitdiff;h=41b50e9

The following commit has been merged in the master branch:
commit 41b50e9943520afad448b2c510fa3272dfeaf3c8
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Aug 9 11:43:07 2014 +0200

    Drop debian/patches/randr_documented_interface, fixed upstream.
---
 debian/changelog                          |  1 +
 debian/patches/randr_documented_interface | 28 ----------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6677c7a..5fe1670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libkscreen (1.0.5-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Fixes crash in configuration notification handling. (Closes: #755091)
+  * Drop debian/patches/randr_documented_interface, fixed upstream.
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 09 Aug 2014 11:35:25 +0200
 
diff --git a/debian/patches/randr_documented_interface b/debian/patches/randr_documented_interface
deleted file mode 100644
index a7a1225..0000000
--- a/debian/patches/randr_documented_interface
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: libkscreen/backends/xrandr1.1/xrandr11.cpp
-===================================================================
---- libkscreen.orig/backends/xrandr1.1/xrandr11.cpp	2014-07-12 12:08:27.774476050 +0200
-+++ libkscreen/backends/xrandr1.1/xrandr11.cpp	2014-07-12 12:15:44.817283597 +0200
-@@ -42,17 +42,15 @@
-  , m_currentConfig(0)
-  , m_currentTimestamp(0)
- {
--    xcb_generic_error_t *error = 0;
--    xcb_randr_query_version_reply_t* version;
--    version = xcb_randr_query_version_reply(connection(), xcb_randr_query_version(connection(), XCB_RANDR_MAJOR_VERSION, XCB_RANDR_MINOR_VERSION), &error);
--
--    if (!version || error) {
--        free(error);
-+    Display *display = QX11Info::display();
-+    int major_version, minor_version;
-+    Status status = XRRQueryVersion(display, &major_version, &minor_version);
-+    if (! status) {
-         qDebug() << "Can't get XRandR version";
-         return;
-     }
--    if (version->minor_version > 1) {
--        qDebug() << "This backend is only for XRandR 1.1, your version is: " << version->major_version << "." << version->minor_version;
-+    if ((major_version != 1) || (minor_version != 1)) {
-+        qDebug() << "This backend is only for XRandR 1.1, your version is: " << major_version << "." << minor_version;
-         return;
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6c8d85e..8920961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 libdir.diff
 plugins_in_ma_paths.diff
-randr_documented_interface

-- 
libkscreen packaging