[SCM] x264/master: finalize debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit aaef219c2dd19ecc9ce2354b577458b50ae5cf62
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 31 19:47:27 2011 +0100

    finalize debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c93415f..c9830a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-x264 (2:0.118.2092+git6eac7c3-1) UNRELEASED; urgency=low
+x264 (2:0.118.2092+git6eac7c3-1) unstable; urgency=low
 
+  [ Rico Tzschichholz ]
   * New upstream snapshot.
   * Drop arch-alpha.patch which is upstream
 
- -- Rico Tzschichholz <ricotz at ubuntu.com>  Sat, 22 Oct 2011 23:27:24 +0200
+  [ Reinhard Tartler ]
+  * debian/control: normalize fieldswith wrap-and-sort
+  * remove unnecessary Conflicts/Replaces on non-existing package x264-bin
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 31 Oct 2011 19:47:16 +0100
 
 x264 (2:0.118.2085+git8a62835-1) unstable; urgency=low
 

-- 
x264 packaging