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

Modestas Vainius modax-guest at alioth.debian.org
Tue Nov 18 20:58:13 UTC 2008 

Author: modax-guest
Date: 2008-11-18 20:58:13 +0000 (Tue, 18 Nov 2008)
New Revision: 12682

Added:
   branches/kde4.2/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/control
   branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.install
   branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.installgen
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.installgen
   branches/kde4.2/packages/kdelibs/debian/kdelibs5.install
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
New snapshot, some fixes

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-18 20:58:13 UTC (rev 12682)
@@ -1,12 +1,8 @@
-kde4libs (4:4.1.73+svn885397-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.73+svn886187-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
   TODO: check where new upstream man pages belong.
-  TODO: sort out kdelibs-bin <=> kdelibs5 for:
-    - libkdeinit4_klauncher.so
-    - libkdeinit4_kio_http_cache_cleaner.so
-    - libkdeinit4_kconf_update.so
 
   +++ Changes by Modestas Vainius:
 
@@ -38,8 +34,14 @@
   * Update install and installgen files.
   * Make kdelibs5 recommend kdebase-runtime >= 4:4.1.73 because some
     stuff does not work (e.g. kwallet) with previous versions.
+  * Build depend on strigi >= 0.5.11-2.
+  * Move some libkdeinit4 stuff to kdelibs5 since their executables are in
+    libexec:
+    - libkdeinit4_klauncher.so
+    - libkdeinit4_kio_http_cache_cleaner.so
+    - libkdeinit4_kconf_update.so
 
- -- Modestas Vainius <modestas at vainius.eu>  Mon, 17 Nov 2008 13:30:41 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 18 Nov 2008 22:10:24 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/control	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/control	2008-11-18 20:58:13 UTC (rev 12682)
@@ -9,7 +9,7 @@
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libpng-dev, libssl-dev, libsm-dev,
- libsoprano-dev (>= 2.1), libstreamanalyzer-dev,
+ libsoprano-dev (>= 2.1), libstreamanalyzer-dev (>= 0.5.11-2),
  libxml2-dev, libxml2-utils,  libxslt1-dev, libxtst-dev, libgif-dev,
  libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
  libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,
@@ -26,6 +26,7 @@
 Depends: ${shlibs:Depends}, kdelibs5-data (>= ${source:Version}),
  kdelibs-bin(>= ${binary:Version}), dbus-x11, shared-mime-info, xauth
 Recommends: ttf-dejavu, kdebase-runtime (>= 4:4.1.73)
+Replaces: kdelibs-bin (<< 4:4.1.74)
 Description: core libraries for all KDE 4 applications
  This package contains shared libraries needed to run KDE 4 applications.
  .

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.install	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.install	2008-11-18 20:58:13 UTC (rev 12682)
@@ -18,7 +18,4 @@
 usr/bin/nepomuk-rcgen
 usr/bin/preparetips
 usr/lib/libkdeinit4_kbuildsycoca4.so
-usr/lib/libkdeinit4_kconf_update.so
 usr/lib/libkdeinit4_kded4.so
-usr/lib/libkdeinit4_kio_http_cache_cleaner.so
-usr/lib/libkdeinit4_klauncher.so

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.installgen
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.installgen	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs-bin.installgen	2008-11-18 20:58:13 UTC (rev 12682)
@@ -1,2 +1,5 @@
+# The following belongs to kdelibs5
+skip dst:usr/lib/libkdeinit4_(klauncher|kio_http_cache_cleaner|kconf_update)\.so$
+
 dst:usr/bin/
 dst:libkdeinit4_.*\.so

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.installgen
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.installgen	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5-data.installgen	2008-11-18 20:58:13 UTC (rev 12682)
@@ -6,4 +6,3 @@
 mime:text/.*
 mime:image/.*
 mime:application/(?!(x-executable|x-sharedlib)).*
-

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5.install	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5.install	2008-11-18 20:58:13 UTC (rev 12682)
@@ -67,6 +67,9 @@
 usr/lib/libkdecore.so.5.2.0
 usr/lib/libkdefakes.so.5
 usr/lib/libkdefakes.so.5.2.0
+usr/lib/libkdeinit4_kconf_update.so
+usr/lib/libkdeinit4_kio_http_cache_cleaner.so
+usr/lib/libkdeinit4_klauncher.so
 usr/lib/libkdesu.so.5
 usr/lib/libkdesu.so.5.2.0
 usr/lib/libkdeui.so.5

Added: branches/kde4.2/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	2008-11-18 20:58:13 UTC (rev 12682)
@@ -0,0 +1,17 @@
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
+@@ -194,7 +194,14 @@
+ install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+ 
+ ########### static lib for tests  ###############
++macro(AUTOMOC_COPY _from_target _to_target)
++    set(_srcfile ${CMAKE_CURRENT_BINARY_DIR}/${_from_target}_automoc.cpp)
++    set(_dstfile ${CMAKE_CURRENT_BINARY_DIR}/${_to_target}_automoc.cpp)
++    add_custom_command(OUTPUT ${_dstfile} COMMAND ${CMAKE_COMMAND} -E copy
++        ${_srcfile} ${_dstfile} MAIN_DEPENDENCY ${_srcfile})
++endmacro(AUTOMOC_COPY _from_target _to_target)
+ 
++automoc_copy(solid solid_static)
+ kde4_add_library(solid_static STATIC ${solid_LIB_SRCS})
+ 
+ target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY})

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2008-11-18 16:13:07 UTC (rev 12681)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2008-11-18 20:58:13 UTC (rev 12682)
@@ -8,3 +8,4 @@
 19_findqt4_optional_x11_pthread.diff
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
+23_solid_no_double_build.diff

More information about the pkg-kde-commits mailing list