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

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

update debian/changelog
Next try to fix build failure on sparce after recent binutils change.
debian/changelog: fix typo and urgency
update debian/changelog
Really fix build failure on sparce after recent binutils change.
update debian/changelog
Fix build failure on sparc after recent binutils change.
Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid file overwrite errors.
Merge remote-tracking branch 'origin/master'
Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid file overwrite errors.
work on master branch
update debian/changelog
Enable joystick support on Linux only, Closes: #638408
Merge branch 'master.experimental'
Enable joystick support on Linux only, Closes: #638408
update debian/changelog
Update to my @debian.org.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.experimental
X-Git-Reftype: branch
X-Git-Oldrev: 357b49480d4fdc8695cbf6a1ea49804c34bec494
X-Git-Newrev: 68bf155d6ea972e72b884f1153281d810a3abc0f

The following commit has been merged in the master.experimental branch:
commit 7b73cf33ca79ce40b852e0348a00cec09d84a1c9
Merge: d4629d43b296733c95c8cc82aa950de219f7c4c7 306c1ffafe72044dd4ee6f71674e6d3f02ff0a16
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Tue Jan 3 19:43:29 2012 +0100

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

diff --combined debian/changelog
index c897aa9,f92283c..c5ef5a1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,73 +1,85 @@@
 +mplayer (2:1.0~rc4+svn34492-1) UNRELEASED; urgency=low
 +
 +  * New upstream snapshot
 +
 + -- Rico Tzschichholz <ricotz at ubuntu.com>  Tue, 03 Jan 2012 19:27:04 +0100
 +
+ mplayer (2:1.0~rc4.dfsg1+svn33713-5) unstable; urgency=low
+ 
+   * Brown paperbag upload.
+   * Next try to fix build failure on sparce after recent binutils change.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 29 Oct 2011 12:43:29 +0200
+ 
+ mplayer (2:1.0~rc4.dfsg1+svn33713-4) unstable; urgency=low
+ 
+   * Brown paperbag upload.
+   * Really fix build failure on sparc after recent binutils change.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 29 Oct 2011 11:35:25 +0200
+ 
+ mplayer (2:1.0~rc4.dfsg1+svn33713-3) unstable; urgency=high
+ 
+   [ Alessio Treglia ]
+   * Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid
+     file overwrite errors.
+   * Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
+ 
+   [ Reinhard Tartler ]
+   * Fix build failure on sparc after recent binutils change.
+   * Urgency medium bumped because of RC-level bugfix
+     and speeding up x264 transition.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 29 Oct 2011 10:29:57 +0200
+ 
+ mplayer (2:1.0~rc4.dfsg1+svn33713-2) unstable; urgency=low
+ 
+   [ Andres Mejia ]
+   * Update to my @debian.org email.
+ 
+   [ Reinhard Tartler ]
+   * Upload to unstable
+   * Enable joystick support on Linux only, Closes: #638408
+   * Rebuild fixes toolchain issue on arm, Closes: #637077
+ 
+  -- 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
+ 
 +mplayer (2:1.0~rc4+svn33713-1) experimental; urgency=low
 +
 +  * New upstream snapshot
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Jun 2011 09:05:54 +0200
 +
  mplayer (2:1.0~rc4.dfsg1-2) unstable; urgency=low
  
    [ Fabian Greffrath ]

-- 
mplayer packaging