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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2009-01-03 01:54:35 +0000 (Sat, 03 Jan 2009)
New Revision: 13096

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
   branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
   branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff
Log:
new snapshot refreshing patches


Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-02 16:04:15 UTC (rev 13095)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-03 01:54:35 UTC (rev 13096)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.86+svn903389-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.86+svn904695-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 

Modified: branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-01-02 16:04:15 UTC (rev 13095)
+++ branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-01-03 01:54:35 UTC (rev 13096)
@@ -6,7 +6,7 @@
 Debug output is not completely disabled, because QT_NO_DEBUG is not set.
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1038,11 +1038,13 @@
+@@ -1018,11 +1018,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.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-01-02 16:04:15 UTC (rev 13095)
+++ branches/kde4.2/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-01-03 01:54:35 UTC (rev 13096)
@@ -11,7 +11,7 @@
  install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
 --- a/kded/vfolder_menu.cpp
 +++ b/kded/vfolder_menu.cpp
-@@ -771,8 +771,10 @@
+@@ -769,8 +769,10 @@
     QString result;
  
     QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -24,7 +24,7 @@
        QFileInfo fileInfo(fileName);
  
        QString fileNameOnly = fileInfo.fileName();
-@@ -782,7 +784,6 @@
+@@ -780,7 +782,6 @@
        QString baseName = QDir::cleanPath(m_docInfo.baseDir +
                                           fileInfo.path() + '/' + fileNameOnly);
        result = KStandardDirs::locate("xdgconf-menu", baseName);

Modified: branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff	2009-01-02 16:04:15 UTC (rev 13095)
+++ branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff	2009-01-03 01:54:35 UTC (rev 13096)
@@ -1,6 +1,6 @@
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -594,13 +594,13 @@
+@@ -574,13 +574,13 @@
  option(KDE4_BUILD_TESTS  "Build the tests")
  option(KDE4_ENABLE_HTMLHANDBOOK  "Create targets htmlhandbook for creating the html versions of the docbook docs")