[SCM] lives packaging branch, master, updated. debian/1.1.8-2-21-g9dff483

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9dff483f2f3cc454e7c782bfe118a0e299bdf9f4
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sat Feb 27 20:17:11 2010 +0100

    Update removepy.diff patch.

diff --git a/debian/patches/removepy.diff b/debian/patches/removepy.diff
index 6f5aff9..782d223 100644
--- a/debian/patches/removepy.diff
+++ b/debian/patches/removepy.diff
@@ -6,14 +6,14 @@ Description: This patch removes the py extensions from the marcos
  to avoid conflicts with dirac.
 Author: Harry Rickards <hrickards at l33tmyst.com>
 ---
- lives-plugins/marcos-encoders/Makefile.am    |   32 +++++++-------
- lives-plugins/marcos-encoders/Makefile.in    |   32 +++++++-------
+ lives-plugins/marcos-encoders/Makefile.am    |   24 +++-------
+ lives-plugins/marcos-encoders/Makefile.in    |   24 +++-------
  lives-plugins/plugins/encoders/multi_encoder |   60 +++++++++++++--------------
- 3 files changed, 62 insertions(+), 62 deletions(-)
+ 3 files changed, 46 insertions(+), 62 deletions(-)
 
 --- lives.orig/lives-plugins/marcos-encoders/Makefile.am
 +++ lives/lives-plugins/marcos-encoders/Makefile.am
-@@ -2,22 +2,22 @@
+@@ -2,22 +2,14 @@
  #
  
  marcosencodersdir = $(bindir)
@@ -40,15 +40,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
 +mng_encoder \
 +mpeg_encoder \
 +ogm_encoder \
-+theora_encoder \
-+dirac_encoder3 \
-+avi_encoder3 \
-+gif_encoder3 \
-+mkv_encoder3 \
-+mng_encoder3 \
-+mpeg_encoder3 \
-+ogm_encoder3 \
-+theora_encoder3
++theora_encoder
  
  install-data-hook:
  	for encoder in $(marcosencoders_DATA) ; do chmod a+rx $(DESTDIR)$(marcosencodersdir)/$${encoder} ; done
@@ -174,7 +166,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  21 Mar 2005 : 0.2.5 : use env python (hopefully >= 2.3)
 --- lives.orig/lives-plugins/marcos-encoders/Makefile.in
 +++ lives/lives-plugins/marcos-encoders/Makefile.in
-@@ -293,22 +293,22 @@ top_build_prefix = @top_build_prefix@
+@@ -293,22 +293,14 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  marcosencodersdir = $(bindir)
@@ -201,15 +193,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
 +mng_encoder \
 +mpeg_encoder \
 +ogm_encoder \
-+theora_encoder \
-+dirac_encoder3 \
-+avi_encoder3 \
-+gif_encoder3 \
-+mkv_encoder3 \
-+mng_encoder3 \
-+mpeg_encoder3 \
-+ogm_encoder3 \
-+theora_encoder3
++theora_encoder
  
  EXTRA_DIST = $(marcosencoders_DATA) README.multi_encoder
  all: all-am

-- 
lives packaging