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

[Armin Berres]

Author: trigger-guest
Date: 2008-01-10 23:54:39 +0000 (Thu, 10 Jan 2008)
New Revision: 8924

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_build_system.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
fix kdm

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-10 23:04:01 UTC (rev 8923)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-10 23:54:39 UTC (rev 8924)
@@ -1,7 +1,7 @@
 kdebase-workspace (4:4.0.0-2) experimental; urgency=low
 
-  * Readd various kdm configuration files which were not installed due to a
-    broken patch.
+  * Add patch to install various kdm configuration files into the correct 
+    directories.
 
  -- Armin Berres <trigger+debian at space-based.de>  Thu, 10 Jan 2008 18:50:41 +0100
 

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2008-01-10 23:04:01 UTC (rev 8923)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/09_genkdm_make.diff	2008-01-10 23:54:39 UTC (rev 8924)
@@ -7,5 +7,5 @@
  set(FACE_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pics")
  install(CODE "
 -exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in '${KDM_PATH}' --no-in-notice --face-src '${FACE_SRC_PATH}' \$GENKDMCONF_FLAGS)
-+exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --no-old --in '${KDM_PATH}' --no-in-notice --face-src '${FACE_SRC_PATH}'  \$GENKDMCONF_FLAGS)
++exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --no-old --in '${KDM_PATH}' --no-in-notice --face-src '${FACE_SRC_PATH}' \$GENKDMCONF_FLAGS)
  ")

Added: branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_build_system.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_build_system.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/15_fix_kdm_build_system.diff	2008-01-10 23:54:39 UTC (rev 8924)
@@ -0,0 +1,14 @@
+Fixed upstream.Can be removed with next release.
+--- a/kdm/kfrontend/CMakeLists.txt	2008/01/07 21:52:14	758435
++++ b/kdm/kfrontend/CMakeLists.txt	2008/01/07 22:01:53	758436
+@@ -110,8 +110,6 @@
+ build_confci()
+ 
+ ## use 'GENKDMCONF_FLAGS=... make install' to override
+-set(KDM_PATH "$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm")
+-set(FACE_SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pics")
+ install(CODE "
+-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --no-old --in '${KDM_PATH}' --no-in-notice --face-src '${FACE_SRC_PATH}' \$GENKDMCONF_FLAGS)
++exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --no-old --in \\\"\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \$GENKDMCONF_FLAGS)
+ ")
+

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-01-10 23:04:01 UTC (rev 8923)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2008-01-10 23:54:39 UTC (rev 8924)
@@ -7,3 +7,4 @@
 12_be_better_at_honouring_user_kdm_theming.diff
 13_kdm_override_docs.diff
 14_correct_kde4home_for_kstartupconfig4.diff
+15_fix_kdm_build_system.diff