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

Fathi Boudra fabo at alioth.debian.org
Thu Jun 12 07:38:10 UTC 2008 

Author: fabo
Date: 2008-06-12 07:38:10 +0000 (Thu, 12 Jun 2008)
New Revision: 10982

Removed:
   branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff
   branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff
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/19_findqt4_optional_x11_pthread.diff
   branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
   branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
   branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
another day, another snapshot: 819974
Remove patches, merged upstream:
 - 10_kdehome_kde4.diff
 - 21_kstandarddirs_prefer_kde4apps.diff


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-06-12 07:38:10 UTC (rev 10982)
@@ -1,4 +1,4 @@
-kde4libs (4:4.0.82+svn819047-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.82+svn819794-1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -22,11 +22,11 @@
 
   +++ Changes by Sune Vuorela:
 
-  * Install config files in /usr/share/kde4/config
+  * Install config files in /usr/share/kde4/config.
   * Patch kstandarddirs to look in home, installpath, prefix/path  except when
     config files, where home, /etc/kde4, prefix/path, installpath is
     preferred. Patch developed in cooperation with fedora (Closes: #484897).
-  * Add README file about the configuration stuff
+  * Add README file about the configuration stuff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Jun 2008 21:06:42 +0300
 

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-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-06-12 07:38:10 UTC (rev 10982)
@@ -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
-@@ -906,11 +906,13 @@
+@@ -912,11 +912,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")

Deleted: branches/kde4/packages/kdelibs/debian/patches/10_kdehome_kde4.diff

Modified: branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2008-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2008-06-12 07:38:10 UTC (rev 10982)
@@ -1,6 +1,6 @@
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
-@@ -1428,10 +1428,9 @@
+@@ -1434,10 +1434,9 @@
    IF(UNIX)
      # on OS X X11 may not be required
      IF (Q_WS_X11)

Deleted: branches/kde4/packages/kdelibs/debian/patches/21_kstandarddirs_prefer_kde4apps.diff

Modified: branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2008-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2008-06-12 07:38:10 UTC (rev 10982)
@@ -1,8 +1,6 @@
-Index: b/kdecore/kernel/kstandarddirs.cpp
-===================================================================
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1011,6 +1011,10 @@
+@@ -1009,6 +1009,10 @@
                          if ((local || testdir.exists()) && !candidates.contains(path))
                              candidates.append(path);
                      }

Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-06-12 07:38:10 UTC (rev 10982)
@@ -69,7 +69,7 @@
  install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
 --- a/kdecore/CMakeLists.txt
 +++ b/kdecore/CMakeLists.txt
-@@ -105,6 +105,7 @@
+@@ -108,6 +108,7 @@
     if (NOT HAVE_TRUNC)
         target_link_libraries(kdefakes  m )
     endif (NOT HAVE_TRUNC)
@@ -77,7 +77,7 @@
     install(TARGETS kdefakes ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  endif (UNIX)
-@@ -242,6 +243,7 @@
+@@ -245,6 +246,7 @@
  kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
  
  target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
@@ -207,7 +207,7 @@
  
 --- a/kinit/CMakeLists.txt
 +++ b/kinit/CMakeLists.txt
-@@ -132,7 +132,7 @@
+@@ -133,7 +133,7 @@
  kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS})
  set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER)
  

Modified: branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff	2008-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff	2008-06-12 07:38:10 UTC (rev 10982)
@@ -11,7 +11,7 @@
  install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})
 --- a/kdecore/CMakeLists.txt
 +++ b/kdecore/CMakeLists.txt
-@@ -243,7 +243,7 @@
+@@ -246,7 +246,7 @@
  kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
  
  target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-06-12 07:12:55 UTC (rev 10981)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-06-12 07:38:10 UTC (rev 10982)
@@ -1,6 +1,5 @@
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
-10_kdehome_kde4.diff
 11_kde4_applications_menu.diff
 12_deprecate_applnk.diff
 13_qt4_designer_plugins_path.diff
@@ -9,7 +8,6 @@
 17_findservicebydesktoppath_try_realfilepath.diff
 19_findqt4_optional_x11_pthread.diff
 20_use_dejavu_as_default_font.diff
-21_kstandarddirs_prefer_kde4apps.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 #97_use_imported_targets_with_cmake26.diff
 98_link_interface_libraries.diff

More information about the pkg-kde-commits mailing list