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

Fathi Boudra fabo at alioth.debian.org
Tue May 13 07:01:59 UTC 2008


Author: fabo
Date: 2008-05-13 07:01:59 +0000 (Tue, 13 May 2008)
New Revision: 10578

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/15_kfreebsd_support.diff
   branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
   branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.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:
Upload to experimental.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-05-13 07:01:59 UTC (rev 10578)
@@ -1,4 +1,4 @@
-kde4libs (4:4.0.73+svn806390-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.73+svn806390-1) experimental; urgency=low
 
   * New upstream development snapshot:
     - The latest upstream commit is r806390 by uwolfer

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-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-05-13 07:01:59 UTC (rev 10578)
@@ -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
-@@ -896,11 +896,13 @@
+@@ -923,11 +923,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/15_kfreebsd_support.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-05-13 07:01:59 UTC (rev 10578)
@@ -73,7 +73,7 @@
      // Determine the mimetype of the file to be retrieved, and emit it.
      // This is mandatory in all slaves (for KRun/BrowserRun to work)
      // In real "remote" slaves, this is usually done using findByNameAndContent
-@@ -875,8 +876,10 @@
+@@ -881,8 +882,10 @@
      }
  
  #ifdef HAVE_FADVISE
@@ -84,7 +84,7 @@
      // WABA: Make sure that we keep writing permissions ourselves,
      // otherwise we can be in for a surprise on NFS.
      mode_t initialMode;
-@@ -898,8 +901,10 @@
+@@ -904,8 +907,10 @@
      }
  
  #ifdef HAVE_FADVISE

Modified: branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff	2008-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/18_always_set_cmake_policy.diff	2008-05-13 07:01:59 UTC (rev 10578)
@@ -25,7 +25,7 @@
  if(KDE4_FOUND)
    # Already found in this cmake run, nothing more to do
  else(KDE4_FOUND)
-@@ -672,24 +690,6 @@
+@@ -699,24 +717,6 @@
  endif(WIN32)
  
  

Modified: branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff	2008-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff	2008-05-13 07:01:59 UTC (rev 10578)
@@ -11,7 +11,7 @@
  cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
  
  # cmake 2.5, i.e. the cvs version between 2.4 and 2.6, is not supported
-@@ -254,7 +254,6 @@
+@@ -258,7 +258,6 @@
  include (CheckCXXCompilerFlag)
  include (CheckCXXSourceCompiles)
  
@@ -19,7 +19,7 @@
  # get the directory of the current file, used later on in the file
  get_filename_component( kde_cmake_module_dir  ${CMAKE_CURRENT_LIST_FILE} PATH)
  
-@@ -270,23 +269,98 @@
+@@ -274,23 +273,98 @@
  
  #######################  #now try to find some kde stuff  ################################
  
@@ -133,7 +133,7 @@
     set(EXECUTABLE_OUTPUT_PATH ${kdelibs_BINARY_DIR}/bin )
  
     if (WIN32)
-@@ -355,89 +429,7 @@
+@@ -378,89 +452,7 @@
        get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
     endif (WIN32)
  
@@ -344,7 +344,7 @@
  
 --- a/kio/CMakeLists.txt
 +++ b/kio/CMakeLists.txt
-@@ -264,7 +264,7 @@
+@@ -262,7 +262,7 @@
  set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
  
  ########### install files ###############

Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff	2008-05-13 07:01:59 UTC (rev 10578)
@@ -218,7 +218,7 @@
  
 --- a/kio/CMakeLists.txt
 +++ b/kio/CMakeLists.txt
-@@ -238,7 +238,10 @@
+@@ -236,7 +236,10 @@
  
  kde4_add_library(kio SHARED ${kio_LIB_SRCS})
  

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-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/99_more_implicit_link_libs.diff	2008-05-13 07:01:59 UTC (rev 10578)
@@ -1,5 +1,5 @@
---- kde4libs.orig/kde3support/CMakeLists.txt	2008-04-30 13:33:38.000000000 +0300
-+++ kde4libs/kde3support/CMakeLists.txt	2008-04-30 13:33:56.000000000 +0300
+--- a/kde3support/CMakeLists.txt
++++ b/kde3support/CMakeLists.txt
 @@ -80,7 +80,7 @@
  
  target_link_libraries(kde3support  ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTXML_LIBRARY}
@@ -9,8 +9,8 @@
  
  set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kdecore/CMakeLists.txt	2008-04-30 13:29:51.000000000 +0300
-+++ kde4libs/kdecore/CMakeLists.txt	2008-04-30 13:30:11.000000000 +0300
+--- a/kdecore/CMakeLists.txt
++++ b/kdecore/CMakeLists.txt
 @@ -243,7 +243,7 @@
  kde4_add_library(kdecore SHARED ${kdecore_LIB_SRCS})
  
@@ -20,8 +20,8 @@
  
  set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
  install(TARGETS kdecore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs.orig/kdeui/CMakeLists.txt	2008-04-30 13:30:17.000000000 +0300
-+++ kde4libs/kdeui/CMakeLists.txt	2008-04-30 13:30:41.000000000 +0300
+--- a/kdeui/CMakeLists.txt
++++ b/kdeui/CMakeLists.txt
 @@ -281,7 +281,7 @@
  kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
  
@@ -31,9 +31,9 @@
  
  if(MINGW)
     target_link_libraries(kdeui gdi32)
---- kde4libs.orig/kio/CMakeLists.txt	2008-04-30 13:31:18.000000000 +0300
-+++ kde4libs/kio/CMakeLists.txt	2008-04-30 13:31:29.000000000 +0300
-@@ -241,7 +241,7 @@
+--- a/kio/CMakeLists.txt
++++ b/kio/CMakeLists.txt
+@@ -239,7 +239,7 @@
  target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${QT_QTNETWORK_LIBRARY} ${X11_X11_LIB}
    ${ZLIB_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_SOLID_LIBS}
    ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} )
@@ -42,8 +42,8 @@
  
  
  set(SYS_INOTIFY_H_FOUND 0)
---- kde4libs.orig/kutils/CMakeLists.txt	2008-04-30 13:34:02.000000000 +0300
-+++ kde4libs/kutils/CMakeLists.txt	2008-04-30 13:34:20.000000000 +0300
+--- a/kutils/CMakeLists.txt
++++ b/kutils/CMakeLists.txt
 @@ -31,7 +31,7 @@
  kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
  

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-05-12 19:58:12 UTC (rev 10577)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-05-13 07:01:59 UTC (rev 10578)
@@ -12,4 +12,4 @@
 20_use_dejavu_as_default_font.diff
 97_use_imported_targets_with_cmake26.diff
 98_link_interface_libraries.diff
-#99_more_implicit_link_libs.diff
+99_more_implicit_link_libs.diff




More information about the pkg-kde-commits mailing list