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

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-27 19:38:38 +0000 (Sun, 27 Apr 2008)
New Revision: 10304

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
   branches/kde4/packages/kdelibs/debian/kdelibs5.install
   branches/kde4/packages/kdelibs/debian/kdelibs5.installgen
   branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff
Log:
New snapshot and a few fixes

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-04-27 16:34:23 UTC (rev 10303)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-04-27 19:38:38 UTC (rev 10304)
@@ -1,8 +1,11 @@
-kde4libs (4:4.0.71+svn801225-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.71+svn801786-1~pre1) UNRELEASED; urgency=low
 
   * New upstream development snapshot:
-    - The latest upstream commit is r801225 by mueller
-    - Date: Sat, 26 Apr 2008 01:10:13 -0000
+    - The latest upstream commit is r801786 by qbast
+    - Date: Sun, 27 Apr 2008 19:02:07 -0000
+  * Corrections to *.install files:
+    - kdelibs5-dev.install: 1 new file(s) added;
+    - kdelibs5.install: 1 new file(s) added;
 
   +++ Changes by Modestas Vainius:
 
@@ -12,6 +15,8 @@
       Those 3 libraries are no longer implicitly provided by any kdelibs
       target. This may cause a few link time FTBFSes.
     - Further update LINK_INTERFACE_LIBRARIES of other public libraries.
+  * Export ${KDE4_THREADWEAVER_LIBRARIES} and an alias for
+    ${KDE4_THREADWEAVER_LIBS} to restore compatibility.
   * Fix offsets in other patches so they apply cleanly.
   * Move usr/include/KDE/Phonon from kdelibs5-dev to libphonon-dev. Update
     *.install files and Replaces for libphonon-dev appropriately.
@@ -19,7 +24,7 @@
     -lphread.
   * Build depend on libenchant-dev.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Apr 2008 04:23:28 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 Apr 2008 22:17:01 +0300
 
 kde4libs (4:4.0.70+svn799089-2) experimental; urgency=low
 

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install	2008-04-27 16:34:23 UTC (rev 10303)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5-dev.install	2008-04-27 19:38:38 UTC (rev 10304)
@@ -830,6 +830,7 @@
 usr/share/kde4/apps/cmake/modules/FindBerkeleyDB.cmake
 usr/share/kde4/apps/cmake/modules/FindBlitz.cmake
 usr/share/kde4/apps/cmake/modules/FindBlueZ.cmake
+usr/share/kde4/apps/cmake/modules/FindBoost.cmake
 usr/share/kde4/apps/cmake/modules/FindCarbon.cmake
 usr/share/kde4/apps/cmake/modules/FindDNSSD.cmake
 usr/share/kde4/apps/cmake/modules/FindENCHANT.cmake

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5.install
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5.install	2008-04-27 16:34:23 UTC (rev 10303)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5.install	2008-04-27 19:38:38 UTC (rev 10304)
@@ -1,3 +1,4 @@
+usr/lib/kconf_update_bin/phonon_devicepreference_update
 usr/lib/kde4/katepart.so
 usr/lib/kde4/kcertpart.so
 usr/lib/kde4/kcm_crypto.so

Modified: branches/kde4/packages/kdelibs/debian/kdelibs5.installgen
===================================================================
--- branches/kde4/packages/kdelibs/debian/kdelibs5.installgen	2008-04-27 16:34:23 UTC (rev 10303)
+++ branches/kde4/packages/kdelibs/debian/kdelibs5.installgen	2008-04-27 19:38:38 UTC (rev 10304)
@@ -3,3 +3,4 @@
 dst:usr/lib/kde4/libexec/
 mime:application/x-sharedlib.* ! link:
 dst:usr/lib/.+\.so[\d.]+$ link:
+dst:/kconf_update_bin/

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-04-27 16:34:23 UTC (rev 10303)
+++ branches/kde4/packages/kdelibs/debian/patches/97_use_imported_targets_with_cmake26.diff	2008-04-27 19:38:38 UTC (rev 10304)
@@ -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,96 @@
+@@ -270,23 +269,98 @@
  
  #######################  #now try to find some kde stuff  ################################
  
@@ -39,7 +39,6 @@
 +         if (KDELIBS_EXPORT OR _kdeBootStrapping)
 +            # Set KDE4_*_LIBS to the (IMPORTED) target name
 +            set(KDE4_${_ulib}_LIBS ${lib})
-+            set(KDE4_${_ulib}_LIBRARIES ${lib})
 +         else (KDELIBS_EXPORT OR _kdeBootStrapping)
 +            # Set KDE4_*_LIBS to the lib name and its dependences
 +            set(KDE4_${_ulib}_LIBS ${${lib}_LIB_DEPENDS} ${KDE4_${_ulib}_LIBRARY} )
@@ -118,6 +117,9 @@
 +#   kmetadata
 +)
 +
++# Export "non-standard" KDE4_THREADWEAVER_LIBRARIES as an alias for KDE4_THREADWEAVER_LIBS
++set(KDE4_THREADWEAVER_LIBRARIES ${KDE4_THREADWEAVER_LIBS})
++
 +if (UNIX)
 +   import_kde4_core_libraries(
 +      kdefakes
@@ -131,7 +133,7 @@
     set(EXECUTABLE_OUTPUT_PATH ${kdelibs_BINARY_DIR}/bin )
  
     if (WIN32)
-@@ -355,89 +427,7 @@
+@@ -355,89 +429,7 @@
        get_filename_component(QT_INSTALL_DIR ${_DIR} PATH )
     endif (WIN32)