[SCM] KDE Artwork module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-5-gfbff9b6

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c522c0de01748921f6deaa9a11e55f0e308e83ff
Author: Philip Muskovac <yofel at gmx.net>
Date:   Wed Nov 26 01:01:05 2014 +0100

    Don't build-depend on kde-workspace-dev anymore as it was removed from the archive
    
    * Don't build-depend on kde-workspace-dev anymore as it was removed from the
      archive
    * Add kubuntu_disable_kwin-styles.diff so kde-workspace is not required
      anymore
---
 debian/changelog                                |  4 ++++
 debian/control                                  |  1 -
 debian/patches/kubuntu_disable_kwin-styles.diff | 17 +++++++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bf65b79..73231e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ kdeartwork (4:14.11.95-0ubuntu1) UNRELEASED; urgency=medium
   * Fix watch urls for new release location
   * Update Vcs urls for the new repository location
   * Update the maintainer
+  * Don't build-depend on kde-workspace-dev anymore as it was removed from the
+    archive
+  * Add kubuntu_disable_kwin-styles.diff so kde-workspace is not required
+    anymore
 
  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 24 Nov 2014 23:09:05 +0100
 
diff --git a/debian/control b/debian/control
index 89f9639..2f65033 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Uploaders: Sune Vuorela <sune at debian.org>,
 Build-Depends: cmake,
                debhelper (>= 9),
                kde-sc-dev-latest (>= 4:4.12),
-               kde-workspace-dev (>= 4:4.11),
                libeigen3-dev,
                libkexiv2-dev,
                libqt4-opengl-dev [!armel !armhf],
diff --git a/debian/patches/kubuntu_disable_kwin-styles.diff b/debian/patches/kubuntu_disable_kwin-styles.diff
new file mode 100644
index 0000000..a36caa1
--- /dev/null
+++ b/debian/patches/kubuntu_disable_kwin-styles.diff
@@ -0,0 +1,17 @@
+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
index e69de29..332c792 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_disable_kwin-styles.diff

-- 
KDE Artwork module packaging