[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git;a=commitdiff;h=95c10a9

The following commit has been merged in the master branch:
commit 95c10a902f1489090e99711514373259ed8e3835
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jun 9 18:07:11 2012 +0300

    Relax kde-workspace dependency on kdelibs.
    
    As a result, we can build with kde4libs 4.8.3
    (patch relax_kdelibs_dependency.diff).
---
 debian/changelog                             |    4 ++++
 debian/patches/relax_kdelibs_dependency.diff |   19 +++++++++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index abc3094..8f1a299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ kde-workspace (4:4.8.4-0r6) UNRELEASED; urgency=low
     - package-depends-on-lower-priority-package plasma-scriptengines:optional
       depends on plasma-scriptengine-googlegadgets:extra
 
+  [ Modestas Vainius ]
+  * Relax kde-workspace dependency on kdelibs so we can build with kde4libs
+    4.8.3 (patch relax_kdelibs_dependency.diff).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jun 2012 16:48:51 +0200
 
 kde-workspace (4:4.8.3-2) experimental; urgency=low
diff --git a/debian/patches/relax_kdelibs_dependency.diff b/debian/patches/relax_kdelibs_dependency.diff
new file mode 100644
index 0000000..f56031e
--- /dev/null
+++ b/debian/patches/relax_kdelibs_dependency.diff
@@ -0,0 +1,19 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Relax kde-workspace dependency on kdelibs
+Origin: vendor
+Forwarded: not-needed
+
+Otherwise we can't build with 4.8.3. Moreoever, such a strict dependency is
+pretty pointless anyway.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SO
+ 
+ #search packages used by KDE
+ set(QT_MIN_VERSION "4.7.0")
+-set(KDE_MIN_VERSION "4.8.4")
++set(KDE_MIN_VERSION "4.8.0")
+ set(SOPRANO_MIN_VERSION "2.5.63")
+ 
+ OPTION(WITH_XINERAMA "Xinerama support for multi-headed X displays" ON)
diff --git a/debian/patches/series b/debian/patches/series
index 14c5ca4..490d72f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ kdm_vt_switching_on_kfreebsd.diff
 nlist_ftbfs_krefreebsd.diff
 process_table_unclickable.diff
 new_beams_custom_plots.diff
+relax_kdelibs_dependency.diff

-- 
KDE Base Workspace module packaging