[SCM] libkscreen packaging branch, master, updated. debian/1.0.3-1-9-g8e73932

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8f9e3e05bc8bbf8651245090a24274d357eab134
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Jul 12 12:13:43 2014 +0200

    Remove upstream patches
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  2 --
 debian/patches/upstream_01_Fix-crash.patch         | 29 --------------------
 ...-when-printing-a-null-KScreen-Output-from.patch | 31 ----------------------
 4 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ff3322..531b7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ libkscreen (1.0.4-1) UNRELEASED; urgency=medium
 
   [ Maximiliano Curia ]
   * New upstream release.
+  * Remove upstream patch: upstream_01_Fix-crash.patch
+  * Remove upstream patch: upstream_02_Don-t-crash-when-printing-a-null-
+    KScreen-Output-from.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Jul 2014 16:59:26 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 29305a0..8920961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 libdir.diff
 plugins_in_ma_paths.diff
-upstream_01_Fix-crash.patch
-upstream_02_Don-t-crash-when-printing-a-null-KScreen-Output-from.patch
diff --git a/debian/patches/upstream_01_Fix-crash.patch b/debian/patches/upstream_01_Fix-crash.patch
deleted file mode 100644
index 8f97873..0000000
--- a/debian/patches/upstream_01_Fix-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 221dff2e2f9fbd1c18eae9b59f23b1dbbdb1870b Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Mon, 5 May 2014 15:13:25 +0200
-Subject: [PATCH 1/2] Fix crash
-
-If we don't have a primary output, don't query it. Set a new primary
-output instead.
-
-Reviewed by Alex Fiestas
----
- backends/xrandr/xrandrconfig.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/backends/xrandr/xrandrconfig.cpp b/backends/xrandr/xrandrconfig.cpp
-index 0236a3a..a842173 100644
---- a/backends/xrandr/xrandrconfig.cpp
-+++ b/backends/xrandr/xrandrconfig.cpp
-@@ -157,7 +157,7 @@ void XRandRConfig::updateKScreenConfig(Config *config) const
-         output->updateKScreenOutput(kscreenOutput);
-     }
- 
--    if (config->primaryOutput()->id() != m_primaryOutput) {
-+    if (!config->primaryOutput() || config->primaryOutput()->id() != m_primaryOutput) {
-         config->setPrimaryOutput(config->output(m_primaryOutput));
-     }
- }
--- 
-2.0.0.rc2
-
diff --git a/debian/patches/upstream_02_Don-t-crash-when-printing-a-null-KScreen-Output-from.patch b/debian/patches/upstream_02_Don-t-crash-when-printing-a-null-KScreen-Output-from.patch
deleted file mode 100644
index c32c14d..0000000
--- a/debian/patches/upstream_02_Don-t-crash-when-printing-a-null-KScreen-Output-from.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 31f07fd26e6091dfd37c54fef3352a95182e5bba Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Tue, 6 May 2014 15:55:16 +0200
-Subject: [PATCH 2/2] Don't crash when printing a null KScreen::Output* from
- qDebug
-
-Reviewed by Alex Fiestas
----
- src/output.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/output.cpp b/src/output.cpp
-index acb918f..85e328c 100644
---- a/src/output.cpp
-+++ b/src/output.cpp
-@@ -425,7 +425,11 @@ void Output::setSizeMm(const QSize &size)
- 
- QDebug operator<<(QDebug dbg, const KScreen::Output *output)
- {
--    dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")";
-+    if(output) {
-+        dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")";
-+    } else {
-+        dbg << "KScreen::Output(NULL)";
-+    }
-     return dbg;
- }
- 
--- 
-2.0.0.rc2
-

-- 
libkscreen packaging