[SCM] gmerlin/master: Add DEP-3 headers to patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jan 10 15:58:27 UTC 2011
The following commit has been merged in the master branch:
commit a175aa42c7f04dd283f96af40f61b5288c3f1ed1
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jan 10 16:58:09 2011 +0100
Add DEP-3 headers to patches.
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 0665ad9..ae7de38 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -1,3 +1,13 @@
+Description: Improve the manpages provide by upstream.
+Origin: Debian
+---
+ apps/cmdlineplayer/gmerlin_play.1 | 48 +++++++++++++-------------
+ apps/player/gmerlin.1 | 10 ++---
+ apps/player/gmerlin_remote.1 | 50 ++++++++++++++--------------
+ apps/transcoder/gmerlin_transcoder.1 | 12 +++---
+ apps/transcoder/gmerlin_transcoder_remote.1 | 20 +++++------
+ 5 files changed, 70 insertions(+), 70 deletions(-)
+
--- gmerlin.orig/apps/transcoder/gmerlin_transcoder.1
+++ gmerlin/apps/transcoder/gmerlin_transcoder.1
@@ -1,6 +1,6 @@
@@ -8,7 +18,7 @@
.SH SYNOPSIS
.B gmerlin_transcoder
.I [options]
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ GTK multimedia transcoder
.SH OPTIONS
@@ -17,7 +27,7 @@
.I <file>
.RS 2
-@@ -20,25 +20,25 @@
+@@ -20,25 +20,25 @@ Load a profile from the given file
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -57,7 +67,7 @@
.SH SYNOPSIS
.B gmerlin_transcoder_remote
.I [options]
-@@ -11,21 +11,21 @@
+@@ -11,21 +11,21 @@ Remote control command for the Gmerlin G
.SH GLOBAL OPTIONS
@@ -82,7 +92,7 @@
.RS 2
Launch new transcoder if necessary
-@@ -33,14 +33,14 @@
+@@ -33,14 +33,14 @@ Launch new transcoder if necessary
.SH COMMANDS
@@ -99,7 +109,7 @@
.I <location>
.RS 2
-@@ -50,25 +50,25 @@
+@@ -50,25 +50,25 @@ Add <location> to the track list
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -139,7 +149,7 @@
.SH SYNOPSIS
.B gmerlin
.I [options]
-@@ -12,25 +12,25 @@
+@@ -12,25 +12,25 @@ Gmerlin GUI Player
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -179,7 +189,7 @@
.SH SYNOPSIS
.B gmerlin_remote
.I [options]
-@@ -11,21 +11,21 @@
+@@ -11,21 +11,21 @@ Remote control command for the Gmerlin G
.SH GLOBAL OPTIONS
@@ -204,7 +214,7 @@
.RS 2
Launch new player if necessary
-@@ -33,64 +33,64 @@
+@@ -33,64 +33,64 @@ Launch new player if necessary
.SH COMMANDS
@@ -279,7 +289,7 @@
.I <device>
.RS 2
-@@ -98,57 +98,57 @@
+@@ -98,57 +98,57 @@ Open album for <device> and play first t
dvd:///dev/hdd).
.RE
@@ -358,7 +368,7 @@
.SH SYNOPSIS
.B gmerlin_player
.I [options]
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ Commandline Multimedia player
.SH OPTIONS
@@ -367,7 +377,7 @@
.I <audio_output_options>
.RS 2
-@@ -140,7 +140,7 @@
+@@ -140,7 +140,7 @@ Host (empty: local)
.RE
.RE
@@ -376,7 +386,7 @@
.I <video_output_options>
.RS 2
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,7 @@ Window ID
.P
.RE
@@ -385,7 +395,7 @@
.I <input_plugin>
.RS 2
-@@ -262,7 +262,7 @@
+@@ -262,7 +262,7 @@ postprocessing, 1 means maximum postproc
Shrink factor
.P
This enables downscaling of images while decoding. Currently only
@@ -394,7 +404,7 @@
.P
.BR vdpau "=[1|0] (default: 1)"
-@@ -371,7 +371,7 @@
+@@ -371,7 +371,7 @@ Default subtitle encoding
.P
This sets the default encoding for text subtitles,when the original
encoding is unknown. It must be a character set namerecognized by iconv.
@@ -403,7 +413,7 @@
.P
.BR sample_accuracy "=<string>"
-@@ -412,7 +412,7 @@
+@@ -412,7 +412,7 @@ Export date and time as timecodes for DV
.P
.RS 2
@@ -412,7 +422,7 @@
.P
Trackname template
.P
-@@ -421,16 +421,16 @@
+@@ -421,16 +421,16 @@ Template for track name generation from
%a: Album
%g: Genre
%t: Track name
@@ -432,7 +442,7 @@
.P
.BR use_local "=[1|0] (default: 1)"
-@@ -547,7 +547,7 @@
+@@ -547,7 +547,7 @@ Disable all data verification and correc
.P
Disable extra paranoia
.P
@@ -441,7 +451,7 @@
boundaries is performed. It can wedge if errors occur in the attempted
overlap area. Not recommended.
-@@ -884,7 +884,7 @@
+@@ -884,7 +884,7 @@ Render quality
.RE
.RE
@@ -450,7 +460,7 @@
.I <audio_options>
.RS 2
-@@ -994,7 +994,7 @@
+@@ -994,7 +994,7 @@ Mix mode when downmixing Stereo to Mono.
.P
.RE
@@ -459,7 +469,7 @@
.I <video_options>
.RS 2
-@@ -1056,7 +1056,7 @@
+@@ -1056,7 +1056,7 @@ restart
.P
.RE
@@ -468,7 +478,7 @@
.I <input_options>
.RS 2
-@@ -1071,7 +1071,7 @@
+@@ -1071,7 +1071,7 @@ When showing still images, gmerlin repea
realtime filter tweaking work.
.P
@@ -477,7 +487,7 @@
.P
Sync offset [ms]
.P
-@@ -1081,7 +1081,7 @@
+@@ -1081,7 +1081,7 @@ and video. Use positive values if the vi
.P
.RE
@@ -486,7 +496,7 @@
.I <osd_options>
.RS 2
-@@ -1166,27 +1166,27 @@
+@@ -1166,27 +1166,27 @@ Duration (milliseconds)
.P
.RE
@@ -518,7 +528,7 @@
.I <track_spec>
.RS 2
-@@ -1196,25 +1196,25 @@
+@@ -1196,25 +1196,25 @@ Set verbosity level (0..4)
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
diff --git a/debian/patches/remove_desktop_encoding_key.patch b/debian/patches/remove_desktop_encoding_key.patch
index f3285fc..d9bf433 100644
--- a/debian/patches/remove_desktop_encoding_key.patch
+++ b/debian/patches/remove_desktop_encoding_key.patch
@@ -1,27 +1,30 @@
-Index: gmerlin-0.4.3/apps/transcoder/gmerlin-transcoder.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/transcoder/gmerlin-transcoder.desktop 2010-02-26 08:34:38.000000000 -0600
-+++ gmerlin-0.4.3/apps/transcoder/gmerlin-transcoder.desktop 2010-03-20 11:38:42.000000000 -0500
+Description: Update desktop files as per Freedesktop.org's spec.
+ Remove 'Encoding' keys since they are deprecated.
+Origin: Debian
+---
+ apps/recorder/gmerlin-recorder.desktop | 1 -
+ apps/transcoder/gmerlin-transcoder.desktop | 1 -
+ apps/visualizer/gmerlin-visualizer.desktop | 1 -
+ 3 files changed, 3 deletions(-)
+
+--- gmerlin.orig/apps/transcoder/gmerlin-transcoder.desktop
++++ gmerlin/apps/transcoder/gmerlin-transcoder.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Gmerlin transcoder
Name[de]=Gmerlin transcoder
Comment=Gmerlin multimedia transcoder
-Index: gmerlin-0.4.3/apps/visualizer/gmerlin-visualizer.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/visualizer/gmerlin-visualizer.desktop 2010-02-26 08:34:38.000000000 -0600
-+++ gmerlin-0.4.3/apps/visualizer/gmerlin-visualizer.desktop 2010-03-20 11:38:42.000000000 -0500
+--- gmerlin.orig/apps/visualizer/gmerlin-visualizer.desktop
++++ gmerlin/apps/visualizer/gmerlin-visualizer.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Gmerlin visualizer
Name[de]=Gmerlin visualisierer
Comment=Run visualization plugins
-Index: gmerlin-0.4.3/apps/recorder/gmerlin-recorder.desktop
-===================================================================
---- gmerlin-0.4.3.orig/apps/recorder/gmerlin-recorder.desktop 2010-03-20 11:47:54.000000000 -0500
-+++ gmerlin-0.4.3/apps/recorder/gmerlin-recorder.desktop 2010-03-20 11:47:56.000000000 -0500
+--- gmerlin.orig/apps/recorder/gmerlin-recorder.desktop
++++ gmerlin/apps/recorder/gmerlin-recorder.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
--
gmerlin packaging
More information about the pkg-multimedia-commits
mailing list