[SCM] mplayer packaging branch, master.experimental, updated. debian/1.0.rc3++final-1.exp1-8-gf51a9b9

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit b94a97609cc770152fd90b69ac7549619b32f87f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 28 21:10:27 2010 -0400

    remove patches merged upstream

diff --git a/debian/patches/11configure-mktemp.patch b/debian/patches/11configure-mktemp.patch
deleted file mode 100644
index 00e2840..0000000
--- a/debian/patches/11configure-mktemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: <debdev at pingu>
-Description: use mktemp for temp files
---- a/configure
-+++ b/configure
-@@ -1475,6 +1475,10 @@ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; d
-   test "$I" && break
- done
- 
-+if which mktemp >/dev/null 2>/dev/null; then
-+  # BSD/Debian/etc. mktemp avoids symlink attacks etc.
-+  I=`mktemp -d "$I"/mplayer.XXXXXX` || exit 1
-+fi
- 
- TMPLOG="configure.log"
- TMPC="$I/mplayer-conf-$RANDOM-$$.c"
diff --git a/debian/patches/24forgotten-bgr15-format.patch b/debian/patches/24forgotten-bgr15-format.patch
deleted file mode 100644
index 4b663c9..0000000
--- a/debian/patches/24forgotten-bgr15-format.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Reimar
-Subject: 100l, add forgotten BGR15 format to fmt-conversion.c table
-Origin: upstream, r29117, http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2009-April/036930.html
-
---- a/fmt-conversion.c
-+++ b/fmt-conversion.c
-@@ -28,6 +28,7 @@ static const struct {
-     {IMGFMT_BGR32, PIX_FMT_RGB32},
-     {IMGFMT_BGR24, PIX_FMT_BGR24},
-     {IMGFMT_BGR16, PIX_FMT_RGB565},
-+    {IMGFMT_BGR15, PIX_FMT_RGB555},
-     {IMGFMT_BGR8,  PIX_FMT_RGB8},
-     {IMGFMT_BGR4,  PIX_FMT_RGB4},
-     {IMGFMT_BGR1,  PIX_FMT_MONOBLACK},
diff --git a/debian/patches/series b/debian/patches/series
index d0400e9..654f8bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
-24forgotten-bgr15-format.patch

-- 
mplayer packaging