rev 10783 - in branches/kde4/packages: kdebase-runtime/debian kdebase-runtime/debian/patches kdelibs/debian kdepim/debian kdepimlibs/debian phonon/debian

Modestas Vainius modax-guest at alioth.debian.org
Thu May 29 12:15:05 UTC 2008


Author: modax-guest
Date: 2008-05-29 12:15:05 +0000 (Thu, 29 May 2008)
New Revision: 10783

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/control
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install
   branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.installgen
   branches/kde4/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff
   branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
   branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
   branches/kde4/packages/kdelibs/debian/rules
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepimlibs/debian/changelog
   branches/kde4/packages/kdepimlibs/debian/control
   branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install
   branches/kde4/packages/kdepimlibs/debian/rules
   branches/kde4/packages/phonon/debian/changelog
Log:
Commiting some 4.0.81+svn stuff

Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-05-29 12:15:05 UTC (rev 10783)
@@ -1,3 +1,22 @@
+kdebase-runtime (4:4.0.81+svn813996-1~pre1) UNRELEASED; urgency=low
+
+  * New upstream development snapshot:
+    - The latest upstream commit is r813996 by gaurav
+    - Date: Thu, 29 May 2008 11:45:17 -0000
+  * Update install files:
+    - kdebase-runtime-data.install: 19 new file(s) added; 40 file(s) removed;
+    - kdebase-runtime.install: 6 new file(s) added;
+
+  +++ Changes by Modestas Vainius:
+
+  * Build depend on libasound2-dev on linux arches.
+  * Add replaces with kdelibs5* due to moved phonon stuff.
+  * Bump kdelibs5 build depends version. No longer depend on phonon, it's
+    implied via kdelibs5-dev dependancy.
+  * !! DO NOT install kaudiodevicelist development files for now. !!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 15:00:45 +0300
+
 kdebase-runtime (4:4.0.80-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-05-29 12:15:05 UTC (rev 10783)
@@ -4,10 +4,11 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.5),
- kdepimlibs5-dev (>= 4:4.0.80), libphonon-dev (>= 4:4.0.80),
+ kdepimlibs5-dev (>= 4:4.0.81), kdelibs5-dev (>= 4:4.0.81),
  libclucene-dev, libsmbclient-dev, libsoprano-dev (>= 2.0.98),
  libstreamanalyzer-dev (>= 0.5.8), libstrigiqtdbusclient-dev (>= 0.5.8),
- libxcb1-dev, libxine-dev, libopenexr-dev, libbz2-dev, libx11-dev
+ libxcb1-dev, libxine-dev, libopenexr-dev, libbz2-dev, libx11-dev,
+ libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-runtime
@@ -16,7 +17,7 @@
 Package: kdebase-runtime
 Section: kde
 Architecture: any
-Replaces: kdebase-bin (<< 4:4.0.0-1)
+Replaces: kdebase-bin (<< 4:4.0.0-1), kdelibs5 (<< 4:4.0.81)
 Conflicts: kdebluetooth (<< 1.0~beta7-1)
 Depends: ${shlibs:Depends}, kdebase-runtime-bin-kde4 (= ${binary:Version}),
  kdebase-runtime-data (>= ${source:Version}),
@@ -51,7 +52,7 @@
 Section: kde
 Architecture: all
 Depends: kdebase-runtime-data-common (>= ${source:Version}) | kdebase-data (<< 4:4.0.0-1)
-Replaces: kdebase-data (<< 4:4.0.0-1), kdebase-bin (<= 4:3.5.8.dfsg.1-2), drkonqi
+Replaces: kdebase-data (<< 4:4.0.0-1), kdebase-bin (<= 4:3.5.8.dfsg.1-2), drkonqi, kdelibs5-data (<< 4:4.0.81)
 Conflicts: drkonqi
 Description: shared data files for the KDE 4 base runtime module
  This package contains the architecture-independent shared data files needed to

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime-data.install	2008-05-29 12:15:05 UTC (rev 10783)
@@ -11,24 +11,12 @@
 usr/share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
 usr/share/dbus-1/services/org.kde.knotify.service
 usr/share/desktop-directories/kde4-information.directory
-usr/share/doc/kde4/HTML/en/kcontrol/autostart/common
-usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/autostart/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/background/common
 usr/share/doc/kde4/HTML/en/kcontrol/background/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/background/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/bell/common
-usr/share/doc/kde4/HTML/en/kcontrol/bell/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/bell/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/cache/common
 usr/share/doc/kde4/HTML/en/kcontrol/cache/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/cache/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/clock/common
-usr/share/doc/kde4/HTML/en/kcontrol/clock/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/clock/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/colors/common
-usr/share/doc/kde4/HTML/en/kcontrol/colors/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/colors/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/common
 usr/share/doc/kde4/HTML/en/kcontrol/cookies/common
 usr/share/doc/kde4/HTML/en/kcontrol/cookies/index.cache.bz2
@@ -49,11 +37,9 @@
 usr/share/doc/kde4/HTML/en/kcontrol/email/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/email/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/emoticons/common
+usr/share/doc/kde4/HTML/en/kcontrol/emoticons/emoticons.png
 usr/share/doc/kde4/HTML/en/kcontrol/emoticons/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/emoticons/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/energy/common
-usr/share/doc/kde4/HTML/en/kcontrol/energy/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/energy/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/common
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/filemanager/index.docbook
@@ -62,23 +48,21 @@
 usr/share/doc/kde4/HTML/en/kcontrol/filetypes/common
 usr/share/doc/kde4/HTML/en/kcontrol/filetypes/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/filetypes/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/fontinst/common
-usr/share/doc/kde4/HTML/en/kcontrol/fontinst/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/fontinst/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/fonts/common
-usr/share/doc/kde4/HTML/en/kcontrol/fonts/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/fonts/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/helpindex/common
 usr/share/doc/kde4/HTML/en/kcontrol/helpindex/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/helpindex/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/icons/common
+usr/share/doc/kde4/HTML/en/kcontrol/icons/delete-theme.png
+usr/share/doc/kde4/HTML/en/kcontrol/icons/effects.png
+usr/share/doc/kde4/HTML/en/kcontrol/icons/get-new-theme.png
 usr/share/doc/kde4/HTML/en/kcontrol/icons/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/icons/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/icons/install-theme.png
+usr/share/doc/kde4/HTML/en/kcontrol/icons/main.png
+usr/share/doc/kde4/HTML/en/kcontrol/icons/size.png
+usr/share/doc/kde4/HTML/en/kcontrol/icons/use-of-icons.png
 usr/share/doc/kde4/HTML/en/kcontrol/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/kcmaccess/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmcss/index.docbook
@@ -94,28 +78,16 @@
 usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmsmserver/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/common
-usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/kcmstyle/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/common
 usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kcmtaskbar/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/kdm/common
 usr/share/doc/kde4/HTML/en/kcontrol/kdm/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/kdm/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/keyboard/common
-usr/share/doc/kde4/HTML/en/kcontrol/keyboard/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/keyboard/index.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/keys/common
-usr/share/doc/kde4/HTML/en/kcontrol/keys/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/keys/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/common
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/khtml/nsplugin.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/common
-usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/kwindecoration/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/language/common
 usr/share/doc/kde4/HTML/en/kcontrol/language/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/language/index.docbook
@@ -141,13 +113,13 @@
 usr/share/doc/kde4/HTML/en/kcontrol/proxy/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/proxy/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/proxy/socks.docbook
-usr/share/doc/kde4/HTML/en/kcontrol/screensaver/common
-usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.cache.bz2
-usr/share/doc/kde4/HTML/en/kcontrol/screensaver/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/screenshot.png
 usr/share/doc/kde4/HTML/en/kcontrol/smb/common
 usr/share/doc/kde4/HTML/en/kcontrol/smb/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/smb/index.docbook
+usr/share/doc/kde4/HTML/en/kcontrol/spellchecking/common
+usr/share/doc/kde4/HTML/en/kcontrol/spellchecking/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kcontrol/spellchecking/index.docbook
 usr/share/doc/kde4/HTML/en/kcontrol/useragent/common
 usr/share/doc/kde4/HTML/en/kcontrol/useragent/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kcontrol/useragent/index.docbook
@@ -261,7 +233,9 @@
 usr/share/kde4/apps/kcm_componentchooser/kcm_browser.desktop
 usr/share/kde4/apps/kcm_componentchooser/kcm_kemail.desktop
 usr/share/kde4/apps/kcm_componentchooser/kcm_terminal.desktop
+usr/share/kde4/apps/kcm_phonon/listview-background.png
 usr/share/kde4/apps/kcmlocale/pics/background.png
+usr/share/kde4/apps/kconf_update/devicepreference.upd
 usr/share/kde4/apps/kconf_update/kuriikwsfilter.upd
 usr/share/kde4/apps/kde/kde.notifyrc
 usr/share/kde4/apps/kio_finger/kio_finger.css
@@ -271,6 +245,8 @@
 usr/share/kde4/apps/kio_man/kio_man.css
 usr/share/kde4/apps/kio_thumbnail/pics/thumbnailfont_7x4.png
 usr/share/kde4/apps/konqueror/dirtree/remote/smb-network.desktop
+usr/share/kde4/apps/libphonon/hardwaredatabase
+usr/share/kde4/apps/phonon/phonon.notifyrc
 usr/share/kde4/apps/remoteview/smb-network.desktop
 usr/share/kde4/services/about.protocol
 usr/share/kde4/services/applications.protocol
@@ -294,6 +270,7 @@
 usr/share/kde4/services/info.protocol
 usr/share/kde4/services/kcm_kdnssd.desktop
 usr/share/kde4/services/kcm_nepomuk.desktop
+usr/share/kde4/services/kcm_phonon.desktop
 usr/share/kde4/services/kcm_phononxine.desktop
 usr/share/kde4/services/kcmcgi.desktop
 usr/share/kde4/services/kcmkded.desktop
@@ -419,6 +396,7 @@
 usr/share/kde4/services/settings.protocol
 usr/share/kde4/services/sftp.protocol
 usr/share/kde4/services/smb.protocol
+usr/share/kde4/services/spellchecking.desktop
 usr/share/kde4/services/svgthumbnail.desktop
 usr/share/kde4/services/tar.protocol
 usr/share/kde4/services/textthumbnail.desktop
@@ -426,6 +404,7 @@
 usr/share/kde4/services/trash.protocol
 usr/share/kde4/services/zip.protocol
 usr/share/kde4/servicetypes/nepomukservice.desktop
+usr/share/kde4/servicetypes/phononbackend.desktop
 usr/share/kde4/servicetypes/searchprovider.desktop
 usr/share/kde4/servicetypes/thumbcreator.desktop
 usr/share/sounds/KDE-Im-Cant-Connect.ogg
@@ -448,7 +427,7 @@
 usr/share/sounds/KDE-K3B-Finish-Error.ogg
 usr/share/sounds/KDE-K3B-Finish-Success.ogg
 usr/share/sounds/KDE-K3B-Insert-Medium.ogg
-usr/share/sounds/KDE-Sys-App-Error-Critial.ogg
+usr/share/sounds/KDE-Sys-App-Error-Critical.ogg
 usr/share/sounds/KDE-Sys-App-Error-Serious-Very.ogg
 usr/share/sounds/KDE-Sys-App-Error-Serious.ogg
 usr/share/sounds/KDE-Sys-App-Error.ogg

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.install	2008-05-29 12:15:05 UTC (rev 10783)
@@ -18,6 +18,7 @@
 usr/bin/nepomukserver
 usr/bin/nepomukservicestub
 usr/bin/solid-hardware
+usr/lib/kconf_update_bin/phonon_devicepreference_update
 usr/lib/kde4/djvuthumbnail.so
 usr/lib/kde4/exrthumbnail.so
 usr/lib/kde4/htmlthumbnail.so
@@ -31,7 +32,9 @@
 usr/lib/kde4/kcm_knotify.so
 usr/lib/kde4/kcm_locale.so
 usr/lib/kde4/kcm_nepomuk.so
+usr/lib/kde4/kcm_phonon.so
 usr/lib/kde4/kcm_phononxine.so
+usr/lib/kde4/kcmspellchecking.so
 usr/lib/kde4/kded_desktopnotifier.so
 usr/lib/kde4/kded_kpasswdserver.so
 usr/lib/kde4/kded_ktimezoned.so
@@ -80,9 +83,12 @@
 usr/lib/kde4/nepomukstorage.so
 usr/lib/kde4/nepomukstrigiservice.so
 usr/lib/kde4/phonon_xine.so
+usr/lib/kde4/plugins/phonon_platform/kde.so
 usr/lib/kde4/plugins/styles/oxygen.so
 usr/lib/kde4/svgthumbnail.so
 usr/lib/kde4/textthumbnail.so
+usr/lib/libkaudiodevicelist.so.4
+usr/lib/libkaudiodevicelist.so.4.1.0
 usr/lib/libkdeinit4_kcmshell4.so
 usr/lib/libkdeinit4_kuiserver.so
 usr/lib/libkdeinit4_nepomukserver.so

Modified: branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.installgen
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.installgen	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/kdebase-runtime.installgen	2008-05-29 12:15:05 UTC (rev 10783)
@@ -1,5 +1,6 @@
 # Install exceptions first
 depends kdebase-runtime-bin-kde4
 
+stop dst:usr/lib/[^/]+\.so$ link:usr/lib/[^/]+\.so\.
 mime:application/.* dst:usr/bin
 mime:application/x-.* dst:usr/lib

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/02_ksvgtopng4.diff	2008-05-29 12:15:05 UTC (rev 10783)
@@ -6,10 +6,10 @@
  set(ksvgtopng_SRCS ksvgtopng.cpp )
 -kde4_add_executable(ksvgtopng NOGUI ${ksvgtopng_SRCS})
 -target_link_libraries(ksvgtopng ${KDE4_KDEUI_LIBS})
--install(TARGETS ksvgtopng DESTINATION ${BIN_INSTALL_DIR} )
+-install(TARGETS ksvgtopng ${INSTALL_TARGETS_DEFAULT_ARGS} )
 +kde4_add_executable(ksvgtopng4 NOGUI ${ksvgtopng_SRCS})
 +target_link_libraries(ksvgtopng4 ${KDE4_KDEUI_LIBS})
-+install(TARGETS ksvgtopng4 DESTINATION ${BIN_INSTALL_DIR})
++install(TARGETS ksvgtopng4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
  
  # create a symlink for the default icon theme,
  # so that fallbacks work even for themes that don't inherit from oxygen

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/03_ktrash4.diff	2008-05-29 12:15:05 UTC (rev 10783)
@@ -10,8 +10,8 @@
 -target_link_libraries(ktrash  ${KDE4_KIO_LIBS} )
 +target_link_libraries(ktrash4  ${KDE4_KIO_LIBS} )
  
--install(TARGETS ktrash DESTINATION ${BIN_INSTALL_DIR})
-+install(TARGETS ktrash4 DESTINATION ${BIN_INSTALL_DIR})
+-install(TARGETS ktrash ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS ktrash4 ${INSTALL_TARGETS_DEFAULT_ARGS})
  
  ########### install files ###############
  

Modified: branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff	2008-05-29 12:15:05 UTC (rev 10783)
@@ -121,7 +121,7 @@
  
 --- a/kioslave/trash/CMakeLists.txt
 +++ b/kioslave/trash/CMakeLists.txt
-@@ -14,14 +14,14 @@
+@@ -14,7 +14,7 @@
  kde4_add_plugin(kio_trash ${kio_trash_PART_SRCS})
  
  
@@ -130,14 +130,6 @@
  
  install(TARGETS kio_trash  DESTINATION ${PLUGIN_INSTALL_DIR} )
  
- ########### next target ###############
- 
- kde4_add_library(trash MODULE trashthroughanalyzer.cpp trashimpl.cpp)
--target_link_libraries(trash ${STREAMANALYZER_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
-+target_link_libraries(trash ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
- set_target_properties(trash PROPERTIES
-     PREFIX strigita_)
- #install(TARGETS trash LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
 --- a/kpasswdserver/CMakeLists.txt
 +++ b/kpasswdserver/CMakeLists.txt
 @@ -2,7 +2,10 @@

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-05-29 12:15:05 UTC (rev 10783)
@@ -1,10 +1,9 @@
-kde4libs (4:4.0.81+svn814005-1~pre1) UNRELEASED; urgency=low
+kde4libs (4:4.0.81+svn814071-1~pre1) UNRELEASED; urgency=low
 
   * New upstream development snapshot:
-    - The latest upstream commit is r814005 by tyrerj
-    - Date: Thu, 29 May 2008 07:34:02 -0000
-
-  * Corrections to *.install files:
+    - The latest upstream commit is r814071 by rpedersen
+    - Date: Thu, 29 May 2008 10:16:43 -0000
+  * Update install files:
     - kdelibs5-dev.install: 1 new file(s) added; 2 file(s) removed;
     - kdelibs5.install: 5 file(s) removed;
     - kdelibs5-data.install: 10 file(s) removed;
@@ -23,8 +22,9 @@
   +++ Changes by Modestas Vainius:
 
   * Drop 18_always_set_cmake_policy.diff patch - applied upstream.
+  * Make kdelibs5-dev depend on libphonon-dev, KDE4Internal.cmake REQUIRES it.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 11:00:03 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 14:34:13 +0300
 
 kde4libs (4:4.0.80-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdelibs/debian/control	2008-05-29 12:15:05 UTC (rev 10783)
@@ -44,7 +44,8 @@
 Package: kdelibs5-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.4.5), libqt4-dev (>= 4.4.0~), libsoprano-dev (>= 2.0.98), automoc (>= 1.0~svn805317)
+Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.4.5), libqt4-dev (>= 4.4.0~),
+ libsoprano-dev (>= 2.0.98), automoc (>= 1.0~svn805317), ${sameVersionDep:libphonon-dev:kdelibs5-Depends-libphonon4}
 Suggests: kdelibs5-doc (= ${source:Version})
 Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)
 Conflicts: kdelibs4-dev

Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdelibs/debian/rules	2008-05-29 12:15:05 UTC (rev 10783)
@@ -10,7 +10,7 @@
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT=on
 
 #bump version for every new upstream version!
-DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)' -- -z
+DEB_DH_MAKESHLIBS_ARGS_kdelibs5 := -V'kdelibs5 (>= $(UPSTREAMVERSION)), $(RUNTIME_DEPS)'
 
 # remove the dependency on kdebase-runtime
 DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdepim/debian/control	2008-05-29 12:15:05 UTC (rev 10783)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.4.5), quilt,
+Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.4.5), quilt, kdelibs5-dev (>= 4:4.0.80+svn812470),
  kdepimlibs5-dev (>= 4:4.0.80), libphonon-dev (>= 4:4.0.80), libplasma-dev (>= 4:4.0.74),
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0),

Modified: branches/kde4/packages/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/changelog	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdepimlibs/debian/changelog	2008-05-29 12:15:05 UTC (rev 10783)
@@ -1,11 +1,17 @@
-kdepimlibs (4:4.0.80-2) UNRELEASED; urgency=low
+kdepimlibs (4:4.0.81+svn813143-1~pre1) UNRELEASED; urgency=low
 
+  * New upstream development snapshot:
+    - The latest upstream commit is r813143 by scripty
+    - Date: Thu, 29 May 2008 09:11:45 -0000
+  * Update install files:
+    - kdepimlibs-data.install: 5 new file(s) added;
+
   +++ Changes by Modestas Vainius:
 
-  * Bump kdelibs5-dev build dependency to 4.0.80, bump akonadi build
+  * Bump kdelibs5-dev build dependency to 4.0.81, bump akonadi build
     dependency to 0.81.0 (Closes: #483114). Bump shlibs.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2008 12:05:02 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 12:28:50 +0300
 
 kdepimlibs (4:4.0.80-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/control	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdepimlibs/debian/control	2008-05-29 12:15:05 UTC (rev 10783)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.5), kdelibs5-dev (>= 4:4.0.80),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.4.5), kdelibs5-dev (>= 4:4.0.81),
  libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev, libakonadi-dev (>= 0.81.0)
 Standards-Version: 3.7.3
 Homepage: http://pim.kde.org/

Modified: branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdepimlibs/debian/kdepimlibs-data.install	2008-05-29 12:15:05 UTC (rev 10783)
@@ -69,6 +69,7 @@
 usr/share/kde4/apps/libical/zoneinfo/America/Argentina/Mendoza.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Argentina/San_Juan.ics
+usr/share/kde4/apps/libical/zoneinfo/America/Argentina/San_Luis.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Argentina/Tucuman.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Argentina/Ushuaia.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Aruba.ics
@@ -135,6 +136,7 @@
 usr/share/kde4/apps/libical/zoneinfo/America/Maceio.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Managua.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Manaus.ics
+usr/share/kde4/apps/libical/zoneinfo/America/Marigot.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Martinique.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Mazatlan.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Menominee.ics
@@ -170,6 +172,7 @@
 usr/share/kde4/apps/libical/zoneinfo/America/Sao_Paulo.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Scoresbysund.ics
 usr/share/kde4/apps/libical/zoneinfo/America/Shiprock.ics
+usr/share/kde4/apps/libical/zoneinfo/America/St_Barthelemy.ics
 usr/share/kde4/apps/libical/zoneinfo/America/St_Johns.ics
 usr/share/kde4/apps/libical/zoneinfo/America/St_Kitts.ics
 usr/share/kde4/apps/libical/zoneinfo/America/St_Lucia.ics
@@ -223,6 +226,7 @@
 usr/share/kde4/apps/libical/zoneinfo/Asia/Dushanbe.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Gaza.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Harbin.ics
+usr/share/kde4/apps/libical/zoneinfo/Asia/Ho_Chi_Minh.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Hong_Kong.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Hovd.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Irkutsk.ics
@@ -235,6 +239,7 @@
 usr/share/kde4/apps/libical/zoneinfo/Asia/Karachi.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Kashgar.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Katmandu.ics
+usr/share/kde4/apps/libical/zoneinfo/Asia/Kolkata.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Krasnoyarsk.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics
 usr/share/kde4/apps/libical/zoneinfo/Asia/Kuching.ics

Modified: branches/kde4/packages/kdepimlibs/debian/rules
===================================================================
--- branches/kde4/packages/kdepimlibs/debian/rules	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/kdepimlibs/debian/rules	2008-05-29 12:15:05 UTC (rev 10783)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-UPSTREAMVERSION := 4:4.0.80
+UPSTREAMVERSION := 4:4.0.81
 
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT=on
 

Modified: branches/kde4/packages/phonon/debian/changelog
===================================================================
--- branches/kde4/packages/phonon/debian/changelog	2008-05-29 12:13:41 UTC (rev 10782)
+++ branches/kde4/packages/phonon/debian/changelog	2008-05-29 12:15:05 UTC (rev 10783)
@@ -1,7 +1,11 @@
-phonon (4:4.2~svn813403-1~pre2) UNRELEASED; urgency=low
+phonon (4:4.2~svn813403-1~pre3) UNRELEASED; urgency=low
 
   * First release. This has been split out from kde4libs:
     - The latest upstream commit is r813403 by mkretz
     - Date: Wed, 28 May 2008 22:51:39 -0000
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 02:42:57 +0300
+  * New upstream development snapshot:
+    - The latest upstream commit is r813403 by mkretz
+    - Date: Thu, 29 May 2008 09:32:17 -0000
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2008 12:34:15 +0300




More information about the pkg-kde-commits mailing list