[SCM] soundconverter/master: Remove patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Oct 11 22:18:40 UTC 2015
The following commit has been merged in the master branch:
commit 2d7365a6f100217c3c79bef07c665cc6f7a07eec
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Oct 12 00:13:03 2015 +0200
Remove patches
diff --git a/debian/patches/fix-lame-element-name.patch b/debian/patches/fix-lame-element-name.patch
deleted file mode 100644
index c48aefa..0000000
--- a/debian/patches/fix-lame-element-name.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7b7532372c719b3f2a4da9b6e1c02ec63061f84f Mon Sep 17 00:00:00 2001
-From: kassoulet <gautier at soundconverter.org>
-Date: Thu, 4 Dec 2014 17:41:54 +0100
-Subject: [PATCH] Fix lame element name.
-
----
- soundconverter/gstreamer.py | 2 +-
- soundconverter/ui.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py
-index 27cadb7..4ad396d 100644
---- a/soundconverter/gstreamer.py
-+++ b/soundconverter/gstreamer.py
-@@ -107,7 +107,7 @@ def gtk_sleep(duration):
- ('oggmux', 'Ogg Vorbis'),
- ('id3v2mux', 'MP3 Tags'),
- ('xingmux', 'Xing Header'),
-- ('lame', 'MP3'),
-+ ('lamemp3enc', 'MP3'),
- ('faac', 'AAC'),
- ('mp4mux', 'AAC'),
- ('opusenc', 'Opus'),
-diff --git a/soundconverter/ui.py b/soundconverter/ui.py
-index 5061597..154296c 100644
---- a/soundconverter/ui.py
-+++ b/soundconverter/ui.py
-@@ -483,7 +483,7 @@ def set_widget_initial_values(self, builder):
- mime_type = self.get_string('output-mime-type')
-
- widgets = ( ('audio/x-vorbis', 'vorbisenc'),
-- ('audio/mpeg' , 'lame'),
-+ ('audio/mpeg' , 'lamemp3enc'),
- ('audio/x-flac' , 'flacenc'),
- ('audio/x-wav' , 'wavenc'),
- ('audio/x-m4a' , 'faac'),
-@@ -545,7 +545,7 @@ def set_widget_initial_values(self, builder):
- self.change_mime_type(mime_type)
-
- # display information about mp3 encoding
-- if 'lame' not in available_elements:
-+ if 'lamemp3enc' not in available_elements:
- w = self.lame_absent
- w.show()
-
diff --git a/debian/patches/fix-missing-import.patch b/debian/patches/fix-missing-import.patch
deleted file mode 100644
index ad92895..0000000
--- a/debian/patches/fix-missing-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5db8a9ce24ed76be061da9109a6acaeb4db3e221 Mon Sep 17 00:00:00 2001
-From: kassoulet <gautier at soundconverter.org>
-Date: Tue, 7 Oct 2014 14:25:43 +0200
-Subject: [PATCH] Fix missing import.
-
----
- soundconverter/ui.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/soundconverter/ui.py b/soundconverter/ui.py
-index f22d8ea..0528bc8 100644
---- a/soundconverter/ui.py
-+++ b/soundconverter/ui.py
-@@ -35,7 +35,7 @@
-
- from soundconverter.gconfstore import GConfStore
- from soundconverter.fileoperations import filename_to_uri, beautify_uri
--from soundconverter.fileoperations import unquote_filename, vfs_walk
-+from soundconverter.fileoperations import unquote_filename, vfs_walk, vfs_exists
- from soundconverter.gstreamer import ConverterQueue
- from soundconverter.gstreamer import available_elements, TypeFinder, TagReader
- from soundconverter.gstreamer import audio_profiles_list, audio_profiles_dict
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3423081..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix-missing-import.patch
-fix-lame-element-name.patch
-xing-header-vbr.patch
diff --git a/debian/patches/xing-header-vbr.patch b/debian/patches/xing-header-vbr.patch
deleted file mode 100644
index 1dc26ec..0000000
--- a/debian/patches/xing-header-vbr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 34895a65370ff841d9995c311a9c1c51dedbb3ae Mon Sep 17 00:00:00 2001
-From: kassoulet <gautier at soundconverter.org>
-Date: Thu, 4 Dec 2014 17:42:21 +0100
-Subject: [PATCH] Only add xing header when generating VBR MP3s.
-
----
- soundconverter/gstreamer.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/soundconverter/gstreamer.py b/soundconverter/gstreamer.py
-index 4ad396d..0eab544 100644
---- a/soundconverter/gstreamer.py
-+++ b/soundconverter/gstreamer.py
-@@ -618,8 +618,8 @@ def add_mp3_encoder(self):
-
- cmd += properties[self.mp3_mode] % self.mp3_quality
-
-- if 'xingmux' in available_elements and properties[self.mp3_mode][0]:
-- # add xing header when creating VBR mp3
-+ if 'xingmux' in available_elements and self.mp3_mode != 'cbr':
-+ # add xing header when creating VBR/ABR mp3
- cmd += '! xingmux '
-
- if 'id3v2mux' in available_elements:
--
soundconverter packaging
More information about the pkg-multimedia-commits
mailing list