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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-03-04 12:11:04 +0000 (Tue, 04 Mar 2008)
New Revision: 9578

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
   branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
Log:
refresh patches, re-word changelog


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-03-04 12:02:12 UTC (rev 9577)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-03-04 12:11:04 UTC (rev 9578)
@@ -24,10 +24,9 @@
   
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
-  * Remove patches that now are included by upstream:
+  * Drop patches pulled from KDE's SVN, now part of the release
     - 01_make_stackingOrder_work_r769072.diff
     - 02_re-register_global_shortcuts_r769363.diff 
- 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 04 Mar 2008 12:52:59 +0100
 

Modified: branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-03-04 12:02:12 UTC (rev 9577)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-03-04 12:11:04 UTC (rev 9578)
@@ -4,9 +4,9 @@
 of twenty seconds with this define e.g. because of enabled caching of unknown
 icons.
 Debug output is not completely disabled, because QT_NO_DEBUG is not set.
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -839,11 +839,13 @@
+--- kde4libs-4.0.2.orig/cmake/modules/FindKDE4Internal.cmake
++++ kde4libs-4.0.2/cmake/modules/FindKDE4Internal.cmake
+@@ -882,11 +882,13 @@
     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")

Modified: branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-03-04 12:02:12 UTC (rev 9577)
+++ branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2008-03-04 12:11:04 UTC (rev 9578)
@@ -1,6 +1,6 @@
---- a/kded/CMakeLists.txt
-+++ b/kded/CMakeLists.txt
-@@ -66,7 +66,7 @@
+--- kde4libs-4.0.2.orig/kded/CMakeLists.txt
++++ kde4libs-4.0.2/kded/CMakeLists.txt
+@@ -67,7 +67,7 @@
  
  ########### install files ###############
  
@@ -9,9 +9,9 @@
  install( FILES kdedmodule.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
  install( FILES kded.upd  DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
  
---- a/kded/kbuildsycoca.cpp
-+++ b/kded/kbuildsycoca.cpp
-@@ -374,7 +374,7 @@
+--- kde4libs-4.0.2.orig/kded/kbuildsycoca.cpp
++++ kde4libs-4.0.2/kded/kbuildsycoca.cpp
+@@ -319,7 +319,7 @@
       connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
               this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));