r1084 - in /experimental/ffmpeg.20080206/debian: changelog control

[siretart at users.alioth.debian.org]

Author: siretart
Date: Thu Mar 20 15:31:14 2008
New Revision: 1084

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1084
Log:
merge recent upload to experimental to this branch

Modified:
    experimental/ffmpeg.20080206/debian/changelog
    experimental/ffmpeg.20080206/debian/control

Modified: experimental/ffmpeg.20080206/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/changelog?rev=1084&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/changelog (original)
+++ experimental/ffmpeg.20080206/debian/changelog Thu Mar 20 15:31:14 2008
@@ -45,6 +45,7 @@
 
 ffmpeg-free (0.cvs20071007-4) experimental; urgency=low
 
+  [ Fabian Greffrath ]
   * debian/control:
     + Wrapped Uploaders, Build-Depends and Depends,
       Conflicts and Replaces fields.
@@ -58,7 +59,10 @@
     + Added support for amrnb, amrwb and x264 (Closes: #432170) in
       DEB_BUILD_OPTIONS=risky.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 03 Mar 2008 10:28:05 +0100
+  [ Reinhard Tartler ]
+  * added Fabian Greffrath to Uploaders
+
+ -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Mar 2008 15:55:11 +0100
 
 ffmpeg-free (0.cvs20071007-3) experimental; urgency=low
 

Modified: experimental/ffmpeg.20080206/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/control?rev=1084&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/control (original)
+++ experimental/ffmpeg.20080206/debian/control Thu Mar 20 15:31:14 2008
@@ -4,7 +4,8 @@
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Loic Minier <lool at dooz.org>,
-           Reinhard Tartler <siretart at tauware.de>
+           Reinhard Tartler <siretart at tauware.de>,
+           Fabian Greffrath <fabian at debian-unofficial.org>
 Build-Depends: debhelper (>= 6.0.0),
                liba52-0.7.4-dev | liba52-dev,
                libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],