rev 12763 - in branches/kde4.2/packages/kdemultimedia/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Fri Nov 28 20:10:35 UTC 2008 

Author: modax-guest
Date: 2008-11-28 20:10:35 +0000 (Fri, 28 Nov 2008)
New Revision: 12763

Added:
   branches/kde4.2/packages/kdemultimedia/debian/README.source
   branches/kde4.2/packages/kdemultimedia/debian/installgen
Modified:
   branches/kde4.2/packages/kdemultimedia/debian/changelog
   branches/kde4.2/packages/kdemultimedia/debian/control
   branches/kde4.2/packages/kdemultimedia/debian/dragonplayer.install
   branches/kde4.2/packages/kdemultimedia/debian/juk.install
   branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-dev.install
   branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-kio-plugins.install
   branches/kde4.2/packages/kdemultimedia/debian/kmix.install
   branches/kde4.2/packages/kdemultimedia/debian/kscd.install
   branches/kde4.2/packages/kdemultimedia/debian/libkcddb-dev.install
   branches/kde4.2/packages/kdemultimedia/debian/libkcddb4.install
   branches/kde4.2/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
   branches/kde4.2/packages/kdemultimedia/debian/rules
Log:
* New upstream development snapshot.
TODO: Xine XCB: Xine libraries <http://xinehq.de/>
      Xine and phonon-xine must be compiled with XCB support.
* Remove explicit cmake from build depends.
* Bump KDE build dependencies to 4:4.1.80.
* Bump Standards-Version to 3.8.0: add README.source.
* Update 97_fix_target_link_libraries.diff.
* Move libkcompactdisc devel files to libkcddb-dev, move DBus XML files
  to kdemultimedia-dev. Add appropriate replaces.
* Bump libkcddb shlibs to 4.1.80.

Added: branches/kde4.2/packages/kdemultimedia/debian/README.source
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/README.source	                        (rev 0)
+++ branches/kde4.2/packages/kdemultimedia/debian/README.source	2008-11-28 20:10:35 UTC (rev 12763)
@@ -0,0 +1,6 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.

Modified: branches/kde4.2/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/changelog	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/changelog	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,11 +1,23 @@
-kdemultimedia (4:4.1.3-2) UNRELEASED; urgency=low
+kdemultimedia (4:4.1.80+svn889044-0r2) UNRELEASED; urgency=low
 
+  * New upstream development snapshot.
+
+  TODO: Xine XCB: Xine libraries <http://xinehq.de/>
+        Xine and phonon-xine must be compiled with XCB support.
+
   +++ Changes by Modestas Vainius:
 
   * Use sameVersionDep for kdemultimedia-dev dependency on kdelibs5-dev.
   * Remove kdebase-workspace-dev from kdemultimedia-dev depends.
+  * Remove explicit cmake from build depends.
+  * Bump KDE build dependencies to 4:4.1.80.
+  * Bump Standards-Version to 3.8.0: add README.source.
+  * Update 97_fix_target_link_libraries.diff.
+  * Move libkcompactdisc devel files to libkcddb-dev, move DBus XML files
+    to kdemultimedia-dev. Add appropriate replaces.
+  * Bump libkcddb shlibs to 4.1.80.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Nov 2008 22:39:43 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 28 Nov 2008 22:07:13 +0200
 
 kdemultimedia (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/control	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/control	2008-11-28 20:10:35 UTC (rev 12763)
@@ -4,11 +4,12 @@
 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>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), cmake (>= 2.6), debhelper (>= 6), quilt,
- kdelibs5-dev (>= 4:4.1.3), libphonon-dev (>= 4:4.2), libplasma-dev (>= 4:4.1.3),
- libasound2-dev, libcdparanoia0-dev, libflac-dev, libmusicbrainz4-dev, libxine-dev,
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
+ kdelibs5-dev (>= 4:4.1.80), libphonon-dev (>= 4:4.2.0), libplasma-dev (>= 4:4.1.80),
+ libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libcdparanoia0-dev, libflac-dev, libmusicbrainz4-dev, libxine-dev,
  libogg-dev, libtag1-dev, libtheora-dev, libtunepimp-dev, libvorbis-dev, libx11-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdemultimedia
 Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/kdemultimedia
@@ -47,6 +48,7 @@
 Depends: ${sameVersionDep:kdelibs5-dev:kdemultimedia-kio-plugins},
  libkcddb-dev (= ${binary:Version}),
  kdemultimedia-kio-plugins (= ${binary:Version})
+Replaces: juk (<< 4:4.1.80), kscd (<< 4:4.1.80), kxim (<< 4:4.1.80)
 Description: development files for the KDE 4 multimedia module
  This package contains development files for building software that uses
  libraries from the KDE 4 multimedia module.
@@ -118,11 +120,13 @@
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libkcddb4 (= ${binary:Version})
-Replaces: kdemultimedia-dev (<< 4:4.0.73)
+Replaces: kdemultimedia-dev (<< 4:4.1.80)
 Description: CDDB library for KDE 4 (development)
  The KDE Compact Disc DataBase library provides an API for KDE 4 applications
  to fetch and submit audio CD information over the internet.
  .
+ This package also includes development files for libKCompactDisc.
+ .
  This package contains the CDDB library development files for KDE 4.
  .
  This package is part of the KDE 4 multimedia module.

Modified: branches/kde4.2/packages/kdemultimedia/debian/dragonplayer.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/dragonplayer.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/dragonplayer.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,4 +1,3 @@
-usr/share/kde4/config/dragonplayerrc
 usr/bin/dragon
 usr/lib/kde4/dragonpart.so
 usr/share/applications/kde4/dragonplayer.desktop
@@ -20,5 +19,7 @@
 usr/share/icons/oxygen/scalable/actions/player-volume-muted.svgz
 usr/share/kde4/apps/dragonplayer/dragonlogo.png
 usr/share/kde4/apps/dragonplayer/dragonplayerui.rc
+usr/share/kde4/apps/solid/actions/dragonplayer-opendvd.desktop
+usr/share/kde4/config/dragonplayerrc
 usr/share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
 usr/share/kde4/services/dragonplayer_part.desktop

Added: branches/kde4.2/packages/kdemultimedia/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/installgen	                        (rev 0)
+++ branches/kde4.2/packages/kdemultimedia/debian/installgen	2008-11-28 20:10:35 UTC (rev 12763)
@@ -0,0 +1,28 @@
+[libkcddb-dev]
+from:/(libkcddb|libkcompactdisc)/ dst:usr/include/
+from:/(libkcddb|libkcompactdisc)/ dst:usr/lib/lib[^/]+\.so$ link:
+from:/(libkcddb|libkcompactdisc)/ dst:/dbus-\d+/interfaces/
+
+[libkcddb4]
+from:/(libkcddb|libkcompactdisc)/
+
+[kdemultimedia-dev]
+dst:usr/include/
+dst:usr/lib/lib[^/]+\.so$ link:
+dst:/dbus-\d+/interfaces/
+
+[dragonplayer]
+from:/dragonplayer/
+
+[juk]
+from:/juk/
+
+[kdemultimedia-kio-plugins]
+from:/kioslave/
+
+[kmix]
+from:/kmix/
+
+[kscd]
+from:/kscd/
+

Modified: branches/kde4.2/packages/kdemultimedia/debian/juk.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/juk.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/juk.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,8 +1,5 @@
 usr/bin/juk
 usr/share/applications/kde4/juk.desktop
-usr/share/dbus-1/interfaces/org.kde.juk.collection.xml
-usr/share/dbus-1/interfaces/org.kde.juk.player.xml
-usr/share/dbus-1/interfaces/org.kde.juk.search.xml
 usr/share/doc/kde4/HTML/en/juk/common
 usr/share/doc/kde4/HTML/en/juk/history-playlist.png
 usr/share/doc/kde4/HTML/en/juk/index.cache.bz2
@@ -19,8 +16,8 @@
 usr/share/icons/hicolor/32x32/apps/juk.png
 usr/share/icons/hicolor/48x48/apps/juk.png
 usr/share/icons/hicolor/64x64/apps/juk.png
-usr/share/kde4/apps/juk/jukui.rc
 usr/share/kde4/apps/juk/jukui-rtl.rc
+usr/share/kde4/apps/juk/jukui.rc
 usr/share/kde4/apps/juk/pics/playing.png
 usr/share/kde4/apps/juk/pics/splash.png
 usr/share/kde4/apps/juk/pics/yahoo_credit.png

Modified: branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-dev.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-dev.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-dev.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,5 +1,7 @@
 usr/include/audiocdencoder.h
-usr/include/libkcompactdisc/kcompactdisc.h
 usr/lib/libaudiocdplugins.so
-usr/lib/libkcompactdisc.so
-
+usr/share/dbus-1/interfaces/org.kde.KMix.xml
+usr/share/dbus-1/interfaces/org.kde.juk.collection.xml
+usr/share/dbus-1/interfaces/org.kde.juk.player.xml
+usr/share/dbus-1/interfaces/org.kde.juk.search.xml
+usr/share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml

Modified: branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-kio-plugins.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-kio-plugins.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/kdemultimedia-kio-plugins.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -5,9 +5,13 @@
 usr/lib/kde4/libaudiocd_encoder_vorbis.so
 usr/lib/kde4/libaudiocd_encoder_wav.so
 usr/lib/libaudiocdplugins.so.4
-usr/lib/libaudiocdplugins.so.4.1.0
+usr/lib/libaudiocdplugins.so.4.2.0
+usr/share/doc/kde4/HTML/en/kioslave/audiocd/common
+usr/share/doc/kde4/HTML/en/kioslave/audiocd/index.cache.bz2
+usr/share/doc/kde4/HTML/en/kioslave/audiocd/index.docbook
 usr/share/kde4/apps/kconf_update/audiocd.upd
 usr/share/kde4/apps/kconf_update/upgrade-metadata.sh
+usr/share/kde4/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
 usr/share/kde4/config.kcfg/audiocd_lame_encoder.kcfg
 usr/share/kde4/config.kcfg/audiocd_vorbis_encoder.kcfg
 usr/share/kde4/services/audiocd.desktop

Modified: branches/kde4.2/packages/kdemultimedia/debian/kmix.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/kmix.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/kmix.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,11 +1,10 @@
 usr/bin/kmix
 usr/bin/kmixctrl
-usr/lib/libkdeinit4_kmixctrl.so
 usr/lib/libkdeinit4_kmix.so
+usr/lib/libkdeinit4_kmixctrl.so
 usr/share/applications/kde4/kmix.desktop
 usr/share/autostart/kmix_autostart.desktop
 usr/share/autostart/restore_kmix_volumes.desktop
-usr/share/dbus-1/interfaces/org.kde.KMix.xml
 usr/share/doc/kde4/HTML/en/kmix/common
 usr/share/doc/kde4/HTML/en/kmix/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kmix/index.docbook
@@ -19,9 +18,9 @@
 usr/share/icons/hicolor/48x48/apps/kmix.png
 usr/share/icons/hicolor/64x64/apps/kmix.png
 usr/share/kde4/apps/kmix/kmixui.rc
+usr/share/kde4/apps/kmix/pics/kmixdocked.png
 usr/share/kde4/apps/kmix/pics/kmixdocked_error.png
 usr/share/kde4/apps/kmix/pics/kmixdocked_mute.png
-usr/share/kde4/apps/kmix/pics/kmixdocked.png
 usr/share/kde4/apps/kmix/pics/mix_ac97.png
 usr/share/kde4/apps/kmix/pics/mix_audio.png
 usr/share/kde4/apps/kmix/pics/mix_bass.png

Modified: branches/kde4.2/packages/kdemultimedia/debian/kscd.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/kscd.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/kscd.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,9 +1,9 @@
 usr/bin/kscd
-usr/bin/workman2cddb.pl
 usr/share/applications/kde4/kscd.desktop
 usr/share/doc/kde4/HTML/en/kscd/common
 usr/share/doc/kde4/HTML/en/kscd/index.cache.bz2
 usr/share/doc/kde4/HTML/en/kscd/index.docbook
+usr/share/doc/kde4/HTML/en/kscd/kscd.png
 usr/share/doc/kde4/HTML/en/kscd/kscd11.png
 usr/share/doc/kde4/HTML/en/kscd/kscd12.png
 usr/share/doc/kde4/HTML/en/kscd/kscd13.png
@@ -17,13 +17,18 @@
 usr/share/doc/kde4/HTML/en/kscd/kscd6.png
 usr/share/doc/kde4/HTML/en/kscd/kscd9.png
 usr/share/doc/kde4/HTML/en/kscd/kscdannounc.png
-usr/share/doc/kde4/HTML/en/kscd/kscd.png
 usr/share/icons/hicolor/128x128/apps/kscd.png
 usr/share/icons/hicolor/16x16/apps/kscd.png
 usr/share/icons/hicolor/32x32/apps/kscd.png
 usr/share/icons/hicolor/48x48/apps/kscd.png
 usr/share/icons/hicolor/64x64/apps/kscd.png
-usr/share/kde4/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
+usr/share/icons/oxygen/22x22/actions/kscd-dock.png
+usr/share/kde4/apps/kscd/skin/BubbleGum.svg
+usr/share/kde4/apps/kscd/skin/Melon.svg
+usr/share/kde4/apps/kscd/skin/NGRemote.svg
+usr/share/kde4/apps/kscd/skin/Orange2.svg
+usr/share/kde4/apps/kscd/skin/SquaredMelon.svg
+usr/share/kde4/apps/kscd/skin/default.svg
 usr/share/kde4/apps/profiles/kscd.profile.xml
 usr/share/kde4/config.kcfg/kscd.kcfg
 usr/share/kde4/services/ServiceMenus/audiocd_play.desktop

Modified: branches/kde4.2/packages/kdemultimedia/debian/libkcddb-dev.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/libkcddb-dev.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/libkcddb-dev.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,10 +1,11 @@
+usr/include/libkcddb/cdinfo.h
 usr/include/libkcddb/cdinfodialog.h
-usr/include/libkcddb/cdinfo.h
 usr/include/libkcddb/client.h
 usr/include/libkcddb/configbase.h
 usr/include/libkcddb/genres.h
+usr/include/libkcddb/kcddb.h
+usr/include/libkcddb/kcddb_export.h
 usr/include/libkcddb/kcddbconfig.h
-usr/include/libkcddb/kcddb_export.h
-usr/include/libkcddb/kcddb.h
+usr/include/libkcompactdisc/kcompactdisc.h
 usr/lib/libkcddb.so
-
+usr/lib/libkcompactdisc.so

Modified: branches/kde4.2/packages/kdemultimedia/debian/libkcddb4.install
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/libkcddb4.install	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/libkcddb4.install	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,8 +1,8 @@
 usr/lib/kde4/kcm_cddb.so
 usr/lib/libkcddb.so.4
-usr/lib/libkcddb.so.4.1.0
+usr/lib/libkcddb.so.4.2.0
 usr/lib/libkcompactdisc.so.4
-usr/lib/libkcompactdisc.so.4.1.0
+usr/lib/libkcompactdisc.so.4.2.0
 usr/share/kde4/apps/kconf_update/kcmcddb-emailsettings.upd
 usr/share/kde4/config.kcfg/libkcddb.kcfg
 usr/share/kde4/services/libkcddb.desktop

Modified: branches/kde4.2/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2008-11-28 20:10:35 UTC (rev 12763)
@@ -1,29 +1,11 @@
---- kdemultimedia-4.0.98.orig/libkcompactdisc/CMakeLists.txt
-+++ kdemultimedia-4.0.98/libkcompactdisc/CMakeLists.txt
+--- a/libkcompactdisc/CMakeLists.txt
++++ b/libkcompactdisc/CMakeLists.txt
 @@ -47,7 +47,7 @@
  
  kde4_add_library(kcompactdisc SHARED ${kcompactdisc_LIB_SRCS})
  
 -target_link_libraries(kcompactdisc ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS})
-+target_link_libraries(kcompactdisc ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++target_link_libraries(kcompactdisc ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${CMAKE_THREAD_LIBS_INIT})
  if (HAVE_LIBASOUND2)
      target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
  endif (HAVE_LIBASOUND2)
---- kdemultimedia-4.0.98.orig/dragonplayer/src/app/CMakeLists.txt
-+++ kdemultimedia-4.0.98/dragonplayer/src/app/CMakeLists.txt
-@@ -33,6 +33,7 @@
-     ${KDE4_KUTILS_LIBS}
-     ${KDE4_PHONON_LIBS}
-     ${KDE4_SOLID_LIBS}
-+    ${KDE4_KIO_LIBRARY}
-     ${XINE_LIBRARY} )
- 
- install(TARGETS dragon ${INSTALL_TARGETS_DEFAULT_ARGS})
-@@ -45,6 +46,7 @@
- kde4_add_plugin(dragonpart ${videoplayer_part_SRCS})
- 
- target_link_libraries(dragonpart
-+${KDE4_SOLID_LIBS}
-     ${KDE4_KPARTS_LIBS}
-     ${KDE4_PHONON_LIBS}
-     ${KDE4_SOLID_LIBS}

Modified: branches/kde4.2/packages/kdemultimedia/debian/rules
===================================================================
--- branches/kde4.2/packages/kdemultimedia/debian/rules	2008-11-28 18:42:42 UTC (rev 12762)
+++ branches/kde4.2/packages/kdemultimedia/debian/rules	2008-11-28 20:10:35 UTC (rev 12763)
@@ -2,3 +2,4 @@
  
 include debian/cdbs/kde.mk
 
+DEB_DH_MAKESHLIBS_ARGS_libkcddb4 := -V'libkcddb4 (>= 4:4.1.80)'

More information about the pkg-kde-commits mailing list