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

[Fathi Boudra]

Author: fabo
Date: 2008-05-19 08:00:13 +0000 (Mon, 19 May 2008)
New Revision: 10643

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
Add libxcursor-dev build dependency. Update target link libraries fix.
(Closes: #481724)


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-05-18 22:50:18 UTC (rev 10642)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-05-19 08:00:13 UTC (rev 10643)
@@ -1,3 +1,10 @@
+kdebase-workspace (4:4.0.74-2) UNRELEASED; urgency=low
+
+  * Add libxcursor-dev build dependency. Update target link libraries fix.
+    (Closes: #481724)
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 19 May 2008 09:56:32 +0200
+
 kdebase-workspace (4:4.0.74-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-05-18 22:50:18 UTC (rev 10642)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-05-19 08:00:13 UTC (rev 10643)
@@ -11,7 +11,7 @@
  libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
  libxrandr-dev, libxrender-dev, libxxf86misc-dev, network-manager-dev,
  libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
- libsm-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev
+ libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-18 22:50:18 UTC (rev 10642)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-05-19 08:00:13 UTC (rev 10643)
@@ -414,7 +414,7 @@
  endif (LIBUSB_FOUND)
 --- a/kcontrol/kdm/CMakeLists.txt
 +++ b/kcontrol/kdm/CMakeLists.txt
-@@ -29,7 +29,7 @@
+@@ -27,7 +27,7 @@
  kde4_add_plugin(kcm_kdm ${kcm_kdm_PART_SRCS})
  
  
@@ -522,3 +522,16 @@
  ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES})
  
  if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+--- a/krunner/CMakeLists.txt
++++ b/krunner/CMakeLists.txt
+@@ -40,6 +40,10 @@
+   target_link_libraries(kdeinit_krunner ${X11_Xss_LIB})
+ endif(X11_Xss_LIB)
+ 
++if(X11_Xcursor_FOUND)
++  target_link_libraries(kdeinit_krunner ${X11_Xcursor_LIB})
++endif(X11_Xcursor_FOUND)
++
+ add_subdirectory( lock )
+ 
+ install(TARGETS kdeinit_krunner ${INSTALL_TARGETS_DEFAULT_ARGS} )