[SCM] KDE Artwork module packaging branch, master, updated. debian/15.08.3-1-5-g93323be

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdeartwork.git;a=commitdiff;h=d4a0b33

The following commit has been merged in the master branch:
commit d4a0b339026bc80affa4dba98c266156b351b860
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jul 23 13:20:25 2016 +0200

    explicitly disable what is not built
---
 debian/changelog                                |  4 ++++
 debian/patches/kubuntu_disable_kwin-styles.diff | 17 -----------------
 debian/patches/series                           |  1 -
 debian/rules                                    |  7 +++++++
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 395943e..a6e33ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdeartwork (4:15.08.3-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Explictly disable the build of kscreensaver, kwin-styles, styles, and
+    desktopthemes by passing -DBUILD_<foo>=OFF arguments to CMake.
+    - drop patch kubuntu_disable_kwin-styles.diff, as it is no more needed now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Jul 2016 13:07:39 +0200
 
diff --git a/debian/patches/kubuntu_disable_kwin-styles.diff b/debian/patches/kubuntu_disable_kwin-styles.diff
deleted file mode 100644
index a36caa1..0000000
--- a/debian/patches/kubuntu_disable_kwin-styles.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: kdeartwork-14.11.95/CMakeLists.txt
-===================================================================
---- kdeartwork-14.11.95.orig/CMakeLists.txt
-+++ kdeartwork-14.11.95/CMakeLists.txt
-@@ -18,9 +18,9 @@ macro_optional_add_subdirectory(ColorSch
- macro_optional_add_subdirectory(IconThemes)
- macro_optional_add_subdirectory(emoticons)
- macro_optional_add_subdirectory(kscreensaver)
--if (Q_WS_X11)
--   macro_optional_add_subdirectory(kwin-styles)
--endif (Q_WS_X11)
-+#if (Q_WS_X11)
-+#   macro_optional_add_subdirectory(kwin-styles)
-+#endif (Q_WS_X11)
- macro_optional_add_subdirectory(styles)
- macro_optional_add_subdirectory(wallpapers)
- macro_optional_add_subdirectory(HighResolutionWallpapers)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 332c792..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_disable_kwin-styles.diff
diff --git a/debian/rules b/debian/rules
index 6a77e53..9caf0c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,10 @@
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_auto_configure:
+	$(overridden_command) -- \
+	  -DBUILD_kscreensaver=OFF \
+	  -DBUILD_kwin-styles=OFF \
+	  -DBUILD_styles=OFF \
+	  -DBUILD_desktopthemes=OFF

-- 
KDE Artwork module packaging