[SCM] FFmpeg packaging branch, master, updated. debian/0.svn20090303-1-32-g19a82c9

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 19a82c9fe63893e120ae5b29d0fce06b0dd5c613
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 3 20:05:43 2009 +0200

    relax the dependencies of the -dev packages a bit
    
    Before the -dev package depended on the exact build version. Now this is
    weakened to a version range between the build versions and
    ${source:Upstream-Version}-99, so that every later version up to the
    next upstream version still matches.
    
    Strictly speaking this is only necessary for the -unstripped
    variants. If some problems arise because of too weak dependencies, this
    decision can be reconsidered.

diff --git a/debian/control b/debian/control
index 791bc58..9513085 100644
--- a/debian/control
+++ b/debian/control
@@ -150,7 +150,8 @@ Description: ffmpeg video scaling library
 Package: libavutil-dev
 Section: libdevel
 Architecture: any
-Depends: libavutil49 (= ${binary:Version}) | libavutil-unstripped-49 (= ${binary:Version}),
+Depends: libavutil49 (>= ${binary:Version}) | libavutil-unstripped-49 (>= ${binary:Version}),
+         libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-unstripped-49 (<= ${binary:Version})
 Description: development files for libavutil
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
@@ -161,7 +162,8 @@ Description: development files for libavutil
 Package: libavcodec-dev
 Section: libdevel
 Architecture: any
-Depends: libavcodec52 (= ${binary:Version}) | libavcodec-unstripped-52 (= ${binary:Version}),
+Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-unstripped-52 (>= ${binary:Version}),
+         libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-unstripped-52 (<= ${source:Upstream-Version}-99),
          libavutil-dev (= ${binary:Version})
 Suggests: libfaad-dev,
           libgsm1-dev,
@@ -184,7 +186,8 @@ Description: development files for libavcodec
 Package: libavdevice-dev
 Section: libdevel
 Architecture: any
-Depends: libavdevice52 (= ${binary:Version}) | libavdevice-unstripped-52 (= ${binary:Version}),
+Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-unstripped-52 (>= ${binary:Version}),
+         libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-unstripped-52 (<= ${source:Upstream-Version}-99),
          libavformat-dev (= ${binary:Version})
 Description: development files for libavdevice
  This is the device handling library from the ffmpeg project.
@@ -195,7 +198,8 @@ Description: development files for libavdevice
 Package: libavformat-dev
 Section: libdevel
 Architecture: any
-Depends: libavformat52 (= ${binary:Version}) | libavformat-unstripped-52 (= ${binary:Version}),
+Depends: libavformat52 (>= ${binary:Version}) | libavformat-unstripped-52 (>= ${binary:Version}),
+         libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-unstripped-52 (<= ${source:Upstream-Version}-99),
          libavcodec-dev (= ${binary:Version})
 Description: development files for libavformat
  This is the demuxer library from the ffmpeg project. It supports most
@@ -207,7 +211,8 @@ Description: development files for libavformat
 Package: libavfilter-dev
 Section: libdevel
 Architecture: any
-Depends: libavfilter0 (= ${binary:Version}) | libavfilter-unstripped-0 (= ${binary:Version}),
+Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-unstripped-0 (>= ${binary:Version}),
+         libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-unstripped-0 (>= ${source:Upstream-Version}-99),
          libavcodec-dev (= ${binary:Version})
 Description: development files for libavfilter
  This is the video filtering library from the ffmpeg project.
@@ -218,7 +223,8 @@ Description: development files for libavfilter
 Package: libpostproc-dev
 Section: libdevel
 Architecture: any
-Depends: libpostproc51 (= ${binary:Version}) | libpostproc-unstripped-51 (= ${binary:Version}),
+Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-unstripped-51 (>= ${binary:Version}),
+         libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-unstripped-51 (<= ${source:Upstream-Version}-99),
          libavutil-dev (= ${binary:Version})
 Description: development files for libpostproc
  This is the video postprocessing library from the ffmpeg project.
@@ -229,7 +235,8 @@ Description: development files for libpostproc
 Package: libswscale-dev
 Section: libdevel
 Architecture: any
-Depends: libswscale0 (= ${binary:Version}) | libswscale-unstripped-0 (= ${binary:Version}),
+Depends: libswscale0 (>= ${binary:Version}) | libswscale-unstripped-0 (>= ${binary:Version}),
+         libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-unstripped-0 (<= ${source:Upstream-Version}-99),
          libavutil-dev (= ${binary:Version})
 Description: development files for libswscale
  This is the video scaling library from the ffmpeg project.

-- 
FFmpeg packaging