[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-38-g4098a63

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4098a63b848df080f1e26900f52441ec100bd5c2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 25 23:25:15 2009 +0100

    Add breaks on libavutil on earlier versions of libavcodec and libavformat
    
    Again because of the ff_gcd -> av_gcd rename.

diff --git a/debian/changelog b/debian/changelog
index a396e7f..b260521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ ffmpeg-debian (3:0.svn20090119-2) UNRELEASED; urgency=low
 
   * strighten internal dependencies by using a shlibs.local file
     Closes: #512844, #512466
+  * Add breaks on libavutil on earlier versions of libavcodec and
+    libavformat. Again because of the ff_gcd -> av_gcd rename. 
+    Closes: #512946
 
- -- Reinhard Tartler <siretart at tauware.de>  Sun, 25 Jan 2009 11:16:24 +0100
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 25 Jan 2009 23:20:48 +0100
 
 ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 312a89e..08f364a 100644
--- a/debian/control
+++ b/debian/control
@@ -69,6 +69,9 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: libavcodec51,
+	libavcodec52 (<= 3:0.svn20090119-1),
+	libavformat52 (<= 3:0.svn20090119-1)
 Description: ffmpeg utility library
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index fb9394c..a72094a 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -20,6 +20,9 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: libavcodec51,
+	libavcodec52 (<= 3:0.svn20090119-1),
+	libavformat52 (<= 3:0.svn20090119-1)
 Conflicts: libavutilcvs49, libavutil49
 Replaces: libavutilcvs49, libavutil49
 Description: ffmpeg utility library
diff --git a/debian/control.ffmpeg-debian b/debian/control.ffmpeg-debian
index 00e9881..d081c71 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -56,6 +56,9 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Breaks: libavcodec51,
+	libavcodec52 (<= 3:0.svn20090119-1),
+	libavformat52 (<= 3:0.svn20090119-1)
 Description: ffmpeg utility library
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.

-- 
FFmpeg packaging