rev 17893 - in trunk/packages/kdemultimedia/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-05-08 20:17:58 +0000 (Sat, 08 May 2010)
New Revision: 17893

Added:
   trunk/packages/kdemultimedia/debian/patches/01_kmix_showeverywhere.diff
Modified:
   trunk/packages/kdemultimedia/debian/changelog
   trunk/packages/kdemultimedia/debian/control
   trunk/packages/kdemultimedia/debian/patches/series
   trunk/packages/kdemultimedia/debian/rules
Log:
* Use dh_xine for dragonplayer, version libxine-dev build depend as (>=
  1.1.16.3) for it (Closes: #575119).
* Show kmix in all desktop environments (patch 01_kmix_showeverywhere.diff)
  (Closes: #544233).

Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2010-05-08 19:59:07 UTC (rev 17892)
+++ trunk/packages/kdemultimedia/debian/changelog	2010-05-08 20:17:58 UTC (rev 17893)
@@ -1,6 +1,10 @@
 kdemultimedia (4:4.4.3-2) unstable; urgency=low
 
   * Update libkcddb4 symbol file for armel. Fixes FTBFS.
+  * Use dh_xine for dragonplayer, version libxine-dev build depend as (>=
+    1.1.16.3) for it (Closes: #575119).
+  * Show kmix in all desktop environments (patch 01_kmix_showeverywhere.diff)
+    (Closes: #544233).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 08 May 2010 22:57:52 +0300
 

Modified: trunk/packages/kdemultimedia/debian/control
===================================================================
--- trunk/packages/kdemultimedia/debian/control	2010-05-08 19:59:07 UTC (rev 17892)
+++ trunk/packages/kdemultimedia/debian/control	2010-05-08 20:17:58 UTC (rev 17893)
@@ -9,7 +9,7 @@
  cdbs (>= 0.4.51), cmake, debhelper (>= 7), quilt, pkg-kde-tools (>= 0.6.4),
  kdelibs5-dev (>= 4:4.4), libphonon-dev (>= 4:4.6.0really4.3.80),
  libasound2-dev (>= 1.0.14a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libcdparanoia-dev, libflac-dev, libmusicbrainz4-dev, libpulse-dev, libxine-dev,
+ libcdparanoia-dev, libflac-dev, libmusicbrainz4-dev, libpulse-dev, libxine-dev (>= 1.1.16.3),
  libogg-dev, libtag1-dev (>= 1.6), libtheora-dev, libtunepimp-dev, libvorbis-dev, libx11-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kde.org/
@@ -118,7 +118,7 @@
 Package: dragonplayer
 Section: video
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}
 Description: simple KDE video player
  A video player with a different philosophy: Simple, uncluttered interface.
  .

Added: trunk/packages/kdemultimedia/debian/patches/01_kmix_showeverywhere.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/01_kmix_showeverywhere.diff	                        (rev 0)
+++ trunk/packages/kdemultimedia/debian/patches/01_kmix_showeverywhere.diff	2010-05-08 20:17:58 UTC (rev 17893)
@@ -0,0 +1,15 @@
+Description: show kmix in the menus of other desktop environments
+ The patch remove OnlyShowIn=KDE from kmix.desktop
+Author: Modestas Vainius <modax at debian.org>
+Forwarded: no
+Last-Update: 2010-05-08
+--- a/kmix/kmix.desktop
++++ b/kmix/kmix.desktop
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Exec=kmix -caption "%c" %i
+ X-DocPath=kmix/index.html
+-OnlyShowIn=KDE;
+ Type=Application
+ Terminal=false
+ Icon=kmix

Modified: trunk/packages/kdemultimedia/debian/patches/series
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/series	2010-05-08 19:59:07 UTC (rev 17892)
+++ trunk/packages/kdemultimedia/debian/patches/series	2010-05-08 20:17:58 UTC (rev 17893)
@@ -1 +1,2 @@
+01_kmix_showeverywhere.diff
 97_fix_target_link_libraries.diff

Modified: trunk/packages/kdemultimedia/debian/rules
===================================================================
--- trunk/packages/kdemultimedia/debian/rules	2010-05-08 19:59:07 UTC (rev 17892)
+++ trunk/packages/kdemultimedia/debian/rules	2010-05-08 20:17:58 UTC (rev 17893)
@@ -4,3 +4,5 @@
 
 DEB_DH_MAKESHLIBS_ARGS_libkcddb4 := -V'libkcddb4 (>= 4:4.3.0)'
 
+binary-predeb/dragonplayer::
+	dh_xine