rev 20119 - kde-extras/k3b/trunk/debian

[Pino Toscano]

Author: pino
Date: 2015-12-12 12:44:19 +0000 (Sat, 12 Dec 2015)
New Revision: 20119

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/k3b-data.install
   kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install
   kde-extras/k3b/trunk/debian/rules
Log:
re-enable the FFmpeg plugin, as it builds fine again

- install k3bffmpegdecoder.desktop in k3b-data
- install k3bffmpegdecoder.so in libk3b6-extracodecs
- stop passing -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF as cmake argument
  in rules


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2015-12-12 11:47:40 UTC (rev 20118)
+++ kde-extras/k3b/trunk/debian/changelog	2015-12-12 12:44:19 UTC (rev 20119)
@@ -19,6 +19,11 @@
     - Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch: drop, backported
       from upstream
   * Bump Standards-Version to 3.9.6, no changes required.
+  * Re-enable the FFmpeg plugin, as it builds fine again:
+    - install k3bffmpegdecoder.desktop in k3b-data
+    - install k3bffmpegdecoder.so in libk3b6-extracodecs
+    - stop passing -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF as cmake argument in
+      rules
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 12 Dec 2015 12:25:15 +0100
 

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2015-12-12 11:47:40 UTC (rev 20118)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2015-12-12 12:44:19 UTC (rev 20119)
@@ -118,7 +118,7 @@
 usr/share/kde4/services/k3baudiometainforenamerplugin.desktop
 usr/share/kde4/services/k3baudioprojectcddbplugin.desktop
 usr/share/kde4/services/k3bexternalencoder.desktop
-#usr/share/kde4/services/k3bffmpegdecoder.desktop
+usr/share/kde4/services/k3bffmpegdecoder.desktop
 usr/share/kde4/services/k3bflacdecoder.desktop
 usr/share/kde4/services/k3blibsndfiledecoder.desktop
 usr/share/kde4/services/k3bmaddecoder.desktop

Modified: kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install
===================================================================
--- kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install	2015-12-12 11:47:40 UTC (rev 20118)
+++ kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install	2015-12-12 12:44:19 UTC (rev 20119)
@@ -1,4 +1,4 @@
-#usr/lib/kde4/k3bffmpegdecoder.so
+usr/lib/kde4/k3bffmpegdecoder.so
 usr/lib/kde4/k3blameencoder.so
 usr/lib/kde4/k3bmaddecoder.so
 usr/lib/kde4/kcm_k3blameencoder.so

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2015-12-12 11:47:40 UTC (rev 20118)
+++ kde-extras/k3b/trunk/debian/rules	2015-12-12 12:44:19 UTC (rev 20119)
@@ -12,7 +12,7 @@
 	dh $@ --parallel --dbg-package=k3b-dbg --list-missing --with kde
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF
+	dh_auto_configure -- -DK3B_ENABLE_HAL_SUPPORT=OFF
 
 override_dh_builddeb:
 	dh_builddeb $(addprefix -p,$(pkgs_xz)) -- -Zxz