[SCM] lives packaging branch, master, updated. debian/1.3.3-2-11-gc2de608

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c2de6085f3a3bf34b339be80fc31c82077541d3c
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jul 5 22:31:35 2010 +0200

    Continue dropping Python 3 modules.

diff --git a/debian/patches/02-drop_py3_mods.patch b/debian/patches/02-drop_py3_mods.patch
new file mode 100644
index 0000000..4347762
--- /dev/null
+++ b/debian/patches/02-drop_py3_mods.patch
@@ -0,0 +1,68 @@
+Description: Drop Python 3 modules for now.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: not-needed
+---
+ lives-plugins/marcos-encoders/Makefile.am  |   10 +---------
+ lives-plugins/marcos-encoders/Makefile.in  |   10 +---------
+ lives-plugins/plugins/encoders/Makefile.am |    1 -
+ lives-plugins/plugins/encoders/Makefile.in |    1 -
+ 4 files changed, 2 insertions(+), 20 deletions(-)
+
+--- lives.orig/lives-plugins/marcos-encoders/Makefile.am
++++ lives/lives-plugins/marcos-encoders/Makefile.am
+@@ -9,15 +9,7 @@ lives_mkv_encoder \
+ lives_mng_encoder \
+ lives_mpeg_encoder \
+ lives_ogm_encoder \
+-lives_theora_encoder \
+-lives_dirac_encoder3 \
+-lives_avi_encoder3 \
+-lives_gif_encoder3 \
+-lives_mkv_encoder3 \
+-lives_mng_encoder3 \
+-lives_mpeg_encoder3 \
+-lives_ogm_encoder3 \
+-lives_theora_encoder3
++lives_theora_encoder
+ 
+ install-data-hook:
+ 	for encoder in $(marcosencoders_DATA) ; do chmod a+rx $(DESTDIR)$(marcosencodersdir)/$${encoder} ; done
+--- lives.orig/lives-plugins/marcos-encoders/Makefile.in
++++ lives/lives-plugins/marcos-encoders/Makefile.in
+@@ -302,15 +302,7 @@ lives_mkv_encoder \
+ lives_mng_encoder \
+ lives_mpeg_encoder \
+ lives_ogm_encoder \
+-lives_theora_encoder \
+-lives_dirac_encoder3 \
+-lives_avi_encoder3 \
+-lives_gif_encoder3 \
+-lives_mkv_encoder3 \
+-lives_mng_encoder3 \
+-lives_mpeg_encoder3 \
+-lives_ogm_encoder3 \
+-lives_theora_encoder3
++lives_theora_encoder
+ 
+ EXTRA_DIST = $(marcosencoders_DATA) README.multi_encoder
+ all: all-am
+--- 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 0306a68..fcf0962 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 cdda2wav_to_icedax.diff
+02-drop_py3_mods.patch

-- 
lives packaging