[SCM] lives packaging branch, master, updated. debian/1.3.3-2-15-gf37f466

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Jul 5 22:29:11 UTC 2010


The following commit has been merged in the master branch:
commit f37f4665ac98d0e6b4e5d40f370ae7078ee281d9
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 6 00:29:05 2010 +0200

    Drop previously added patch, unnecessary.

diff --git a/debian/patches/02-drop_py3_mods.patch b/debian/patches/02-drop_py3_mods.patch
deleted file mode 100644
index 4347762..0000000
--- a/debian/patches/02-drop_py3_mods.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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 fcf0962..0306a68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 cdda2wav_to_icedax.diff
-02-drop_py3_mods.patch

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list