[SCM] kgamma packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 6bb4562298148db7b96148971677e92f542c05df
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Apr 7 23:13:39 2013 +0000

    New upstream.
    
    * Add me to uploaders.
    * Bump build-deps.
    * Remove patch
---
 debian/changelog                                   |    9 ++++
 debian/control                                     |    6 +--
 debian/patches/series                              |    1 -
 ...x-crash-when-XVidExtWrap-is-not-available.patch |   50 --------------------
 4 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f86e1ac..6e65b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kgamma (4:4.10.2-1) experimental; urgency=low
+
+  * New upstream.
+  * Add me to uploaders.
+  * Bump build-deps.
+  * Remove patch merged upstream.
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 23:13:44 +0000
+
 kgamma (4:4.8.4-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 881965f..d6f4587 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: kgamma
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Eshat Cakar <info at eshat.de>
-Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
+Uploaders: Eshat Cakar <info at eshat.de>, Sune Vuorela <sune at debian.org>
+Build-Depends: kde-sc-dev-latest (>= 4:4.10),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.8), libxxf86vm-dev
+ kdelibs5-dev (>= 4:4.10), libxxf86vm-dev
 Standards-Version: 3.9.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kgamma.git
diff --git a/debian/patches/series b/debian/patches/series
index b4726e5..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch
diff --git a/debian/patches/upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch b/debian/patches/upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch
deleted file mode 100644
index abe8479..0000000
--- a/debian/patches/upstream_Fix-crash-when-XVidExtWrap-is-not-available.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 1918f145261a52a3b2a917c6784c2cebecbb4064 Mon Sep 17 00:00:00 2001
-From: Christoph Feck <christoph at maxiom.de>
-Date: Sun, 11 Nov 2012 02:19:01 +0100
-Subject: [PATCH] Fix crash when XVidExtWrap is not available
-
-This can happen when run as root
-BUG: 292335
-FIXED-IN: 4.10
----
- kcmkgamma/kgamma.cpp |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/kcmkgamma/kgamma.cpp b/kcmkgamma/kgamma.cpp
-index ffe29ea..890ba99 100644
---- a/kcmkgamma/kgamma.cpp
-+++ b/kcmkgamma/kgamma.cpp
-@@ -70,7 +70,7 @@ KGamma::KGamma(QWidget* parent_P, const QVariantList &)
-     :KCModule(KGammaConfigFactory::componentData(), parent_P), rootProcess(0)
- {
-   bool ok;
--  GammaCorrection = true;
-+  GammaCorrection = false;
-   xv = new XVidExtWrap(&ok, NULL);
-   if (ok) { /* KDE 4: Uneccessary test, when all KCM wrappers do conditional loading */
-     xv->getGamma(XVidExtWrap::Red, &ok);
-@@ -94,6 +94,7 @@ KGamma::KGamma(QWidget* parent_P, const QVariantList &)
-       xv->setScreen(currentScreen);
- 
-       rootProcess = new KProcess;
-+      GammaCorrection = true;
-       setupUI();
-       saved = false;
- 
-@@ -107,10 +108,9 @@ KGamma::KGamma(QWidget* parent_P, const QVariantList &)
-       }
-       load();
-     }
--    else {  //something is wrong, show only error message
--      GammaCorrection = false;
--      setupUI();
--    }
-+  }
-+  if (!GammaCorrection) { //something is wrong, show only error message
-+    setupUI();
-   }
- }
- 
--- 
-1.7.10.4
-

-- 
kgamma packaging