[SCM] x264 packaging branch, master, updated. debian/0.svn20090621+git364d7d-1-11-g23b5e69

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 23b5e69342a64811d0c96face8b31b8d9d008fe6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 26 16:56:30 2009 +0200

    Revert "update debian/changelog"
    
    I forgot to push my git changes, so Fabian went on working on the
    package. Fabians changes will be part of the next upload
    
    This reverts commit 405fbf856cb123d271ba908c968f55db65cc4f7f.

diff --git a/debian/changelog b/debian/changelog
index c71edd4..9437b4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,22 +21,9 @@ x264 (1:0.svn20090621+git364d7d-0ubuntu1) karmic; urgency=low
 
 x264 (1:0.svn20090502-0.0ubuntu2) karmic; urgency=low
 
-  [ Reinhard Tartler ]
   * take over marillats package under the umbrella of pkg-multimedia
 
-  [ Fabian Greffrath ]
-  * Added myself to uploaders.
-  * Append to CFLAGS/LDFLAGS instead of overriding.
-  * Clean up CFLAGS.
-  * Remove -Wl,--as-needed from LDFLAGS. It has become unnecessary since
-    we don't link against GTK+ anymore. Redundant linking of the
-    frontend against -lX11 and -lm doesn't hurt, because the shared
-    library links against them anyway.
-  * Add one confflag per line, makes it easier to track minor changes.
-  * Repeat the last change for the shared_confflags.
-  * Kill some whitespace from debian/rules to improve readability.
-
- -- Fabian Greffrath <fabian at greffrath.com>  Mon, 15 Jun 2009 12:48:53 +0200
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Jun 2009 17:49:13 +0200
 
 x264 (1:0.svn20090502-0.0ubuntu1) karmic; urgency=low
 

-- 
x264 packaging