[SCM] mplayer2/squeeze-backports: Merge tag 'debian/2.0-554-gf63dbad-1' into squeeze-backports

[siretart at users.alioth.debian.org]

Finalize changelog.
New changelog entry.
Merge tag 'upstream/2.0-554-gf63dbad'
Imported Upstream version 2.0-554-gf63dbad
Finalize changelog.
New changelog entry.
Merge commit 'upstream/2.0-542-gbb90802'
Imported Upstream version 2.0-542-gbb90802
Merge branch 'master.experimental'
Merge branch 'upstream.experimental' into upstream
Finalize
We are back to master.
Merge tag 'debian/2.0-518-gb711624-1'.
Merge tag 'upstream/2.0-518-gb711624' into upstream
New changelog entry.
Build-Depends on libcdio-{cdda,paranoia}-dev.
Drop support for cdparanoia.
Merge tag 'upstream/2.0-541-gf64a4e9' into master.experimental
Imported Upstream version 2.0-541-gf64a4e9
finalize
Merge tag 'upstream/2.0-518-gb711624' into master.experimental
Imported Upstream version 2.0-518-gb711624
Update branches information in debian/gbp.conf.
Set to UNRELEASED
new entry
wrap-and-sort -a -s
Enable harden'd flags.
Drop esound support as it's obsolete.
Bump Standards.
Build-depend on libpng-dev only.
Update debian/copyright.
update debian/changelog
don't build-depend on libcdparanoia-dev on the hurd
update debian/changelog
drop patches, all applied upstream
use bzip2 tarballs
tighten build dependencies on libav 0.8
remove files in debian/ that were accidentally added while merging the new upstream release
Merge commit 'upstream/2.0-426-gc32b3ed'
Imported Upstream version 2.0-426-gc32b3ed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: eaa53a75a6dcf59d16dfd92b7d707694c61a2b9d
X-Git-Newrev: a7a47f64ea7c390ae48fb0bdd90ea8dee6a325d8

The following commit has been merged in the squeeze-backports branch:
commit bb4e230c11e24bbdaf17ca8c1684bbc52a348691
Merge: eaa53a75a6dcf59d16dfd92b7d707694c61a2b9d 25829f19c4e725370be0fc729eb8d12d6d457944
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 18 19:08:22 2012 +0200

    Merge tag 'debian/2.0-554-gf63dbad-1' into squeeze-backports
    
    Debian release 2.0-554-gf63dbad-1
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 32fd7b6,409f576..3ae744c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,57 +1,63 @@@
+ mplayer2 (2.0-554-gf63dbad-1) unstable; urgency=low
+ 
+   * New upstream snapshot:
+     - Pass a dummy address instead of NULL pointer as third argument to
+       FcFontMatch() to fix an assertion failure with the latest 2.9.0
+       version of fontconfig (Closes: #672947).
+ 
+  -- Alessio Treglia <alessio at debian.org>  Sat, 19 May 2012 20:07:25 +0200
+ 
+ mplayer2 (2.0-542-gbb90802-1) unstable; urgency=low
+ 
+   * New upstream snapshot:
+     - ao_pulse: fix specifying host/sink (Closes: #671362)
+   * Drop support for cdparanoia.
+   * Build-Depends on libcdio-{cdda,paranoia}-dev.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Sat, 05 May 2012 01:37:30 +0200
+ 
+ mplayer2 (2.0-518-gb711624-2) unstable; urgency=low
+ 
+   * Upload to unstable.
+   * Merge 2.0-518-gb711624 from experimental.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Tue, 01 May 2012 03:32:15 +0200
+ 
+ mplayer2 (2.0-518-gb711624-1) experimental; urgency=low
+ 
+   * New upstream snapshot.
+   * Enable harden'd flags, thanks to Moritz Muehlenhoff
+     for the patch. (Closes: #658034)
+   * Build-depend on libpng-dev only. (Closes: #662435)
+   * Drop esound support as it's obsolete.
+   * Update debian/copyright.
+   * Bump Standards.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Thu, 26 Apr 2012 12:33:29 +0200
+ 
+ mplayer2 (2.0-426-gc32b3ed-2) unstable; urgency=low
+ 
+   * Upload to unstable
+   * don't build-depend on libcdparanoia-dev on the hurd
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Thu, 12 Jan 2012 22:59:30 +0100
+ 
+ mplayer2 (2.0-426-gc32b3ed-1) experimental; urgency=low
+ 
+   * New upstream snapshot.
+     - Fixes endless loop with remote files via HTTP, Closes: #648593
+   * Imported Upstream version 2.0-426-gc32b3ed
+   * Tighten build dependencies on Libav 0.8, Closes: #654219
+   * Drop all distro patches, all have been applied upstream
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Jan 2012 17:57:01 +0100
+ 
 +mplayer2 (2.0-134-g84d8671-9~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 01 Nov 2011 19:50:34 +0100
 +
  mplayer2 (2.0-134-g84d8671-9) unstable; urgency=high
  
    * Bug Fix: "CVE-2011-3625: Buffer overflow in SAMI parsing"
@@@ -19,12 -67,6 +73,12 @@@ mplayer2 (2.0-134-g84d8671-8) unstable
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Oct 2011 12:52:04 +0200
  
 +mplayer2 (2.0-134-g84d8671-7~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 08 Oct 2011 15:27:33 +0200
 +
  mplayer2 (2.0-134-g84d8671-7) unstable; urgency=low
  
    [ Alessio Treglia ]
diff --combined debian/gbp.conf
index 0379df5,7d3ad13..83d13b6
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,3 -1,4 +1,5 @@@
  [DEFAULT]
 +debian-branch = squeeze-backports
  pristine-tar = True
+ compression = bzip2
+ 

-- 
mplayer2 packaging