rev 13107 - in branches/kde4.2/packages/kdebase-workspace/debian: . patches

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-01-03 17:02:06 +0000 (Sat, 03 Jan 2009)
New Revision: 13107

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
   branches/kde4.2/packages/kdebase-workspace/debian/patches/series
Log:
New snapshot. Add patch 24_do_not_search_for_libeet.diff and update installed files.


Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-01-03 13:36:32 UTC (rev 13106)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-01-03 17:02:06 UTC (rev 13107)
@@ -1,4 +1,4 @@
-kdebase-workspace (4:4.1.86+svn903428-0r1) UNRELEASED; urgency=low
+kdebase-workspace (4:4.1.87+svn904801-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -51,13 +51,15 @@
   * Allow kwrited to install with setgid utmp.
   * Add plasma-scriptengine-qedje package, which contains the QEdje script
     engine for plasma.
+  * Add patch 24_do_not_search_for_libeet.diff which removes the useless
+    dependency on libeet-dev.
 
   +++ Changes by David Palacio:
 
   * 23_do_not_depend_on_bindings.diff: do no depend on python-kde4 at build
     time (circular build dependency).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2008 17:36:16 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Jan 2009 18:17:39 +0200
 
 kdebase-workspace (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2009-01-03 13:36:32 UTC (rev 13106)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-dev.install	2009-01-03 17:02:06 UTC (rev 13107)
@@ -35,12 +35,12 @@
 usr/include/kworkspace/kdisplaymanager.h
 usr/include/kworkspace/kwindowlistmenu.h
 usr/include/kworkspace/kworkspace.h
-usr/include/libplasmaclock/calendar.h
-usr/include/libplasmaclock/calendartable.h
-usr/include/libplasmaclock/clockapplet.h
-usr/include/libplasmaclock/clocknumber.h
-usr/include/libplasmaclock/plasmaclock_export.h
-usr/include/libplasmaclock/ui_calendar.h
+usr/include/plasmaclock/calendar.h
+usr/include/plasmaclock/calendartable.h
+usr/include/plasmaclock/clockapplet.h
+usr/include/plasmaclock/clocknumber.h
+usr/include/plasmaclock/plasmaclock_export.h
+usr/include/plasmaclock/ui_calendar.h
 usr/include/nepomuk/nepomukquery_export.h
 usr/include/nepomuk/nepomukqueryclient_export.h
 usr/include/nepomuk/query.h

Added: branches/kde4.2/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/24_do_not_search_for_libeet.diff	2009-01-03 17:02:06 UTC (rev 13107)
@@ -0,0 +1,49 @@
+Index: kdebase-workspace/cmake/modules/FindQEdje.cmake
+===================================================================
+--- kdebase-workspace.orig/cmake/modules/FindQEdje.cmake	2009-01-03 18:14:55.000000000 +0200
++++ kdebase-workspace/cmake/modules/FindQEdje.cmake	2009-01-03 18:16:04.000000000 +0200
+@@ -14,7 +14,7 @@
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ if( NOT WIN32 )
+   find_package(PkgConfig)
+-  pkg_check_modules(PC_QEdje eet qzion>=0.3.0 qedje>=0.3.0)
++  pkg_check_modules(PC_QEdje qzion>=0.3.0 qedje>=0.3.0)
+ endif( NOT WIN32 )
+ 
+ # use this just to create a nice message at FindPackageHandleStandardArgs
+@@ -27,10 +27,6 @@
+     HINTS
+     ${PC_QEdje_INCLUDE_DIRS}
+   )
+-  FIND_PATH(QEDJE_Eet_INCLUDE_DIR Eet.h
+-    HINTS
+-    ${PC_QEdje_INCLUDE_DIRS}
+-  )
+ 
+   FIND_LIBRARY(QEDJE_QEdje_LIBRARY NAMES qedje
+     PATHS
+@@ -40,20 +36,16 @@
+     PATHS
+     ${PC_QEdje_LIBRARY_DIRS}
+   )
+-  FIND_LIBRARY(QEDJE_Eet_LIBRARY NAMES eet
+-    PATHS
+-    ${PC_QEdje_LIBRARY_DIRS}
+-  )
+ 
+-  SET(QEDJE_LIBRARIES ${QEDJE_QEdje_LIBRARY} ${QEDJE_QZion_LIBRARY} ${QEDJE_Eet_LIBRARY} CACHE INTERNAL "All libraries needed for QEdje")
+-  SET(QEDJE_INCLUDE_DIRS  ${QEDJE_QEdje_INCLUDE_DIR} ${QEDJE_QZion_INCLUDE_DIR} ${QEDJE_Eet_INCLUDE_DIR} CACHE INTERNAL "All include directories needed for QEdje")
++  SET(QEDJE_LIBRARIES ${QEDJE_QEdje_LIBRARY} ${QEDJE_QZion_LIBRARY} CACHE INTERNAL "All libraries needed for QEdje")
++  SET(QEDJE_INCLUDE_DIRS  ${QEDJE_QEdje_INCLUDE_DIR} ${QEDJE_QZion_INCLUDE_DIR} CACHE INTERNAL "All include directories needed for QEdje")
+ 
+ else (PC_QEdje_FOUND)
+-  MESSAGE(STATUS "Could not find QZion and/or QEdje and/or eet. Please download them here (http://dev.openbossa.org/trac/qedje).")
++  MESSAGE(STATUS "Could not find QZion and/or QEdje. Please download them here (http://dev.openbossa.org/trac/qedje).")
+ endif (PC_QEdje_FOUND)
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(QEdje DEFAULT_MSG QEDJE_LIBRARIES QEDJE_INCLUDE_DIRS)
+ 
+ # show QEdje_LIBRARY and QZion_LIBRARY variables only in the advanced view
+-MARK_AS_ADVANCED(QEDJE_QEdje_LIBRARY QEDJE_QZion_LIBRARY QEDJE_Eet_LIBRARY QEDJE_QEdje_INCLUDE_DIR QEDJE_QZion_INCLUDE_DIR QEDJE_Eet_INCLUDE_DIR)
++MARK_AS_ADVANCED(QEDJE_QEdje_LIBRARY QEDJE_QZion_LIBRARY QEDJE_QEdje_INCLUDE_DIR QEDJE_QZion_INCLUDE_DIR)

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-01-03 13:36:32 UTC (rev 13106)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-01-03 17:02:06 UTC (rev 13107)
@@ -9,4 +9,5 @@
 21_kdm_doesnt_use_kstandarddirs.diff
 22_execute_ktrash4.diff
 23_do_not_depend_on_bindings.diff
+24_do_not_search_for_libeet.diff
 97_fix_target_link_libraries.diff