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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-12-07 03:14:18 +0000 (Sun, 07 Dec 2008)
New Revision: 12863

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff
Log:
update patch, fix build


Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-06 15:17:20 UTC (rev 12862)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-07 03:14:18 UTC (rev 12863)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.82+svn893271-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.82+svn893527-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -63,6 +63,8 @@
   
   * Rework slightly patch 15_kfreebsd_support.diff.
   * Redo patch 20_use_dejavu_as_default_font.diff.
+  * Update 24_findkdepimlibs_no_hardcoded_paths.diff after updates in the
+    KDE's SVN.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Dec 2008 16:02:04 +0100
 

Modified: 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	2008-12-06 15:17:20 UTC (rev 12862)
+++ branches/kde4.2/packages/kdelibs/debian/patches/24_findkdepimlibs_no_hardcoded_paths.diff	2008-12-07 03:14:18 UTC (rev 12863)
@@ -1,20 +1,18 @@
 --- a/cmake/modules/FindKdepimLibs.cmake
 +++ b/cmake/modules/FindKdepimLibs.cmake
-@@ -57,12 +57,8 @@
- if( KDEPIMLIBS_INCLUDE_DIR )
+@@ -58,10 +58,9 @@
    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}")
--
+   find_file(_kdepimlibs_cmake_module_info KDEPimLibsInformation.cmake PATHS ${CMAKE_MODULE_PATH})
+-  get_filename_component( kdepimlibs_cmake_module_dir  "${_kdepimlibs_cmake_module_info}" PATH)
+ 
    # 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)
-@@ -70,9 +66,9 @@
+@@ -69,9 +68,9 @@
    endif (NOT _newKdepimLibsFound)
  
    # this is for compatibility, starting next monday only the version with prefix will be installed, Alex