r1487 - in /experimental/ffmpeg-debian/debian: changelog control

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

Author: fabian-guest
Date: Mon Sep 22 14:03:44 2008
New Revision: 1487

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1487
Log:
    + Since ffmpeg-config has been removed from our packages, all inter-package
      Conflicts and Replaces may be removed, too.
    + Removed Build-Conflicts against libdc1394-13-dev, because
      libdc1394-22-dev already does this for us.


Modified:
    experimental/ffmpeg-debian/debian/changelog
    experimental/ffmpeg-debian/debian/control

Modified: experimental/ffmpeg-debian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/changelog?rev=1487&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/changelog (original)
+++ experimental/ffmpeg-debian/debian/changelog Mon Sep 22 14:03:44 2008
@@ -29,6 +29,10 @@
     + Removed Conflicts and Replaces against packages that either aren't even
       in Debian 4.0 "Etch" anymore or that use the deprecated naming scheme
       from <http://www.debian-multimedia.org>.
+    + Since ffmpeg-config has been removed from our packages, all inter-package
+      Conflicts and Replaces may be removed, too.
+    + Removed Build-Conflicts against libdc1394-13-dev, because
+      libdc1394-22-dev already does this for us.
 
   [ Loic Minier ]
   * Remove debug echo which broke shlibs, sorry.

Modified: experimental/ffmpeg-debian/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/control?rev=1487&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/control (original)
+++ experimental/ffmpeg-debian/debian/control Mon Sep 22 14:03:44 2008
@@ -23,7 +23,6 @@
                quilt,
                texi2html,
                zlib1g-dev
-Build-Conflicts: libdc1394-13-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/ffmpeg/debian/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/
@@ -137,8 +136,6 @@
 Section: libdevel
 Architecture: any
 Depends: libavutil49 (= ${binary:Version})
-Conflicts: libavcodec-dev (<< 0.svn20080206-7)
-Replaces: libavcodec-dev (<< 0.svn20080206-7)
 Description: development files for libavutil
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
@@ -157,8 +154,6 @@
          libvorbis-dev,
          zlib1g-dev,
          ${lib1394-dev}
-Conflicts: libavutil-dev (<< 0.svn20080206-8)
-Replaces: libavutil-dev (<< 0.svn20080206-8)
 Description: development files for libavcodec
  This is the codec library from the ffmpeg project. It supports most existing
  encoding formats (MPEG, DivX, MPEG4, AC3, DV...).