[SCM] mplayer2/squeeze-backports: Merge commit 'debian/2.0-134-g84d8671-9' into squeeze-backports

[siretart at users.alioth.debian.org]

update debian/changelog
Bug Fix: "CVE-2011-3625: Buffer overflow in SAMI parsing"
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: 586c92d48a77dd06bc19a8ca494989491a8e8983
X-Git-Newrev: eaa53a75a6dcf59d16dfd92b7d707694c61a2b9d

The following commit has been merged in the squeeze-backports branch:
commit 635f6b6226c08069eb8db54dd2ee0bbe5f8413f2
Merge: 586c92d48a77dd06bc19a8ca494989491a8e8983 5aa8e13dfad8d34249948be431fe7b47bc60f0aa
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Nov 1 19:50:22 2011 +0100

    Merge commit 'debian/2.0-134-g84d8671-9' into squeeze-backports
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 0660a82,ed16068..a8bad70
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,10 @@@
- mplayer2 (2.0-134-g84d8671-7~bpo60+1) squeeze-backports; urgency=low
+ mplayer2 (2.0-134-g84d8671-9) unstable; urgency=high
  
-   * Rebuild for squeeze-backports.
+   * Bug Fix: "CVE-2011-3625: Buffer overflow in SAMI parsing"
+     Thanks to Mehdi Dogguy <mehdi at debian.org> for reporting (Closes: #646937)
+   * Bumped urgency for fixing security issue.
  
-  -- Reinhard Tartler <siretart at tauware.de>  Sat, 08 Oct 2011 15:27:33 +0200
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 29 Oct 2011 10:38:32 +0200
  
  mplayer2 (2.0-134-g84d8671-8) unstable; urgency=low
  
@@@ -11,6 -13,6 +13,12 @@@
  
   -- 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 ]

-- 
mplayer2 packaging