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

[James M. Leddy]

[Daniel Holbach (dholbach)]

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)

=== 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 @@
+transmageddon (0.20-1ubuntu1) quantal; urgency=low
+
+  * Backport upstream commit 5a25dfee to use a transmageddon specific
+    directory for the presets. (LP: #945987)
+
+ -- James M Leddy <[e-mail]>  Tue, 31 Jul 2012 00:02:37 -0400
+
 transmageddon (0.20-1) unstable; urgency=low
 
   * New upstream release:
 
=== 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 @@
 Package: transmageddon
 Architecture: all
 Depends:
- gstreamer0.10-plugins-bad,
+ gstreamer0.10-plugins-bad (>=0.10.22.3-2ubuntu2.1),
  gstreamer0.10-plugins-base,
  gstreamer0.10-plugins-good,
  gstreamer0.10-plugins-ugly,
 
=== 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 @@
+transmageddon_specific_preset_directory.patch
 
=== 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 @@
+Origin: upstream, commit: 5a25dfee615dbf5fa33d5b456ec54468a81bb36
+Author: uraeus <[e-mail]>
+Date: Tue, 03 Apr 2012 10:35:35 +0000
+Description: Switch to user preset directory
+Forwarded: not-needed
+
+---
+Index: b/presets/Makefile.am
+===================================================================
+--- a/presets/Makefile.am
++++ b/presets/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-presetdir = $(datadir)/gstreamer-0.10/presets
++presetdir = $(datadir)/transmageddon/presets
+ preset_DATA = ffenc_ac3.prs GstFaac.prs GstVorbisEnc.prs \
+               ffenc_flv.prs GstLameMP3Enc.prs \
+               ffenc_h263p.prs GstXvidEnc.prs \
+Index: b/src/transcoder_engine.py
+===================================================================
+--- a/src/transcoder_engine.py
++++ b/src/transcoder_engine.py
+@@ -56,6 +56,8 @@
+                self.containercaps=gst.Caps("application/x-id3")
+                self.container=gst.Caps("application/x-id3")
+ 
++       # set preset directory
++       Gst.preset_set_app_dir("/usr/share/transmageddon/presets/")
+ 
+        # Choose plugin based on Codec Name
+        # or switch to remuxing mode if any of the values are set to 'pastr'