[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-41-ga1229f8

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a1229f8ace3f5cf129685b26d9ef212637caa3b9
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Jan 28 15:10:58 2009 +0100

    Use an alternative approach to achieve strict internal dependencies by calling dh_makeshlibs twice in debian/rules instead of a debian/shlibs.local file.

diff --git a/debian/changelog b/debian/changelog
index 00ea8ab..e41f30b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ ffmpeg-debian (3:0.svn20090119-2) UNRELEASED; urgency=low
 
   [ Fabian Greffrath ]
   * Enabled Speex decoding via libspeex.
+  * Use an alternative approach to achieve strict internal dependencies
+    by calling dh_makeshlibs twice in debian/rules instead of a
+    debian/shlibs.local file.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 28 Jan 2009 13:45:54 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 28 Jan 2009 15:08:05 +0100
 
 ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 3bc8041..f21ac33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,19 +137,31 @@ else
 endif
 	dh_compress
 	dh_fixperms
+	dh_installdeb
+# strict internal dependencies
 ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	for pkg in $(LIB_PKGS); do \
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(UPSTREAM_VERSION)) | $$upkg (>= $(UPSTREAM_VERSION)), $$pkg (< $(UPSTREAM_VERSION)-99) | $$upkg (< $(UPSTREAM_VERSION)-99)"; \
 	done
 else
 	for pkg in $(LIB_PKGS); do \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(UPSTREAM_VERSION)), $$pkg (< $(UPSTREAM_VERSION)-99)"; \
 	done
 endif
-	dh_installdeb
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	dh_shlibdeps
+# target dependencies for external packages
+ifeq ($(DEB_SOURCE),ffmpeg-debian)
+	for pkg in $(LIB_PKGS); do \
+	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+	done
+else
+	for pkg in $(LIB_PKGS); do \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
+	done
+endif
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums
 	dh_builddeb
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index 4be9d36..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1,7 +0,0 @@
-libavutil 49 libavutil49 (>= ${source:Upstream-Version}) | libavutil-unstripped-49 (>= ${source:Upstream-Version})
-libavcodec 52 libavcodec52 (>= ${source:Upstream-Version}) | libavcodec-unstripped-52 (>= ${source:Upstream-Version})
-libavdevice 52 libavdevice52 (>= ${source:Upstream-Version}) | libavdevice-unstripped-52 (>= ${source:Upstream-Version})
-libavformat 52 libavformat52 (>= ${source:Upstream-Version}) | libavformat-unstripped-52 (>= ${source:Upstream-Version})
-libavfilter 0 libavfilter0 (>= ${source:Upstream-Version}) | libavfilter-unstripped-0 (>= ${source:Upstream-Version})
-libpostproc 51 libpostproc51 (>= ${source:Upstream-Version}) | libpostproc-unstripped-51 (>= ${source:Upstream-Version})
-libswscale 0 libswscale0 (>= ${source:Upstream-Version}) | libswscale-unstripped-0 (>= ${source:Upstream-Version}) 

-- 
FFmpeg packaging