[SCM] plasma-integration packaging branch, master, updated. debian/5.8.5-2-5-g1b04f5e

Maximiliano Curia maxy at moszumanska.debian.org
Sat Apr 1 15:36:47 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-integration.git;a=commitdiff;h=8d511f2

The following commit has been merged in the master branch:
commit 8d511f2140e1503dde9ad7403b4dfc8fb715a5fe
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Mar 26 14:34:02 2017 +0200

    Add new patch: Drop-the-patch-version-for-breeze.patch
---
 debian/control                                     |  2 +-
 .../Drop-the-patch-version-for-breeze.patch        | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 8517df3..e00c48a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: breeze-dev (>= 4:5.8.6~),
+Build-Depends: breeze-dev (>= 4:5.8.0~),
                cmake (>= 2.8.12),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.17.0~),
diff --git a/debian/patches/Drop-the-patch-version-for-breeze.patch b/debian/patches/Drop-the-patch-version-for-breeze.patch
new file mode 100644
index 0000000..c5fd7ac
--- /dev/null
+++ b/debian/patches/Drop-the-patch-version-for-breeze.patch
@@ -0,0 +1,33 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Sun, 26 Mar 2017 14:30:55 +0200
+Subject: Drop the patch version for breeze
+
+Breeze doesn't even receive changes on every point release, and really lts
+components shouldn't introduce incompatible changes in the same
+major.minor, so dropping this unnecessary requirement.
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 800a523..369c797 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 2.8.12)
+ project(PlasmaIntegration)
+ set(PROJECT_VERSION "5.8.6")
+ set(PROJECT_VERSION_MAJOR 5)
++string(REGEX MATCHALL "[0-9]+" PROJECT_VERSION_COMPONENTS ${PROJECT_VERSION})
++list(GET PROJECT_VERSION_COMPONENTS 1 PROJECT_VERSION_MINOR)
+ 
+ include(FeatureSummary)
+ find_package(ECM 5.17.0  NO_MODULE)
+@@ -38,7 +40,7 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Wayland 5.5 CONFIG REQUIRED)
+ 
+-find_package(Breeze ${PROJECT_VERSION} CONFIG)
++find_package(Breeze ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} CONFIG)
+ set_package_properties(Breeze PROPERTIES
+                        TYPE REQUIRED
+                        PURPOSE "For setting the default QStyle name")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3ac3202
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Drop-the-patch-version-for-breeze.patch

-- 
plasma-integration packaging



More information about the pkg-kde-commits mailing list