[SCM] FFmpeg packaging branch, ubuntu.extra, updated. extra/debian/0.6.svn20100505-1ubuntu1

Wed May 26 06:14:29 UTC 2010

The following commit has been merged in the ubuntu.extra branch:
commit 72cd8e62204323c9fd68ec9bd399f5d1fb0b5cb8
Merge: 4c5da39844bb19297e71f0af7746a2dea2d4b073 136c6e12858047d734a0f9d242bfe83c9060bd41
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 07:48:34 2010 +0200

    Merge branch 'master.extra' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf

diff --combined debian/changelog
index 394f2f4,d0618be..09fa4e7

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,16 +1,41 @@@
 +ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 May 2010 00:01:17 +0200
 +
 +ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low
 +
 +  * update to new upstream. Closes: #569727
 +    - fixes various segfaults and other minor feature improvements
 +      Closes: #374931, #522449, #501891, #559712, #420231, #369127, #538082,
 +              #298095, #294422, #561553, #525385, #495274, #420230
 +      LP: #305286, #457106, #529200, #301723, #305315, #336479, #420230,
 +          #412063, #428912, #432181, #440591, #453732, #453732, #453732,
 +   	  #514259, #515243, #521472, #530186, #530186, #197842, #483317,
 +  	  #483317, #539407, #280098, #331255, #566107, #569823, #570305,
 +  	  #573190
 +  * Fixup lintian overrides for new upstream snapshot
 +  * Bump Standards-Version to 3.8.4
 +  * Many upstream changes, see upstream Changelog for details
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +0100
 +
+ ffmpeg-extra (4:0.5.1-2) unstable; urgency=low
+ 
+   [ Andres Mejia ]
+   * Prepare new upload for Debian.
+   * Update gbp.conf for master.extra branch.
+   * Bump Standards-Version to 3.8.4.
+   * Don't include build-depends-indep when only building arch-dependent
+     packages.
+   * Include ${misc:Depends} for all packages.
+   * Set the team as maintainers.
+ 
+  -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 02:46:46 -0400
+ 
  ffmpeg-extra (4:0.5.1-1ubuntu1) lucid; urgency=low
  
    * merge from 'main' package. Changes
diff --combined debian/control
index d96bafa,31adfb0..8452a0f
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: ffmpeg-extra
  Section: libs
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-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>,
@@@ -13,7 -12,6 +13,6 @@@ Standards-Version: 3.8.
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
  Homepage: http://ffmpeg.org/
- Build-Depends-Indep: doxygen
  Build-Depends: debhelper (>= 7),
                 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libavcodec-dev,
@@@ -63,7 -61,7 +62,7 @@@ Description: ffmpeg utility librar
  
  Package: libavutil-unstripped-49
  Architecture: any
- Depends: libavutil-extra-49 (= ${binary:Version})
+ Depends: libavutil-extra-49 (= ${binary:Version}), ${misc:Depends}
  Description: ffmpeg utility library - transitional package
   This package can be safely removed if no other packages depend on this
  
@@@ -83,7 -81,7 +82,7 @@@ Description: ffmpeg codec librar
  
  Package: libavcodec-unstripped-52
  Architecture: any
- Depends: libavcodec-extra-52 (= ${binary:Version})
+ Depends: libavcodec-extra-52 (= ${binary:Version}), ${misc:Depends}
  Description: ffmpeg utility library - transitional package
   This package can be safely removed if no other packages depend on this
  
@@@ -101,22 -99,30 +100,22 @@@ Description: ffmpeg device handling lib
  
  Package: libavdevice-unstripped-52
  Architecture: any
- Depends: libavdevice-extra-52 (= ${binary:Version})
+ Depends: libavdevice-extra-52 (= ${binary:Version}), ${misc:Depends}
  Description: ffmpeg utility library - transitional package
   This package can be safely removed if no other packages depend on this
  
 -Package: libavfilter-extra-0
 +Package: libavfilter-extra-1
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 -Conflicts: libavfilter0, libavfilter-unstripped-0 (<< ${binary:Version})
 -Replaces: libavfilter0, libavfilter-unstripped-0 (<< ${binary:Version})
 +Conflicts: libavfilter1
 +Replaces: libavfilter1
  Description: ffmpeg video filtering library
   This is the video filtering library from the ffmpeg project.
   .
   This package contains a unrestricted version of the libavfilter shared
   object that should only be used by Debian packages.
  
 -Package: libavfilter-unstripped-0
 -Architecture: any
 -Conflicts: libavfilter0
 -Replaces: libavfilter0
 -Depends: libavfilter-extra-0 (= ${binary:Version}), ${misc:Depends}
 -Description: ffmpeg utility library - transitional package
 - This package can be safely removed if no other packages depend on this
 -
  Package: libpostproc-extra-51
  Architecture: any
  Depends: ${shlibs:Depends},
@@@ -131,7 -137,7 +130,7 @@@ Description: ffmpeg video postprocessin
  
  Package: libpostproc-unstripped-51
  Architecture: any
- Depends: libpostproc-extra-51 (= ${binary:Version})
+ Depends: libpostproc-extra-51 (= ${binary:Version}), ${misc:Depends}
  Description: ffmpeg utility library - transitional package
   This package can be safely removed if no other packages depend on this
  
@@@ -151,7 -157,7 +150,7 @@@ Description: ffmpeg file format librar
  
  Package: libavformat-unstripped-52
  Architecture: any
- Depends: libavformat-extra-52 (= ${binary:Version})
+ Depends: libavformat-extra-52 (= ${binary:Version}), ${misc:Depends}
  Description: ffmpeg utility library - transitional package
   This package can be safely removed if no other packages depend on this
  
@@@ -169,7 -175,7 +168,7 @@@ Description: ffmpeg video scaling libra
  
  Package: libswscale-unstripped-0
  Architecture: any
- Depends: libswscale-extra-0 (= ${binary:Version})
+ Depends: libswscale-extra-0 (= ${binary:Version}), ${misc:Depends}
  Description: ffmpeg utility library - transitional package
   This package can be safely removed if no other packages depend on this
  

-- 
FFmpeg packaging

