[SCM] plasma-framework packaging branch, kubuntu_unstable, updated. 2a15b940af50a5a3467a9ded279b1f58d743c9ad

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=2a15b94

The following commit has been merged in the kubuntu_unstable branch:
commit 2a15b940af50a5a3467a9ded279b1f58d743c9ad
Author: Harald Sitter <sitter at kde.org>
Date:   Sun Jan 4 15:06:33 2015 +0100

    drop upstream patch
---
 debian/patches/series                              |  1 -
 .../upstream_Ignore-packages-with-Hidden.diff      | 30 ----------------------
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d487ffb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_Ignore-packages-with-Hidden.diff
diff --git a/debian/patches/upstream_Ignore-packages-with-Hidden.diff b/debian/patches/upstream_Ignore-packages-with-Hidden.diff
deleted file mode 100644
index 0a363d3..0000000
--- a/debian/patches/upstream_Ignore-packages-with-Hidden.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Marco Martin <notmart at gmail.com>
-Date: Thu, 17 Jul 2014 10:30:43 +0000
-Subject: packages with Hidden=true metadata are invalid
-X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=9ba599e1b9d66b16a46f2e29b97717d874bc5505
----
-packages with Hidden=true metadata are invalid
-
-This originates from the request of downstreams to hide packages that are still installed.
-why should be easier than not installing them i don't know, *but* semantically I think it makes sense act as if the package was not existing when the metadata says it's hidden
-
-REVIEW:119329
----
-
-
---- a/src/plasma/package.cpp
-+++ b/src/plasma/package.cpp
-@@ -78,6 +78,12 @@
-         return false;
-     }
- 
-+    //Minimal packages with no metadata *are* supposed to be possible
-+    //so if !metadata().isValid() go ahead
-+    if (metadata().isValid() && metadata().isHidden()) {
-+        return false;
-+    }
-+
-     if (d->checkedValid) {
-         return d->valid;
-     }
-

-- 
plasma-framework packaging