[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3++final-0ubuntu2

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 8ba60bef5c1165129b5365aaf78332840a29c8e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 2 18:08:00 2010 +0200

    refreshed patches

diff --git a/debian/patches/11configure-mktemp.patch b/debian/patches/11configure-mktemp.patch
index 2229bd6..00e2840 100644
--- a/debian/patches/11configure-mktemp.patch
+++ b/debian/patches/11configure-mktemp.patch
@@ -2,7 +2,7 @@ Author: <debdev at pingu>
 Description: use mktemp for temp files
 --- a/configure
 +++ b/configure
-@@ -1477,6 +1477,10 @@ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; d
+@@ -1475,6 +1475,10 @@ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; d
    test "$I" && break
  done
  
diff --git a/debian/patches/22disable-xscreensaver.patch b/debian/patches/22disable-xscreensaver.patch
index 559decd..0012b36 100644
--- a/debian/patches/22disable-xscreensaver.patch
+++ b/debian/patches/22disable-xscreensaver.patch
@@ -47,7 +47,7 @@ Description: This patch avoids xscreensaver from blanking onto your favorite mov
                  if (vo_mouse_autohide)
                  {
                      vo_showcursor(mydisplay, vo_window);
-@@ -1437,6 +1445,16 @@ void xscreensaver_heartbeat(void)
+@@ -1443,6 +1451,16 @@ void xscreensaver_heartbeat(void)
  
          XResetScreenSaver(mDisplay);
      }
@@ -66,7 +66,7 @@ Description: This patch avoids xscreensaver from blanking onto your favorite mov
  static int xss_suspend(Bool suspend)
 --- a/DOCS/man/en/mplayer.1
 +++ b/DOCS/man/en/mplayer.1
-@@ -3257,10 +3257,12 @@ Specify the screen width for video output drivers which
+@@ -3257,8 +3257,10 @@ Specify the screen width for video outpu
  do not know the screen resolution like fbdev, x11 and TV-out.
  .
  .TP
@@ -78,5 +78,3 @@ Description: This patch avoids xscreensaver from blanking onto your favorite mov
  If your screensaver supports neither the XSS nor XResetScreenSaver
  API please use \-heartbeat\-cmd instead.
  .
- .TP
- .B "\-vm \ \ \ "
diff --git a/debian/patches/23mplayer-debug-printf.patch b/debian/patches/23mplayer-debug-printf.patch
index ef7e668..6bda917 100644
--- a/debian/patches/23mplayer-debug-printf.patch
+++ b/debian/patches/23mplayer-debug-printf.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/mplayer.c
 +++ b/mplayer.c
-@@ -801,6 +801,10 @@ static void exit_sighandler(int x){
+@@ -800,6 +800,10 @@ static void exit_sighandler(int x){
        mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
    default:
        mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
@@ -14,4 +14,4 @@ Forwarded: not-needed
 +             "   'mplayer-dbg'.]\n");
  #ifdef CONFIG_CRASH_DEBUG
        if (crash_debug) {
-         int gdb_pid;
+ 	int gdb_pid;

-- 
mplayer packaging