[SCM] solid packaging branch, master, updated. debian/5.37.0-2-85-gc9bde65

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/solid.git;a=commitdiff;h=846190a

The following commit has been merged in the master branch:
commit 846190a27554ceb1560a476c86b8228f7134bc2d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jun 22 13:53:56 2017 +0100

    remove patch now upstream
---
 ...-udisks2-backend-on-FreeBSD-only-when-ena.patch | 35 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 36 deletions(-)

diff --git a/debian/patches/cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch b/debian/patches/cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch
deleted file mode 100644
index 30e7460..0000000
--- a/debian/patches/cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f4a272b2b9c3c16f5f0e3aa1e416080aeb045c36 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Mon, 5 Jun 2017 08:40:07 +0200
-Subject: [PATCH] cmake: build udisks2 backend on FreeBSD only when enabled
-
-there is no point building sources that are not used otherwise
----
- src/solid/devices/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/solid/devices/CMakeLists.txt b/src/solid/devices/CMakeLists.txt
-index b841b54..cfb4f72 100644
---- a/src/solid/devices/CMakeLists.txt
-+++ b/src/solid/devices/CMakeLists.txt
-@@ -96,6 +96,8 @@ include(devices/backends/fakehw/CMakeLists.txt)
- if(NOT WIN32 AND NOT APPLE)
-    if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
-       option(EXPERIMENTAL_BSDISKS "Use UDisks2/bsdisks backend instead of HAL to manage disk devices" OFF)
-+   else ()
-+      set(EXPERIMENTAL_BSDISKS FALSE)
-    endif()
- 
-    if ( UDEV_FOUND )
-@@ -107,7 +109,7 @@ if(NOT WIN32 AND NOT APPLE)
-    include(devices/backends/upower/CMakeLists.txt)
- 
-    # FIXME: this should work on more Unix systems
--   if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
-+   if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR EXPERIMENTAL_BSDISKS)
-         message(STATUS "Building Solid UDisks2 backend." )
-         include(devices/backends/udisks2/CMakeLists.txt)
-    endif ()
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 28007b0..07242ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_shortest_filepath.diff
 fix-FTBFS-on-mipsel-and-m68k-src-solid-predicate_parser.c.patch
-cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch

-- 
solid packaging