[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090128-56-g69d6aba

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Feb 3 08:25:32 UTC 2009


The following commit has been merged in the master branch:
commit 69d6aba1187b87f31dc2a99dc2d6e6abf107e82d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 09:24:51 2009 +0100

    really remove breaks field from source file, not only from
    debian/control

diff --git a/debian/control.ffmpeg b/debian/control.ffmpeg
index 759bc41..5fa751d 100644
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@ -21,9 +21,6 @@ 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 b80d58d..42f2608 100644
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@ -57,9 +57,6 @@ 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



More information about the pkg-multimedia-commits mailing list