[SCM] lives/master: Remove removepy.diff
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jun 20 10:02:58 UTC 2011
The following commit has been merged in the master branch:
commit 84a9b27f5eda355023b4bc487c47eab4d6479c3f
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jun 20 11:55:51 2011 +0200
Remove removepy.diff
diff --git a/debian/patches/removepy.diff b/debian/patches/removepy.diff
deleted file mode 100644
index 160aaab..0000000
--- a/debian/patches/removepy.diff
+++ /dev/null
@@ -1,200 +0,0 @@
-Description: This patch removes the py extensions from the marcos
- encoders and updates all files that reference them to not use
- the .py extensions. This is because the files need to be in
- /usr/bin and it is against Debian policy to have .py extensions
- there. dirac_encoder is also renamed to lives_dirac_encoder
- to avoid conflicts with dirac.
-Author: Harry Rickards <hrickards at l33tmyst.com>
-Forwarded: not-needed
----
- lives-plugins/marcos-encoders/Makefile.am | 24 +++-------
- lives-plugins/marcos-encoders/Makefile.in | 24 +++-------
- lives-plugins/plugins/encoders/multi_encoder | 60 +++++++++++++--------------
- 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,14 @@
- #
-
- marcosencodersdir = $(bindir)
--marcosencoders_DATA = dirac_encoder.py \
--avi_encoder.py \
--gif_encoder.py \
--mkv_encoder.py \
--mng_encoder.py \
--mpeg_encoder.py \
--ogm_encoder.py \
--theora_encoder.py \
--dirac_encoder3.py \
--avi_encoder3.py \
--gif_encoder3.py \
--mkv_encoder3.py \
--mng_encoder3.py \
--mpeg_encoder3.py \
--ogm_encoder3.py \
--theora_encoder3.py
-+marcosencoders_DATA = lives_dirac_encoder \
-+avi_encoder \
-+gif_encoder \
-+mkv_encoder \
-+mng_encoder \
-+mpeg_encoder \
-+ogm_encoder \
-+theora_encoder
-
- install-data-hook:
- 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
-@@ -11,14 +11,14 @@ multi_encoder
-
- LiVES plugin which uses the following encoding programs:
-
--mpeg_encoder.py
--ogm_encoder.py
--mkv_encoder.py
--avi_encoder.py
--dirac_encoder.py
--theora_encoder.py
--mng_encoder.py
--gif_encoder.py
-+mpeg_encoder
-+ogm_encoder
-+mkv_encoder
-+avi_encoder
-+lives_dirac_encoder
-+theora_encoder
-+mng_encoder
-+gif_encoder
-
- See each *.py encoder for complete list of requirements
- (you can type e.g. mpeg_encoder.py -C)
-@@ -37,14 +37,14 @@ Copyright (C) 2008 - 2010 Salsaman (sals
-
-
- version = '0.2.13'
--mpeg = 'mpeg_encoder.py'
--ogm = 'ogm_encoder.py'
--mkv = 'mkv_encoder.py'
--ogg = 'theora_encoder.py'
--avi = 'avi_encoder.py'
--drc = 'dirac_encoder.py'
--mng = 'mng_encoder.py'
--gif = 'gif_encoder.py'
-+mpeg = 'mpeg_encoder'
-+ogm = 'ogm_encoder'
-+mkv = 'mkv_encoder'
-+ogg = 'theora_encoder'
-+avi = 'avi_encoder'
-+drc = 'lives_dirac_encoder'
-+mng = 'mng_encoder'
-+gif = 'gif_encoder'
-
- usage = \
- """
-@@ -58,14 +58,14 @@ SUMMARY (ver. %s):
-
- LiVES plugin which calls one of the following programs:
-
--mpeg_encoder.py
--ogm_encoder.py
--mkv_encoder.py
--theora_encoder.py
--avi_encoder.py
--dirac_encoder.py
--mng_encoder.py
--gif_encoder.py
-+mpeg_encoder
-+ogm_encoder
-+mkv_encoder
-+theora_encoder
-+avi_encoder
-+lives_dirac_encoder
-+mng_encoder
-+gif_encoder
-
- in order to generate movies in one of the following formats:
-
-@@ -84,7 +84,7 @@ VCD/SVCD/DVD (NTSC and PAL video)
- MNG (no sound)
- Animated GIF (no sound)
-
--The *.py encoder programs are either part of your LiVES
-+The * encoder programs are either part of your LiVES
- ditribution and/or available from:
-
- http://lives.reimeika.ca/lives_guide.html
-@@ -484,7 +484,7 @@ if __name__ == '__main__':
- quiet = '-q'
- tonull = '2> /dev/null'
-
-- encode_command = ' '.join([prog + '_encoder.py', '-o', \
-+ encode_command = ' '.join([prog + '_encoder', '-o', \
- outfile, '-w', tempdir, '-a', arc, \
- '-f', fpsc, quiet, '-t', \
- type, '-s ./audiodump.wav', \
-@@ -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.
--27 Sep 2004 : 0.0.7 : added 'theora_encoder' and 'dirac_encoder'
-+27 Sep 2004 : 0.0.7 : added 'theora_encoder' and 'lives_dirac_encoder'
- (the latter HIGHLY EXPERIMENTAL).
- no longer needs all encoders to work, it
- will look for and offer the available
-@@ -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.
--28 Oct 2004 : 0.1.1 : added support for mng_encoder.py.
-+28 Oct 2004 : 0.1.1 : added support for mng_encoder.
- can use arbitrary frame rate for ogm/mkv/dirac.
- 28 Oct 2004 : 0.1.2 : added PAL support.
--29 Oct 2004 : 0.1.3 : added support for gif_encoder.py.
-+29 Oct 2004 : 0.1.3 : added support for gif_encoder.
- 02 Nov 2004 : 0.1.4 : added xvid.
- made descriptions clearer.
- 08 Nov 2004 : 0.1.5 : rm xvid-twopass.stats if present.
-@@ -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.
--03 Jan 2005 : 0.2.2 : added avi_encoder.py.
-+03 Jan 2005 : 0.2.2 : added avi_encoder.
- 04 Jan 2005 : 0.2.3 : added h.264 options.
- 24 Feb 2005 : 0.2.4 : expanded allowed audio sample rates.
- 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,14 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- marcosencodersdir = $(bindir)
--marcosencoders_DATA = dirac_encoder.py \
--avi_encoder.py \
--gif_encoder.py \
--mkv_encoder.py \
--mng_encoder.py \
--mpeg_encoder.py \
--ogm_encoder.py \
--theora_encoder.py \
--dirac_encoder3.py \
--avi_encoder3.py \
--gif_encoder3.py \
--mkv_encoder3.py \
--mng_encoder3.py \
--mpeg_encoder3.py \
--ogm_encoder3.py \
--theora_encoder3.py
-+marcosencoders_DATA = lives_dirac_encoder \
-+avi_encoder \
-+gif_encoder \
-+mkv_encoder \
-+mng_encoder \
-+mpeg_encoder \
-+ogm_encoder \
-+theora_encoder
-
- EXTRA_DIST = $(marcosencoders_DATA) README.multi_encoder
- all: all-am
--
lives packaging
More information about the pkg-multimedia-commits
mailing list