rev 16883 - kde-extras/kaffeine/trunk/debian

[Michael Meskes]

Author: meskes
Date: 2010-02-12 08:53:20 +0000 (Fri, 12 Feb 2010)
New Revision: 16883

Added:
   kde-extras/kaffeine/trunk/debian/dirs
Modified:
   kde-extras/kaffeine/trunk/debian/changelog
   kde-extras/kaffeine/trunk/debian/kaffeine.install
   kde-extras/kaffeine/trunk/debian/rules
Log:
Do not try to install optional dvb files if they are not available.



Modified: kde-extras/kaffeine/trunk/debian/changelog
===================================================================
--- kde-extras/kaffeine/trunk/debian/changelog	2010-02-12 00:51:27 UTC (rev 16882)
+++ kde-extras/kaffeine/trunk/debian/changelog	2010-02-12 08:53:20 UTC (rev 16883)
@@ -1,3 +1,10 @@
+kaffeine (1.0~pre3-2) experimental; urgency=low
+
+  * Do not try to install optional dvb files if they are not available.
+    (Closes: #566911)
+
+ -- Michael Meskes <meskes at debian.org>  Fri, 12 Feb 2010 09:28:53 +0100
+
 kaffeine (1.0~pre3-1) experimental; urgency=low
 
   * New upstream release:

Added: kde-extras/kaffeine/trunk/debian/dirs
===================================================================
--- kde-extras/kaffeine/trunk/debian/dirs	                        (rev 0)
+++ kde-extras/kaffeine/trunk/debian/dirs	2010-02-12 08:53:20 UTC (rev 16883)
@@ -0,0 +1,2 @@
+/usr/lib/kde4
+/usr/share/kde4/apps/kaffeine

Modified: kde-extras/kaffeine/trunk/debian/kaffeine.install
===================================================================
--- kde-extras/kaffeine/trunk/debian/kaffeine.install	2010-02-12 00:51:27 UTC (rev 16882)
+++ kde-extras/kaffeine/trunk/debian/kaffeine.install	2010-02-12 08:53:20 UTC (rev 16883)
@@ -1,7 +1,6 @@
 debian/kaffeine.xpm /usr/share/pixmaps
 usr/bin/kaffeine
 usr/bin/kaffeine-xbu
-usr/lib/kde4/kaffeinedvb.so
 usr/share/applications/kde4/kaffeine.desktop
 usr/share/icons/oxygen/16x16/actions/audio-radio-encrypted.png
 usr/share/icons/oxygen/16x16/actions/video-television-encrypted.png
@@ -11,7 +10,6 @@
 usr/share/icons/oxygen/32x32/actions/video-television-encrypted.png
 usr/share/icons/oxygen/48x48/actions/audio-radio-encrypted.png
 usr/share/icons/oxygen/48x48/actions/video-television-encrypted.png
-usr/share/kde4/apps/kaffeine/scanfile.dvb
 usr/share/kde4/apps/solid/actions/kaffeine_play_audiocd.desktop
 usr/share/kde4/apps/solid/actions/kaffeine_play_dvd.desktop
 usr/share/kde4/apps/solid/actions/kaffeine_play_videocd.desktop

Modified: kde-extras/kaffeine/trunk/debian/rules
===================================================================
--- kde-extras/kaffeine/trunk/debian/rules	2010-02-12 00:51:27 UTC (rev 16882)
+++ kde-extras/kaffeine/trunk/debian/rules	2010-02-12 08:53:20 UTC (rev 16883)
@@ -3,4 +3,9 @@
 %:
 	dh --parallel --list-missing --dbg-package=kaffeine-dbg --with kde $@
 
+override_dh_install:
+	if [ -f debian/tmp/usr/lib/kde4/kaffeinedvb.so ]; then mv debian/tmp/usr/lib/kde4/kaffeinedvb.so debian/kaffeine/usr/lib/kde4; fi
+	if [ -f debian/tmp/usr/share/kde4/apps/kaffeine/scanfile.dvb ]; then mv debian/tmp/usr/share/kde4/apps/kaffeine/scanfile.dvb debian/kaffeine/usr/share/kde4/apps/kaffeine; fi
+	dh_install
+
 .PHONY: override_dh_auto_test