[SCM] ffmpeg/master: relax dependencies in the shlibs file to accomodate the new versioning scheme in libav-extra. Fixes LP: #818619

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d079d7a3b9e0083554c4cbc291bb66129990064b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Aug 1 13:16:48 2011 +0200

    relax dependencies in the shlibs file to accomodate the new versioning scheme in libav-extra. Fixes LP: #818619
    
    (cherry picked from commit ee7edbbb44631eed54ee38945cc0838c49096e43)

diff --git a/debian/control b/debian/control
index 3ce719f..0367ed6 100644
--- a/debian/control
+++ b/debian/control
@@ -186,7 +186,7 @@ Package: libavutil-dev
 Section: libdevel
 Architecture: any
 Depends: libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
- libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}-99),
+ libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}.99),
  ${misc:Depends}
 Description: Development files for libavutil
  This is the common utility library from Libav.
@@ -198,7 +198,7 @@ Package: libavcodec-dev
 Section: libdevel
 Architecture: any
 Depends: libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
+ libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Suggests: libfaad-dev,
@@ -223,7 +223,7 @@ Package: libavdevice-dev
 Section: libdevel
 Architecture: any
 Depends: libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}-99),
+ libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
  libavformat-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavdevice
@@ -236,7 +236,7 @@ Package: libavformat-dev
 Section: libdevel
 Architecture: any
 Depends: libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
- libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}-99),
+ libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}.99),
  libavcodec-dev (= ${binary:Version}), libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavformat
@@ -250,7 +250,7 @@ Package: libavfilter-dev
 Section: libdevel
 Architecture: any
 Depends: libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}-99),
+ libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
  libavcodec-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libavfilter
@@ -263,7 +263,7 @@ Package: libpostproc-dev
 Section: libdevel
 Architecture: any
 Depends: libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}-99),
+ libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libpostproc
@@ -276,7 +276,7 @@ Package: libswscale-dev
 Section: libdevel
 Architecture: any
 Depends: libswscale2 (>= ${binary:Version}) | libswscale-extra-1 (>= ${source:Upstream-Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-1 (<= ${source:Upstream-Version}-99),
+ libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-1 (<= ${source:Upstream-Version}.99),
  libavutil-dev (= ${binary:Version}),
  ${misc:Depends}
 Description: Development files for libswscale
diff --git a/debian/rules b/debian/rules
index 7f1bf6c..5002070 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,7 @@ binary-arch: build install codecs.txt formats.txt
 # strict internal dependencies
 	for pkg in $(LIB_PKGS); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION).99)"; \
 	done
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	dh_shlibdeps

-- 
Libav/FFmpeg packaging