[SCM] lives packaging branch, master, updated. debian/1.2.1-1-5-g7a64de1

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

The following commit has been merged in the master branch:
commit 7a64de1e316782eac48695daf9b2af0f0d18e1fa
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun Mar 21 22:49:04 2010 +0100

    Refresh debian/patches/removepy.diff.

diff --git a/debian/patches/removepy.diff b/debian/patches/removepy.diff
index 12d59bf..5878f4c 100644
--- a/debian/patches/removepy.diff
+++ b/debian/patches/removepy.diff
@@ -46,7 +46,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	for encoder in $(marcosencoders_DATA) ; do chmod a+rx $(DESTDIR)$(marcosencodersdir)/$${encoder} ; done
 --- lives.orig/lives-plugins/plugins/encoders/multi_encoder
 +++ lives/lives-plugins/plugins/encoders/multi_encoder
-@@ -10,14 +10,14 @@ multi_encoder
+@@ -11,14 +11,14 @@ multi_encoder
  
  LiVES plugin which uses the following encoding programs:
  
@@ -69,10 +69,10 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
  See each *.py encoder for complete list of requirements
  (you can type e.g. mpeg_encoder.py -C)
-@@ -36,14 +36,14 @@ Copyright (C) 2008 - 2010 Salsaman (sals
+@@ -37,14 +37,14 @@ Copyright (C) 2008 - 2010 Salsaman (sals
  
  
- version = '0.2.12'
+ version = '0.2.13'
 -mpeg = 'mpeg_encoder.py'
 -ogm = 'ogm_encoder.py'
 -mkv = 'mkv_encoder.py'
@@ -86,13 +86,13 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
 +mkv = 'mkv_encoder'
 +ogg = 'theora_encoder'
 +avi = 'avi_encoder'
-+drc = 'lives_dirac_encoder'
++drc = 'dirac_encoder'
 +mng = 'mng_encoder'
 +gif = 'gif_encoder'
  
  usage = \
        """
-@@ -57,14 +57,14 @@ SUMMARY (ver. %s):
+@@ -58,14 +58,14 @@ SUMMARY (ver. %s):
  
  LiVES plugin which calls one of the following programs:
  
@@ -115,7 +115,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
  in order to generate movies in one of the following formats:
  
-@@ -83,7 +83,7 @@ VCD/SVCD/DVD (NTSC and PAL video)
+@@ -84,7 +84,7 @@ VCD/SVCD/DVD (NTSC and PAL video)
  MNG (no sound)
  Animated GIF (no sound)
  
@@ -124,7 +124,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  ditribution and/or available from:
  
  http://lives.reimeika.ca/lives_guide.html
-@@ -483,7 +483,7 @@ if __name__ == '__main__':
+@@ -484,7 +484,7 @@ if __name__ == '__main__':
              quiet = '-q'
              tonull = '2> /dev/null'
  
@@ -133,7 +133,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                                     outfile, '-w', tempdir, '-a', arc, \
                                     '-f', fpsc, quiet, '-t', \
                                     type, '-s ./audiodump.wav', \
-@@ -544,7 +544,7 @@ CHANGELOG:
+@@ -547,7 +547,7 @@ CHANGELOG:
  02 Aug 2004 : 0.0.6 : added default extension to 'get_formats'.
                        changed 'format' to 'vformat' for clarity.
                        added support for 'debug' argument.
@@ -142,7 +142,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
                        (the latter HIGHLY EXPERIMENTAL).
                        no longer needs all encoders to work, it
                        will look for and offer the available
-@@ -555,10 +555,10 @@ CHANGELOG:
+@@ -558,10 +558,10 @@ CHANGELOG:
                        Ogg Theora file extension is now .ogg.
                        made vblock=16 (may need to be tweaked).
  26 Oct 2004 : 0.1.0 : can use arbitrary frame rate for Ogg Theora.
@@ -155,7 +155,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  02 Nov 2004 : 0.1.4 : added xvid.
                        made descriptions clearer.
  08 Nov 2004 : 0.1.5 : rm xvid-twopass.stats if present.
-@@ -577,7 +577,7 @@ CHANGELOG:
+@@ -580,7 +580,7 @@ CHANGELOG:
                        fps difference threshold can be controlled
                        through "fpst" variable.
  06 Dec 2004 : 0.2.1 : set fpst to 0.0005.

-- 
lives packaging