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

Armin Berres trigger-guest at alioth.debian.org
Wed Apr 30 13:32:02 UTC 2008 

Author: trigger-guest
Date: 2008-04-30 13:32:02 +0000 (Wed, 30 Apr 2008)
New Revision: 10388

Added:
   branches/kde4/packages/kdemultimedia/debian/dragonplayer.install
Modified:
   branches/kde4/packages/kdemultimedia/debian/changelog
   branches/kde4/packages/kdemultimedia/debian/control
   branches/kde4/packages/kdemultimedia/debian/copyright
   branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
Log:
  * Remove unneeded build dependencies on cdparanoia and kdebase-workspace-dev.
  * Add dragonplayer package.
  * Build depend on libxine-dev. Needed by dragonplayer.
  * Build depend on kdelibs and libphonon from latest snapshot.

Modified: branches/kde4/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/changelog	2008-04-30 12:20:56 UTC (rev 10387)
+++ branches/kde4/packages/kdemultimedia/debian/changelog	2008-04-30 13:32:02 UTC (rev 10388)
@@ -1,10 +1,20 @@
-kdemultimedia (4:4.0.71+svn801741-1) experimental; urgency=low
+kdemultimedia (4:4.0.71+svn802698-1) experimental; urgency=low
 
   * New upstream snapshot
+
+  +++ Changes by Sune Vuorela:
+
   * Fix target link libraries
 
- -- Sune Vuorela <debian at pusling.com>  Mon, 28 Apr 2008 10:16:18 +0200
+  +++ Changes by Armin Berres:
 
+  * Remove unneeded build dependencies on cdparanoia and kdebase-workspace-dev.
+  * Add dragonplayer package.
+  * Build depend on libxine-dev. Needed by dragonplayer.
+  * Build depend on kdelibs and libphonon from latest snapshot.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Apr 2008 14:59:30 +0200
+
 kdemultimedia (4:4.0.68+svn794641-1) experimental; urgency=low
 
   * New usptream snapshot. 

Modified: branches/kde4/packages/kdemultimedia/debian/control
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/control	2008-04-30 12:20:56 UTC (rev 10387)
+++ branches/kde4/packages/kdemultimedia/debian/control	2008-04-30 13:32:02 UTC (rev 10388)
@@ -4,8 +4,8 @@
 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), cmake (>= 2.6.0~), debhelper (>= 6), quilt,
- kdelibs5-dev (>= 4:4.0.68), kdebase-workspace-dev (>= 4:4.0.68), libphonon-dev (>= 4:4.0.68), 
- cdparanoia, libasound2-dev, libcdparanoia0-dev, libflac-dev, libmusicbrainz4-dev,
+ kdelibs5-dev (>= 4:4.0.71+svn802698-1), libphonon-dev (>= 4:4.0.71+svn802698-1), 
+ libasound2-dev, libcdparanoia0-dev, libflac-dev, libmusicbrainz4-dev, libxine-dev,
  libogg-dev, libtag1-dev, libtheora-dev, libtunepimp-dev, libvorbis-dev
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
@@ -112,3 +112,17 @@
  handling audio CDs.
  .
  This package is part of the KDE 4 multimedia module.
+
+Package: dragonplayer
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Simple KDE 4 video player
+ A video player with a different philosophy: Simple, uncluttered interface.
+ .
+ Features:
+  - Plays DVDs, VCDs, all video formats supported by Xine.
+  - Bundled with a simple web-page KPart.
+  - Starts quickly.
+ .
+ This is the KDE 4 version of the Codeine video player.

Modified: branches/kde4/packages/kdemultimedia/debian/copyright
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/copyright	2008-04-30 12:20:56 UTC (rev 10387)
+++ branches/kde4/packages/kdemultimedia/debian/copyright	2008-04-30 13:32:02 UTC (rev 10388)
@@ -58,6 +58,9 @@
                  WorkMan (c) 1991-1997, Steven Grimm <koreth at midwinter.com>,
                          (c) Dirk Försterling <milliByte at DeathsDoor.com>
 
+dragonplayer: (c) 2005 Max Howell <max.howell at methylblue.com>
+              (c) 2007 Ian Monroe <ian at monroe.nu>
+
 License:
 
 Unless otherwise mentioned, the code files in this package are under

Added: branches/kde4/packages/kdemultimedia/debian/dragonplayer.install
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/dragonplayer.install	                        (rev 0)
+++ branches/kde4/packages/kdemultimedia/debian/dragonplayer.install	2008-04-30 13:32:02 UTC (rev 10388)
@@ -0,0 +1,24 @@
+etc/kde4/dragonplayerrc
+usr/bin/dragon
+usr/lib/kde4/dragonpart.so
+usr/share/applications/kde4/dragonplayer.desktop
+usr/share/doc/kde4/HTML/en/dragonplayer/common
+usr/share/doc/kde4/HTML/en/dragonplayer/index.cache.bz2
+usr/share/doc/kde4/HTML/en/dragonplayer/index.docbook
+usr/share/doc/kde4/HTML/en/dragonplayer/main.png
+usr/share/icons/hicolor/128x128/apps/dragonplayer.png
+usr/share/icons/hicolor/16x16/apps/dragonplayer.png
+usr/share/icons/hicolor/22x22/apps/dragonplayer.png
+usr/share/icons/hicolor/32x32/apps/dragonplayer.png
+usr/share/icons/hicolor/48x48/apps/dragonplayer.png
+usr/share/icons/hicolor/64x64/apps/dragonplayer.png
+usr/share/icons/hicolor/scalable/apps/dragonplayer.svgz
+usr/share/icons/oxygen/16x16/actions/player-volume-muted.png
+usr/share/icons/oxygen/22x22/actions/player-volume-muted.png
+usr/share/icons/oxygen/32x32/actions/player-volume-muted.png
+usr/share/icons/oxygen/48x48/actions/player-volume-muted.png
+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/services/ServiceMenus/dragonplayer_play_dvd.desktop
+usr/share/kde4/services/dragonplayer_part.desktop

Modified: branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2008-04-30 12:20:56 UTC (rev 10387)
+++ branches/kde4/packages/kdemultimedia/debian/patches/97_fix_target_link_libraries.diff	2008-04-30 13:32:02 UTC (rev 10388)
@@ -1,5 +1,5 @@
---- kdemultimedia-4.0.71+svn801741.orig/kmix/CMakeLists.txt	2008-04-28 08:59:35.000000000 +0000
-+++ kdemultimedia-4.0.71+svn801741/kmix/CMakeLists.txt	2008-04-28 09:00:32.000000000 +0000
+--- a/kmix/CMakeLists.txt
++++ b/kmix/CMakeLists.txt
 @@ -50,7 +50,7 @@
  
  kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
@@ -18,8 +18,8 @@
  
  if (HAVE_LIBASOUND2)
      target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
---- kdemultimedia-4.0.71+svn801741.orig/libkcddb/CMakeLists.txt	2008-04-28 08:22:51.000000000 +0000
-+++ kdemultimedia-4.0.71+svn801741/libkcddb/CMakeLists.txt	2008-04-28 08:22:51.000000000 +0000
+--- a/libkcddb/CMakeLists.txt
++++ b/libkcddb/CMakeLists.txt
 @@ -60,7 +60,7 @@
  
  kde4_add_library(kcddb SHARED ${kcddb_LIB_SRCS})
@@ -29,8 +29,8 @@
  if(MUSICBRAINZ_FOUND)
      target_link_libraries(kcddb ${MUSICBRAINZ_LIBRARIES})
  endif(MUSICBRAINZ_FOUND)
---- kdemultimedia-4.0.71+svn801741.orig/libkcompactdisc/CMakeLists.txt	2008-04-28 08:38:57.000000000 +0000
-+++ kdemultimedia-4.0.71+svn801741/libkcompactdisc/CMakeLists.txt	2008-04-28 08:50:33.000000000 +0000
+--- a/libkcompactdisc/CMakeLists.txt
++++ b/libkcompactdisc/CMakeLists.txt
 @@ -47,7 +47,7 @@
  
  kde4_add_library(kcompactdisc SHARED ${kcompactdisc_LIB_SRCS})
@@ -40,3 +40,22 @@
  if (HAVE_LIBASOUND2)
      target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
  endif (HAVE_LIBASOUND2)
+--- a/dragonplayer/src/app/CMakeLists.txt
++++ b/dragonplayer/src/app/CMakeLists.txt
+@@ -32,6 +32,8 @@
+ target_link_libraries(dragon
+     ${KDE4_KUTILS_LIBS}
+     ${KDE4_PHONON_LIBS}
++    ${KDE4_SOLID_LIBS}
++    ${KDE4_KIO_LIBRARY}
+     ${XINE_LIBRARY} )
+ 
+ install(TARGETS dragon DESTINATION ${BIN_INSTALL_DIR})
+@@ -44,6 +46,7 @@
+ kde4_add_plugin(dragonpart ${videoplayer_part_SRCS})
+ 
+ target_link_libraries(dragonpart
++${KDE4_SOLID_LIBS}
+     ${KDE4_KPARTS_LIBS}
+     ${KDE4_PHONON_LIBS}
+     ${XINE_LIBRARY} )

More information about the pkg-kde-commits mailing list