[SCM] FFmpeg packaging branch, ubuntu.jaunty, updated. debian/0.svn20090303-1-12-g605983f

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty branch:
commit e299a39a72ae634849133b9ed4cab0f34909d40a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:04:09 2009 +0100

    merge in changes from the ubuntu 'unstripped' branch

diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index f95e795..5b2d8ab 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -70,6 +70,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: libavfilter0
+Replaces: libavfilter0
 Description: ffmpeg video filtering library
  This is the video filtering library from the ffmpeg project.
  .
diff --git a/debian/rules b/debian/rules
index a85276e..21409f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,7 +155,7 @@ ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	done
 else
 	for pkg in $(LIB_PKGS); do \
-	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(UPSTREAM_VERSION)), $$pkg (< $(UPSTREAM_VERSION)-99)"; \
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
 	done
 endif
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \

-- 
FFmpeg packaging