[SCM] KDE Graphics module packaging branch, master, updated. debian/4.4.5-2-12-g32d62e5

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 21575478bcaec108fdd7c757bae16651a0d34f6e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Jan 8 19:33:36 2011 +0100

    Drop fix_solid_camera_predicate.diff.
---
 debian/changelog                               |    3 ++
 debian/patches/fix_solid_camera_predicate.diff |   26 ------------------------
 debian/patches/series                          |    1 -
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43276f8..3a68b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ kdegraphics (4:4.5.90-0r1) UNRELEASED; urgency=low
   * Update symbols files.
   * Bump build dependency on kdelibs5-dev to version 4:4.5.
 
+  [ José Manuel Santamaría Lema ]
+  * Drop patch fix_solid_camera_predicate.diff, applied upstream. 
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 03 Sep 2010 15:13:33 +0300
 
 kdegraphics (4:4.4.5-2) unstable; urgency=medium
diff --git a/debian/patches/fix_solid_camera_predicate.diff b/debian/patches/fix_solid_camera_predicate.diff
deleted file mode 100644
index ea741a2..0000000
--- a/debian/patches/fix_solid_camera_predicate.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: dju` <dju at elegiac.net>
-Subject: fix mistake in Solid action predicate for kamera
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585717
-
-The predicate in file /usr/share/kde4/apps/solid/actions/solid_camera.desktop
-is wrong:
-
-X-KDE-Solid-Predicate=Camera.supportedDrivers & 'gphoto'
-
-whereas it should be:
-
-X-KDE-Solid-Predicate=Camera.supportedDrivers == 'gphoto'
-
-With this correction the "Open with File Manager" action appears in the action
-list when connecting a gphoto camera to the computer.
-
-
---- a/kamera/solid_camera.desktop
-+++ b/kamera/solid_camera.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--X-KDE-Solid-Predicate=Camera.supportedDrivers & 'gphoto'
-+X-KDE-Solid-Predicate=Camera.supportedDrivers == 'gphoto'
- Type=Service
- Actions=open;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8b6b656..0371f73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_solid_camera_predicate.diff
 01_do_not_break_kexiv2_abi.diff

-- 
KDE Graphics module packaging