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
=== modified file 'debian/changelog'
--- debian/changelog 2011-12-03 22:27:04 +0000
+++ debian/changelog 2012-07-31 16:09:19 +0000
@@ -1,3 +1,10 @@
1transmageddon (0.20-1ubuntu1) quantal; urgency=low
2
3 * Backport upstream commit 5a25dfee to use a transmageddon specific
4 directory for the presets. (LP: #945987)
5
6 -- James M Leddy <james.leddy@canonical.com> Tue, 31 Jul 2012 00:02:37 -0400
7
1transmageddon (0.20-1) unstable; urgency=low8transmageddon (0.20-1) unstable; urgency=low
29
3 * New upstream release:10 * New upstream release:
411
=== modified file 'debian/control'
--- debian/control 2011-12-03 22:27:04 +0000
+++ debian/control 2012-07-31 16:09:19 +0000
@@ -18,7 +18,7 @@
18Package: transmageddon18Package: transmageddon
19Architecture: all19Architecture: all
20Depends:20Depends:
21 gstreamer0.10-plugins-bad,21 gstreamer0.10-plugins-bad (>=0.10.22.3-2ubuntu2.1),
22 gstreamer0.10-plugins-base,22 gstreamer0.10-plugins-base,
23 gstreamer0.10-plugins-good,23 gstreamer0.10-plugins-good,
24 gstreamer0.10-plugins-ugly,24 gstreamer0.10-plugins-ugly,
2525
=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2012-07-31 16:09:19 +0000
@@ -0,0 +1,1 @@
1transmageddon_specific_preset_directory.patch
02
=== added file 'debian/patches/transmageddon_specific_preset_directory.patch'
--- debian/patches/transmageddon_specific_preset_directory.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/transmageddon_specific_preset_directory.patch 2012-07-31 16:09:19 +0000
@@ -0,0 +1,31 @@
1Origin: upstream, commit: 5a25dfee615dbf5fa33d5b456ec54468a81bb36
2Author: uraeus <uraeus@gnome.org>
3Date: Tue, 03 Apr 2012 10:35:35 +0000
4Description: Switch to user preset directory
5Forwarded: not-needed
6
7---
8Index: b/presets/Makefile.am
9===================================================================
10--- a/presets/Makefile.am
11+++ b/presets/Makefile.am
12@@ -1,5 +1,5 @@
13
14-presetdir = $(datadir)/gstreamer-0.10/presets
15+presetdir = $(datadir)/transmageddon/presets
16 preset_DATA = ffenc_ac3.prs GstFaac.prs GstVorbisEnc.prs \
17 ffenc_flv.prs GstLameMP3Enc.prs \
18 ffenc_h263p.prs GstXvidEnc.prs \
19Index: b/src/transcoder_engine.py
20===================================================================
21--- a/src/transcoder_engine.py
22+++ b/src/transcoder_engine.py
23@@ -56,6 +56,8 @@
24 self.containercaps=gst.Caps("application/x-id3")
25 self.container=gst.Caps("application/x-id3")
26
27+ # set preset directory
28+ Gst.preset_set_app_dir("/usr/share/transmageddon/presets/")
29
30 # Choose plugin based on Codec Name
31 # or switch to remuxing mode if any of the values are set to 'pastr'

Subscribers

People subscribed via source and target branches