Merge lp:~jm-leddy/ubuntu/precise/transmageddon/movepresets into lp:ubuntu/precise/transmageddon

Proposed by James M. Leddy on 2012-07-31
Status: Rejected
Rejected by: Martin Pitt on 2012-08-21
Proposed branch: lp:~jm-leddy/ubuntu/precise/transmageddon/movepresets
Merge into: lp:ubuntu/precise/transmageddon
Diff against target: 70 lines (+40/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/patches/series (+1/-0)
debian/patches/transmageddon_specific_preset_directory.patch (+31/-0)
To merge this branch: bzr merge lp:~jm-leddy/ubuntu/precise/transmageddon/movepresets
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-07-31 Pending
Review via email: mp+117478@code.launchpad.net
To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

With 0.21-1 in quantal, this does not seem to be necessary any more. Thanks a lot for your work on it though!

Unmerged revisions

8. By James M. Leddy on 2012-07-31

Backport upstream commit 5a25dfee to use a transmageddon specific
directory for the presets. (LP: #945987)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-03 22:27:04 +0000
3+++ debian/changelog 2012-07-31 16:09:19 +0000
4@@ -1,3 +1,10 @@
5+transmageddon (0.20-1ubuntu1) quantal; urgency=low
6+
7+ * Backport upstream commit 5a25dfee to use a transmageddon specific
8+ directory for the presets. (LP: #945987)
9+
10+ -- James M Leddy <james.leddy@canonical.com> Tue, 31 Jul 2012 00:02:37 -0400
11+
12 transmageddon (0.20-1) unstable; urgency=low
13
14 * New upstream release:
15
16=== modified file 'debian/control'
17--- debian/control 2011-12-03 22:27:04 +0000
18+++ debian/control 2012-07-31 16:09:19 +0000
19@@ -18,7 +18,7 @@
20 Package: transmageddon
21 Architecture: all
22 Depends:
23- gstreamer0.10-plugins-bad,
24+ gstreamer0.10-plugins-bad (>=0.10.22.3-2ubuntu2.1),
25 gstreamer0.10-plugins-base,
26 gstreamer0.10-plugins-good,
27 gstreamer0.10-plugins-ugly,
28
29=== added directory 'debian/patches'
30=== added file 'debian/patches/series'
31--- debian/patches/series 1970-01-01 00:00:00 +0000
32+++ debian/patches/series 2012-07-31 16:09:19 +0000
33@@ -0,0 +1,1 @@
34+transmageddon_specific_preset_directory.patch
35
36=== added file 'debian/patches/transmageddon_specific_preset_directory.patch'
37--- debian/patches/transmageddon_specific_preset_directory.patch 1970-01-01 00:00:00 +0000
38+++ debian/patches/transmageddon_specific_preset_directory.patch 2012-07-31 16:09:19 +0000
39@@ -0,0 +1,31 @@
40+Origin: upstream, commit: 5a25dfee615dbf5fa33d5b456ec54468a81bb36
41+Author: uraeus <uraeus@gnome.org>
42+Date: Tue, 03 Apr 2012 10:35:35 +0000
43+Description: Switch to user preset directory
44+Forwarded: not-needed
45+
46+---
47+Index: b/presets/Makefile.am
48+===================================================================
49+--- a/presets/Makefile.am
50++++ b/presets/Makefile.am
51+@@ -1,5 +1,5 @@
52+
53+-presetdir = $(datadir)/gstreamer-0.10/presets
54++presetdir = $(datadir)/transmageddon/presets
55+ preset_DATA = ffenc_ac3.prs GstFaac.prs GstVorbisEnc.prs \
56+ ffenc_flv.prs GstLameMP3Enc.prs \
57+ ffenc_h263p.prs GstXvidEnc.prs \
58+Index: b/src/transcoder_engine.py
59+===================================================================
60+--- a/src/transcoder_engine.py
61++++ b/src/transcoder_engine.py
62+@@ -56,6 +56,8 @@
63+ self.containercaps=gst.Caps("application/x-id3")
64+ self.container=gst.Caps("application/x-id3")
65+
66++ # set preset directory
67++ Gst.preset_set_app_dir("/usr/share/transmageddon/presets/")
68+
69+ # Choose plugin based on Codec Name
70+ # or switch to remuxing mode if any of the values are set to 'pastr'

Subscribers

People subscribed via source and target branches