[SCM] lives/master: Drop Python3 version of multiencoder plugin (LP: #632833).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit be9ffebb9cb3a8c449bca0844c01c0017156f7c4
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Sep 10 13:32:20 2010 +0200

    Drop Python3 version of multiencoder plugin (LP: #632833).

diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
new file mode 100644
index 0000000..401032e
--- /dev/null
+++ b/debian/patches/02-drop_py3_multiencoder.patch
@@ -0,0 +1,29 @@
+Description: Drop Python3 version of multiencoder plugin.
+Author: Alessio Treglia <alessio at debian.org>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/632833
+Forwarded: not-needed
+---
+ lives-plugins/plugins/encoders/Makefile.am |    1 -
+ lives-plugins/plugins/encoders/Makefile.in |    1 -
+ 2 files changed, 2 deletions(-)
+
+--- lives.orig/lives-plugins/plugins/encoders/Makefile.am
++++ lives/lives-plugins/plugins/encoders/Makefile.am
+@@ -8,7 +8,6 @@ ffmpeg_encoder \
+ mencoder_encoder \
+ mjpegtools_encoder \
+ multi_encoder \
+-multi_encoder3 \
+ qtutils_encoder \
+ sswf_encoder \
+ transcode_encoder \
+--- lives.orig/lives-plugins/plugins/encoders/Makefile.in
++++ lives/lives-plugins/plugins/encoders/Makefile.in
+@@ -301,7 +301,6 @@ ffmpeg_encoder \
+ mencoder_encoder \
+ mjpegtools_encoder \
+ multi_encoder \
+-multi_encoder3 \
+ qtutils_encoder \
+ sswf_encoder \
+ transcode_encoder \
diff --git a/debian/patches/series b/debian/patches/series
index 2fbde34..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-cdda2wav_to_icedax.patch
+02-drop_py3_multiencoder.patch

-- 
lives packaging