rev 12828 - in branches/kde4.2/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-12-03 18:56:21 +0000 (Wed, 03 Dec 2008)
New Revision: 12828

Added:
   branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/control
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
new snaphost, kdepimlibs mess

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-03 17:35:51 UTC (rev 12827)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-03 18:56:21 UTC (rev 12828)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.81+svn891975-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.81+svn892147-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -50,6 +50,10 @@
   * Move upstream manpages from debian/*.manpages to debian/*.install files.
   * Build depend on pkg-kde-tools 0.3, add symbols file for libplasma3,
     add appropriate hooks to debian/rules.
+  * kdelibs5-dev conflicts with kdepimlibs5-dev (<< 4:4.1.81+svn891439) because
+    of upstream changes.
+  * Add 24_findkdepimlibs_no_hardcoded_paths.diff to remove hardcoded cmake
+    modules paths from FindKdepimLibs.cmake.
 
   +++ Changes by George Kiagiadakis:
 
@@ -59,7 +63,7 @@
   
   * Rework slightly patch 15_kfreebsd_support.diff.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Dec 2008 16:06:00 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Dec 2008 20:15:23 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/control	2008-12-03 17:35:51 UTC (rev 12827)
+++ branches/kde4.2/packages/kdelibs/debian/control	2008-12-03 18:56:21 UTC (rev 12828)
@@ -50,7 +50,7 @@
  ${sameVersionDep:libqt4-dev}, ${sameVersionDep:libsoprano-dev}, ${sameVersionDep:libphonon-dev}
 #Suggests: kdelibs5-doc (= ${source:Version})
 Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)
-Conflicts: kdelibs4-dev, libkjsembed-dev 
+Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439)
 Description: development files for the KDE 4 core libraries
  This package contains development files for building KDE 4 applications and
  other software that uses the KDE 4 libraries.

Added: branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff	2008-12-03 18:56:21 UTC (rev 12828)
@@ -0,0 +1,24 @@
+--- a/cmake/modules/FindKdepimLibs.cmake
++++ b/cmake/modules/FindKdepimLibs.cmake
+@@ -56,19 +56,15 @@
+ if( KDEPIMLIBS_INCLUDE_DIR )
+   set(KDEPIMLIBS_FOUND TRUE)
+ 
+-  get_filename_component( kdepimlibs_cmake_module_dir  "${KDEPIMLIBS_INCLUDE_DIR}" PATH)
+-  set(kdepimlibs_cmake_module_dir "${kdepimlibs_cmake_module_dir}/share/apps/cmake/modules")
+-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${kdepimlibs_cmake_module_dir}")
+-
+   # this file contains all dependencies of all libraries of kdepimlibs, Alex
+-  include("${kdepimlibs_cmake_module_dir}/KDEPimLibsInformation.cmake" OPTIONAL RESULT_VARIABLE _newKdepimLibsFound)
++  include(KDEPimLibsInformation OPTIONAL RESULT_VARIABLE _newKdepimLibsFound)
+   # if this file could not be loaded, we found an older version of Kdepimlibs, tell the
+   # developer that he should update kdepimlibs. Alex
+   if (NOT _newKdepimLibsFound)
+      message(FATAL_ERROR "You need a newer version of kdepimlibs, please update it")
+   endif (NOT _newKdepimLibsFound)
+   
+-  include("${kdepimlibs_cmake_module_dir}/KDEPimLibsLibraryTargets.cmake")
++  include(KDEPimLibsLibraryTargets)
+ 
+   _kdepimlibs_set_lib_vars( AKONADI        akonadi-kde)
+   _kdepimlibs_set_lib_vars( AKONADI_KMIME  akonadi-kmime)

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-03 17:35:51 UTC (rev 12827)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-03 18:56:21 UTC (rev 12828)
@@ -9,3 +9,4 @@
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
+24_findkdepimlibs_no_hardcoded_paths.diff