[SCM] mplayer/master: Merge branch 'master.experimental'

[siretart at users.alioth.debian.org]

update debian/changelog
fixup debian/source/options
enable blueray support
streamline debian/source/options with team policy
add build dependency on yasm
fix spelling in mplayer-dbg description, Closes: #617826
update configure flags for static libav* libraries
don't fail debian package build if not all shlibdeps information could be retrieved
unbreak building mplayer-doc package
make buildlogs verbose
--enable-largefile switch has been dropped
simply architecture specific dependencies, Closes: #634773
enable XVID, MP3 and X264 encoders
Select oss as default audio output module on kFreeBSD, Closes: #598431
tighten build depends on libav
update 23mplayer-debug-printf.patch
don't remove snapshot_version file
fix clean target
rewrite debian/copyright in DEP5 format
Fix build dependency on libjpeg-dev, Closes: #634277
update debian/changelog
Merge branch 'upstream' into master.experimental
work in master.experimental
Imported Upstream version 1.0~svn33713
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b13e5cdd72e22b336edc1ff7204c256e90a54f05
X-Git-Newrev: a3958391cd1b7c094dd5e29e77235a514cd5ee99

The following commit has been merged in the master branch:
commit dd98833d0e38b16f615b9b823767e3457d5c70fa
Merge: 0db89610268ed1e19f25f0bfc94a53d7e428b4d7 6afb5d62953b891fd88f5aea0dd8e91943721b63
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Sep 2 09:23:54 2011 +0200

    Merge branch 'master.experimental'
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 9fa5826,f39b5b8..daadbc9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,32 +1,43 @@@
- mplayer (2:1.0~rc4.dfsg1-3) UNRELEASED; urgency=low
- 
-   [ Reinhard Tartler ]
-   * prepare new upload
++mplayer (2:1.0~rc4.dfsg1+svn33713-2) unstable; urgency=low
 +
 +  [ Andres Mejia ]
 +  * Update to my @debian.org email.
 +
-  -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 14:17:27 -0400
++  [ Reinhard Tartler ]
++  * Upload to unstable
++
++ -- Reinhard Tartler <siretart at tauware.de>  Fri, 02 Sep 2011 09:22:11 +0200
++
+ mplayer (2:1.0~rc4.dfsg1+svn33713-1) experimental; urgency=low
+ 
+   * New upstream snapshot
+     - update 23mplayer-debug-printf.patch
+     - fixes miscompilation with gcc 4.6, Closes: #623304
+     - improved internal mkv demuxer, Closes: #595452
+     - Fixed segfault due to missing sanitation on playlist files,
+       Closes: #591525
+     - Fixed byteorder on 16-bit displays, Closes: #594093
+     - tighten build depends on libav
+     - --enable-largefile switch has been dropped
+     - add build dependency on yasm
+   * Fix build dependency on libjpeg-dev, Closes: #634277
+   * rewrite debian/copyright in DEP5 format
+   * fix clean target
+   * don't remove snapshot_version file
+   * enable XVID, MP3 and X264 encoders
+   * simply architecture specific dependencies, Closes: #634773
+   * make buildlogs verbose
+   * unbreak building mplayer-doc package
+   * don't fail debian package build if not all shlibdeps information could be retrieved
+   * update configure flags for static libav* libraries
+   * fix spelling in mplayer-dbg description, Closes: #617826
+   * enable blueray support, Closes: #577761
+ 
+   [ Robert Millan ]
+   * Select oss as default audio output module on kFreeBSD, Closes: #598431
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Jun 2011 09:05:54 +0200
++>>>>>>> master.experimental
  
  mplayer (2:1.0~rc4.dfsg1-2) unstable; urgency=low
  
diff --combined debian/control
index 01a72bb,1a2dbe8..c3f64fa
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,8 +5,7 @@@ Maintainer: Debian multimedia packages 
  Uploaders:
   A Mennucc1 <mennucc1 at debian.org>,
   Reinhard Tartler <siretart at tauware.de>,
 - Andres Mejia <mcitadel at gmail.com>
 -DM-Upload-Allowed: yes
 + Andres Mejia <amejia at debian.org>
  Standards-Version: 3.9.1
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer.git;a=summary
@@@ -16,12 -17,13 +16,13 @@@ Build-Depends
   docbook-xsl,
   ladspa-sdk,
   libaa1-dev,
-  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+  libasound2-dev [linux-any],
   libaudio-dev,
-  libavcodec-dev (>= 4:0.6),
-  libavdevice-dev (>= 4:0.6),
-  libavformat-dev (>= 4:0.6),
-  libavutil-dev (>= 4:0.6),
+  libavcodec-dev (>= 4:0.7~),
+  libavdevice-dev (>= 4:0.7~),
+  libavformat-dev (>= 4:0.7~),
+  libavutil-dev (>= 4:0.7~),
+  libbluray-dev,
   libcaca-dev,
   libcdparanoia-dev | libcdparanoia0-dev,
   libdirectfb-dev,
@@@ -37,30 -39,33 +38,33 @@@
   libgif-dev,
   libgl1-mesa-dev,
   libjack-dev,
-  libjpeg62-dev,
+  libjpeg-dev,
   liblircclient-dev,
   liblivemedia-dev,
   liblzo2-dev,
+  libmp3lame-dev,
   libmpcdec-dev,
   libncurses5-dev,
   libopenal-dev,
   libpng12-dev | libpng-dev,
-  libpostproc-dev (>= 4:0.6),
+  libpostproc-dev (>= 4:0.7~),
   libpulse-dev,
   libschroedinger-dev,
   libsdl1.2-dev | libsdl1.1-dev,
   libsmbclient-dev,
   libspeex-dev,
   libsvga1-dev [i386 amd64],
-  libswscale-dev (>= 4:0.6),
+  libswscale-dev (>= 4:0.7~),
   libtheora-dev (>= 1.0~beta1),
   libvdpau-dev [i386 amd64],
   libvorbis-dev,
   libvorbisidec-dev,
   libx11-dev,
+  libx264-dev,
   libxext-dev,
   libxinerama-dev,
   libxv-dev,
+  libxvidcore-dev,
   libxvmc-dev,
   libxxf86dga-dev,
   libxxf86vm-dev,
@@@ -68,6 -73,7 +72,7 @@@
   vstream-client-dev,
   x11proto-core-dev,
   xsltproc,
+  yasm,
   zlib1g-dev
  
  Package: mencoder
@@@ -140,7 -146,7 +145,7 @@@ Description: debugging symbols for MPla
   This package contains the debugging symbols for MPlayer, a movie
   player for Unix-like systems.
   .
-  You only need these if you want to generate usefule debugging
+  You only need these if you want to generate useful debugging
   backtraces.
  
  Package: mplayer-doc

-- 
mplayer packaging