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

[Sune Vuorela]

Author: pusling-guest
Date: 2008-08-28 20:45:38 +0000 (Thu, 28 Aug 2008)
New Revision: 12003

Removed:
   branches/kde4/packages/kdelibs/debian/patches/01_r840377_840379_unload_on_close.diff
   branches/kde4/packages/kdelibs/debian/patches/02_41branch_link_interface_libraries.diff
   branches/kde4/packages/kdelibs/debian/patches/99_conservative_link_interface_libraries.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/01_kross_version_11_r838337.diff
   branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
* New upstream release
+++ Changes by Sune Vuorela:
* Update patches.
  - remove 01_r840377_840379_unload_on_close.diff  from upstream
  - remove 02_41branch_link_interface_libraries.diff
  - remove 99_conservative_link_interface_libraries.diff, no need to be more
    conservative than upstream.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-08-28 16:29:33 UTC (rev 12002)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-08-28 20:45:38 UTC (rev 12003)
@@ -1,3 +1,17 @@
+kde4libs (4:4.1.1-0try1) experimental; urgency=low
+
+  * New upstream release
+
+  +++ Changes by Sune Vuorela:
+
+  * Update patches.
+    - remove 01_r840377_840379_unload_on_close.diff  from upstream
+    - remove 02_41branch_link_interface_libraries.diff
+    - remove 99_conservative_link_interface_libraries.diff, no need to be more
+      conservative than upstream.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Aug 2008 22:41:00 +0200
+
 kde4libs (4:4.1.0-3) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:

Modified: branches/kde4/packages/kdelibs/debian/patches/01_kross_version_11_r838337.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/01_kross_version_11_r838337.diff	2008-08-28 16:29:33 UTC (rev 12002)
+++ branches/kde4/packages/kdelibs/debian/patches/01_kross_version_11_r838337.diff	2008-08-28 20:45:38 UTC (rev 12003)
@@ -1,23 +1,14 @@
---- a/kross/console/CMakeLists.txt
-+++ b/kross/console/CMakeLists.txt
-@@ -7,5 +7,5 @@
- 
- set(kross_SRCS main.cpp )
- kde4_add_executable(kross ${kross_SRCS})
--target_link_libraries(kross  ${KDE4_KDECORE_LIBS} krosscore )
-+target_link_libraries(kross  ${KDE4_KDEUI_LIBS} krosscore )
- install(TARGETS kross DESTINATION ${BIN_INSTALL_DIR})
 --- a/kross/core/CMakeLists.txt
 +++ b/kross/core/CMakeLists.txt
-@@ -15,6 +15,7 @@
- set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} 
-                                 SOVERSION ${GENERIC_LIB_SOVERSION} )
+@@ -17,6 +17,7 @@
+                                 ${KDE4_DISABLE_PROPERTY_}LINK_INTERFACE_LIBRARIES "kdecore;${QT_QTSCRIPT_LIBRARY};${QT_QTXML_LIBRARY}"
+ )
  
 +
  install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})
  
  install(FILES
-@@ -22,6 +23,7 @@
+@@ -24,6 +25,7 @@
      krossconfig.h
      errorinterface.h
      childreninterface.h

Deleted: branches/kde4/packages/kdelibs/debian/patches/01_r840377_840379_unload_on_close.diff

Deleted: branches/kde4/packages/kdelibs/debian/patches/02_41branch_link_interface_libraries.diff

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-08-28 16:29:33 UTC (rev 12002)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2008-08-28 20:45:38 UTC (rev 12003)
@@ -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
-@@ -948,11 +948,13 @@
+@@ -964,11 +964,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/99_conservative_link_interface_libraries.diff

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-08-28 16:29:33 UTC (rev 12002)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-08-28 20:45:38 UTC (rev 12003)
@@ -1,6 +1,4 @@
 01_kross_version_11_r838337.diff
-01_r840377_840379_unload_on_close.diff
-02_41branch_link_interface_libraries.diff
 08_add_debian_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 11_kde4_applications_menu.diff
@@ -12,4 +10,3 @@
 19_findqt4_optional_x11_pthread.diff
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
-99_conservative_link_interface_libraries.diff