[SCM] gmerlin/master: updated to new upstream

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fe2f6613443b53207de0a3c5189a07763b6ce6cd
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jan 10 12:10:27 2011 +0100

    updated to new upstream

diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 76f40d5..0665ad9 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -1,9 +1,7 @@
-Index: gmerlin-0.4.3/apps/transcoder/gmerlin_transcoder.1
-===================================================================
---- gmerlin-0.4.3.orig/apps/transcoder/gmerlin_transcoder.1	2010-02-20 17:33:17.000000000 -0600
-+++ gmerlin-0.4.3/apps/transcoder/gmerlin_transcoder.1	2010-03-20 11:02:37.000000000 -0500
+--- gmerlin.orig/apps/transcoder/gmerlin_transcoder.1
++++ gmerlin/apps/transcoder/gmerlin_transcoder.1
 @@ -1,6 +1,6 @@
- .TH GMERLIN_TRANSCODER 1 "February 2010" Gmerlin "User Manuals"
+ .TH GMERLIN_TRANSCODER 1 "January 2011" Gmerlin "User Manuals"
  .SH NAME
 -gmerlin_transcoder
 +gmerlin_transcoder \- GTK multimedia transcoder
@@ -49,12 +47,10 @@ Index: gmerlin-0.4.3/apps/transcoder/gmerlin_transcoder.1
  
  .RS 2
  Print version info and exit
-Index: gmerlin-0.4.3/apps/transcoder/gmerlin_transcoder_remote.1
-===================================================================
---- gmerlin-0.4.3.orig/apps/transcoder/gmerlin_transcoder_remote.1	2010-02-20 17:33:17.000000000 -0600
-+++ gmerlin-0.4.3/apps/transcoder/gmerlin_transcoder_remote.1	2010-03-20 11:02:30.000000000 -0500
+--- gmerlin.orig/apps/transcoder/gmerlin_transcoder_remote.1
++++ gmerlin/apps/transcoder/gmerlin_transcoder_remote.1
 @@ -1,6 +1,6 @@
- .TH GMERLIN_TRANSCODER_REMOTE 1 "February 2010" Gmerlin "User Manuals"
+ .TH GMERLIN_TRANSCODER_REMOTE 1 "January 2011" Gmerlin "User Manuals"
  .SH NAME
 -gmerlin_transcoder_remote
 +gmerlin_transcoder_remote \- Remote control command for the Gmerlin GUI transcoder
@@ -133,12 +129,10 @@ Index: gmerlin-0.4.3/apps/transcoder/gmerlin_transcoder_remote.1
  
  .RS 2
  Print version info and exit
-Index: gmerlin-0.4.3/apps/player/gmerlin.1
-===================================================================
---- gmerlin-0.4.3.orig/apps/player/gmerlin.1	2010-02-20 17:33:17.000000000 -0600
-+++ gmerlin-0.4.3/apps/player/gmerlin.1	2010-03-20 11:00:31.000000000 -0500
+--- gmerlin.orig/apps/player/gmerlin.1
++++ gmerlin/apps/player/gmerlin.1
 @@ -1,6 +1,6 @@
- .TH GMERLIN 1 "February 2010" Gmerlin "User Manuals"
+ .TH GMERLIN 1 "January 2011" Gmerlin "User Manuals"
  .SH NAME
 -gmerlin
 +gmerlin \- Gmerlin GUI Player
@@ -175,12 +169,10 @@ Index: gmerlin-0.4.3/apps/player/gmerlin.1
  
  .RS 2
  Print version info and exit
-Index: gmerlin-0.4.3/apps/player/gmerlin_remote.1
-===================================================================
---- gmerlin-0.4.3.orig/apps/player/gmerlin_remote.1	2010-02-20 17:33:17.000000000 -0600
-+++ gmerlin-0.4.3/apps/player/gmerlin_remote.1	2010-03-20 11:01:58.000000000 -0500
+--- gmerlin.orig/apps/player/gmerlin_remote.1
++++ gmerlin/apps/player/gmerlin_remote.1
 @@ -1,6 +1,6 @@
- .TH GMERLIN_REMOTE 1 "February 2010" Gmerlin "User Manuals"
+ .TH GMERLIN_REMOTE 1 "January 2011" Gmerlin "User Manuals"
  .SH NAME
 -gmerlin_remote
 +gmerlin_remote \- Remote control command for the Gmerlin GUI Player
@@ -356,12 +348,10 @@ Index: gmerlin-0.4.3/apps/player/gmerlin_remote.1
  
  .RS 2
  Print version info and exit
-Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
-===================================================================
---- gmerlin-0.4.3.orig/apps/cmdlineplayer/gmerlin_play.1	2010-02-20 17:33:17.000000000 -0600
-+++ gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1	2010-03-20 11:01:32.000000000 -0500
+--- gmerlin.orig/apps/cmdlineplayer/gmerlin_play.1
++++ gmerlin/apps/cmdlineplayer/gmerlin_play.1
 @@ -1,6 +1,6 @@
- .TH GMERLIN_PLAYER 1 "February 2010" Gmerlin "User Manuals"
+ .TH GMERLIN_PLAYER 1 "January 2011" Gmerlin "User Manuals"
  .SH NAME
 -gmerlin_player
 +gmerlin_player \- Commandline Multimedia player
@@ -451,7 +441,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  boundaries is performed. It can wedge if errors  occur  in the attempted
  overlap area. Not recommended.
  
-@@ -903,7 +903,7 @@
+@@ -884,7 +884,7 @@
  .RE
  .RE
  
@@ -460,7 +450,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  .I <audio_options>
  
  .RS 2
-@@ -1013,7 +1013,7 @@
+@@ -994,7 +994,7 @@
  .P
  .RE
  
@@ -469,7 +459,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  .I <video_options>
  
  .RS 2
-@@ -1075,7 +1075,7 @@
+@@ -1056,7 +1056,7 @@
  .P
  .RE
  
@@ -478,7 +468,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  .I <input_options>
  
  .RS 2
-@@ -1090,7 +1090,7 @@
+@@ -1071,7 +1071,7 @@
  realtime filter tweaking work.
  
  .P
@@ -487,7 +477,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  .P
  Sync offset [ms]
  .P
-@@ -1100,7 +1100,7 @@
+@@ -1081,7 +1081,7 @@
  .P
  .RE
  
@@ -496,7 +486,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  .I <osd_options>
  
  .RS 2
-@@ -1185,27 +1185,27 @@
+@@ -1166,27 +1166,27 @@
  .P
  .RE
  
@@ -528,7 +518,7 @@ Index: gmerlin-0.4.3/apps/cmdlineplayer/gmerlin_play.1
  .I <track_spec>
  
  .RS 2
-@@ -1215,25 +1215,25 @@
+@@ -1196,25 +1196,25 @@
  .SH GENERIC OPTIONS
  The following generic options are available for all gmerlin applications
  

-- 
gmerlin packaging