[SCM] plasma-desktop packaging branch, master, updated. debian/5.7.4-1-4-g72c0c7d

Pino Toscano pino at moszumanska.debian.org
Fri Sep 2 06:15:09 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=72c0c7d

The following commit has been merged in the master branch:
commit 72c0c7d7f190c3aa635c8ac19f65fc355d9abcbe
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 2 08:14:49 2016 +0200

    update the patches
    
    - add_missing_include: drop, fixed upstream
---
 debian/changelog                   |  2 ++
 debian/patches/add_missing_include | 20 --------------------
 debian/patches/series              |  1 -
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59cf988..2a0a10a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ plasma-desktop (4:5.7.4-2) UNRELEASED; urgency=medium
   * Remove the transitional kde-touchpad, since it was never part of a stable
     release.
   * Change the section of libkfontinst5, and libkfontinstui5 to libs.
+  * Update the patches:
+    - add_missing_include: drop, fixed upstream
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Sep 2016 08:07:44 +0200
 
diff --git a/debian/patches/add_missing_include b/debian/patches/add_missing_include
deleted file mode 100644
index 8e8706d..0000000
--- a/debian/patches/add_missing_include
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Tue, 10 May 2016 22:58:31 +0200
-Subject: add_missing_include
-
----
- kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-index eb222ae..be617c8 100644
---- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-@@ -49,6 +49,7 @@
- #include <cmath>
- #include <QDebug>
- 
-+#include <cmath>
- #include "synapticstouchpad.h"
- 
- #include <stddef.h>
diff --git a/debian/patches/series b/debian/patches/series
index 37c2318..830bdcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 allow_uxterm_overrides.diff
-add_missing_include

-- 
plasma-desktop packaging



More information about the pkg-kde-commits mailing list