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

[Scott Kitterman]

Author: kitterman
Date: 2014-10-26 16:45:55 +0000 (Sun, 26 Oct 2014)
New Revision: 20022

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:
* Non-maintainer upload.
* Disable the FFmpeg plugin (Closes: #739312)

Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2014-10-14 21:58:01 UTC (rev 20021)
+++ kde-extras/k3b/trunk/debian/changelog	2014-10-26 16:45:55 UTC (rev 20022)
@@ -1,3 +1,10 @@
+k3b (2.0.2-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Disable the FFmpeg plugin (Closes: #739312)
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 13 May 2014 07:18:52 -0400
+
 k3b (2.0.2-7) unstable; urgency=low
 
   * Team upload.

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2014-10-14 21:58:01 UTC (rev 20021)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2014-10-26 16:45:55 UTC (rev 20022)
@@ -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	2014-10-14 21:58:01 UTC (rev 20021)
+++ kde-extras/k3b/trunk/debian/libk3b6-extracodecs.install	2014-10-26 16:45:55 UTC (rev 20022)
@@ -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	2014-10-14 21:58:01 UTC (rev 20021)
+++ kde-extras/k3b/trunk/debian/rules	2014-10-26 16:45:55 UTC (rev 20022)
@@ -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
+	dh_auto_configure -- -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF
 
 override_dh_builddeb:
 	dh_builddeb $(addprefix -p,$(pkgs_xz)) -- -Zxz