rev 10361 - in branches/kde4/packages/kdebase-workspace/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Tue Apr 29 08:20:16 UTC 2008 

Author: fabo
Date: 2008-04-29 08:20:16 +0000 (Tue, 29 Apr 2008)
New Revision: 10361

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
   branches/kde4/packages/kdebase-workspace/debian/kdm.install
   branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdebase-workspace/debian/rules
Log:
* Update patch 97: kfontinst links against QtXml.
* Update installed files.
* Bump libplasma1 version.


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-04-29 08:20:16 UTC (rev 10361)
@@ -1,7 +1,5 @@
 kdebase-workspace (4:4.0.71+svn802146-1~pre1) UNRELEASED; urgency=low
  
-  !!! It should build but install files are not updated and there are much
-      new stuff which needs a more a deep look (like printer-applet) !!!
   +++ Changes by Modestas Vainius:
 
   * Add libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev to build depends.
@@ -14,6 +12,10 @@
 
   * Add libsm-dev, libxft-dev and libxtst-dev to build depends.
 
+  +++ Changes by Fathi Boudra:
+
+  * Update installed files.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Apr 2008 12:27:22 +0300
 
 kdebase-workspace (4:4.0.68+svn794641-1) experimental; urgency=low

Modified: branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/kde-window-manager.install	2008-04-29 08:20:16 UTC (rev 10361)
@@ -16,6 +16,7 @@
 usr/lib/kde4/kwin3_laptop.so
 usr/lib/kde4/kwin3_modernsys.so
 usr/lib/kde4/kwin3_oxygen.so
+usr/lib/kde4/kwin3_ozone.so
 usr/lib/kde4/kwin3_plastik.so
 usr/lib/kde4/kwin3_quartz.so
 usr/lib/kde4/kwin3_redmond.so
@@ -26,6 +27,7 @@
 usr/lib/kde4/kwin_kde2_config.so
 usr/lib/kde4/kwin_keramik_config.so
 usr/lib/kde4/kwin_modernsys_config.so
+usr/lib/kde4/kwin_ozone_config.so
 usr/lib/kde4/kwin_plastik_config.so
 usr/lib/kde4/kwin_quartz_config.so
 usr/lib/libkdeinit4_kwin.so
@@ -73,6 +75,7 @@
 usr/share/kde4/apps/kwin/lookingglass.vert
 usr/share/kde4/apps/kwin/modernsystem.desktop
 usr/share/kde4/apps/kwin/oxygenclient.desktop
+usr/share/kde4/apps/kwin/ozoneclient.desktop
 usr/share/kde4/apps/kwin/plastik.desktop
 usr/share/kde4/apps/kwin/quartz.desktop
 usr/share/kde4/apps/kwin/redmond.desktop
@@ -130,6 +133,8 @@
 usr/share/kde4/services/kwin/trackmouse_config.desktop
 usr/share/kde4/services/kwin/videorecord.desktop
 usr/share/kde4/services/kwin/videorecord_config.desktop
+usr/share/kde4/services/kwin/wobblywindows.desktop
+usr/share/kde4/services/kwin/wobblywindows_config.desktop
 usr/share/kde4/services/kwin/zoom.desktop
 usr/share/kde4/services/kwin/zoom_config.desktop
 usr/share/kde4/services/kwinactions.desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2008-04-29 08:20:16 UTC (rev 10361)
@@ -23,6 +23,7 @@
 usr/bin/plasma
 usr/bin/plasmaengineexplorer
 usr/bin/plasmoidviewer
+usr/bin/safestartkde
 usr/bin/solid-bluetooth
 usr/bin/solid-network
 usr/bin/solid-powermanagement

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-data.install	2008-04-29 08:20:16 UTC (rev 10361)
@@ -1,5 +1,6 @@
 etc/kde4/background.knsrc
 etc/kde4/colorschemes.knsrc
+etc/kde4/ksplash.knsrc
 etc/kde4/plasma-themes.knsrc
 etc/kde4/wallpaper.knsrc
 usr/share/applications/kde4/kfontview.desktop
@@ -90,6 +91,7 @@
 usr/share/kde4/apps/color-schemes/WontonSoup.colors
 usr/share/kde4/apps/desktoptheme/default/colors
 usr/share/kde4/apps/desktoptheme/default/dialogs/background.svg
+usr/share/kde4/apps/desktoptheme/default/dialogs/krunner.svg
 usr/share/kde4/apps/desktoptheme/default/dialogs/shutdowndialog.svg
 usr/share/kde4/apps/desktoptheme/default/metadata.desktop
 usr/share/kde4/apps/desktoptheme/default/opaque/dialogs/background.svg

Modified: branches/kde4/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdm.install	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/kdm.install	2008-04-29 08:20:16 UTC (rev 10361)
@@ -41,6 +41,7 @@
 usr/share/kde4/apps/kdm/sessions/cde.desktop
 usr/share/kde4/apps/kdm/sessions/ctwm.desktop
 usr/share/kde4/apps/kdm/sessions/cwwm.desktop
+usr/share/kde4/apps/kdm/sessions/e16.desktop
 usr/share/kde4/apps/kdm/sessions/enlightenment.desktop
 usr/share/kde4/apps/kdm/sessions/evilwm.desktop
 usr/share/kde4/apps/kdm/sessions/fluxbox.desktop
@@ -51,6 +52,7 @@
 usr/share/kde4/apps/kdm/sessions/golem.desktop
 usr/share/kde4/apps/kdm/sessions/icewm.desktop
 usr/share/kde4/apps/kdm/sessions/ion.desktop
+usr/share/kde4/apps/kdm/sessions/kde-safe.desktop
 usr/share/kde4/apps/kdm/sessions/larswm.desktop
 usr/share/kde4/apps/kdm/sessions/lwm.desktop
 usr/share/kde4/apps/kdm/sessions/matchbox.desktop

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff	2008-04-29 08:20:16 UTC (rev 10361)
@@ -522,3 +522,14 @@
 +target_link_libraries(font ${STREAMANALYZER_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} kfontinst )
  set_target_properties(font PROPERTIES  PREFIX strigita_)
  install(TARGETS font LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
+--- a/kcontrol/kfontinst/lib/CMakeLists.txt
++++ b/kcontrol/kfontinst/lib/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ set(kfontinstui_LIB_SRCS FcEngine.cpp )
+ 
+ kde4_add_library(kfontinst SHARED ${kfontinst_LIB_SRCS})
+-target_link_libraries(kfontinst  ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES})
++target_link_libraries(kfontinst  ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${QT_QTXML_LIBRARY})
+ set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ 
+ kde4_add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})

Modified: branches/kde4/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/rules	2008-04-29 08:20:09 UTC (rev 10360)
+++ branches/kde4/packages/kdebase-workspace/debian/rules	2008-04-29 08:20:16 UTC (rev 10361)
@@ -6,7 +6,7 @@
 	-DINSTALL_PRINTER_APPLET=TRUE
 
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm
-DEB_DH_MAKESHLIBS_ARGS_libplasma1 := -V'libplasma1 (>= 4:4.0.68+svn794641-1)'
+DEB_DH_MAKESHLIBS_ARGS_libplasma1 := -V'libplasma1 (>= 4:4.0.71+svn802146-1)'
 
 DEB_DH_SHLIBDEPS_ARGS_kdebase-workspace-bin := -- -xksysguard

More information about the pkg-kde-commits mailing list