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

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

Author: fabian-guest
Date: Mon Sep 22 13:38:51 2008
New Revision: 1486

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1486
Log:
  * debian/control:
    + 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>.


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=1486&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/changelog (original)
+++ experimental/ffmpeg-debian/debian/changelog Mon Sep 22 13:38:51 2008
@@ -25,6 +25,10 @@
     + Enabled Dirac support via libschroedinger. (Closes: #499785)
   * debian/changelog:
     + Added an epoch needed for Ubuntu.
+  * debian/control:
+    + 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>.
 
   [ 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=1486&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/control (original)
+++ experimental/ffmpeg-debian/debian/control Mon Sep 22 13:38:51 2008
@@ -69,8 +69,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavutilcvs49
-Replaces: libavutilcvs49
 Description: ffmpeg utility library
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
@@ -83,8 +81,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavcodeccvs51
-Replaces: libavcodeccvs51
 Description: ffmpeg codec library
  This is the codec library from the ffmpeg project. It supports most existing
  encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
@@ -97,8 +93,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavdevicecvs52
-Replaces: libavdevicecvs52
 Description: ffmpeg device handling library
  This is the device handling library from the ffmpeg project.
  .
@@ -110,8 +104,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libpostproccvs51
-Replaces: libpostproccvs51
 Description: ffmpeg video postprocessing library
  This is the video postprocessing library from the ffmpeg project.
  .
@@ -123,8 +115,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavformatcvs52
-Replaces: libavformatcvs52
 Description: ffmpeg file format library
  This is the demuxer library from the ffmpeg project. It supports most
  existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -137,8 +127,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libswscalecvs0
-Replaces: libswscalecvs0
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .
@@ -149,14 +137,8 @@
 Section: libdevel
 Architecture: any
 Depends: libavutil49 (= ${binary:Version})
-Conflicts: libavformat-dev (<< 0.cvs20060329-4),
-           libavcodec-dev (<< 0.svn20080206-7),
-           libavutilcvs49-dev,
-           libavutilcvs-dev
-Replaces: libavformat-dev (<< 0.cvs20060329-4),
-          libavcodec-dev (<< 0.svn20080206-7),
-          libavutilcvs49-dev,
-          libavutilcvs-dev
+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.
@@ -175,14 +157,8 @@
          libvorbis-dev,
          zlib1g-dev,
          ${lib1394-dev}
-Conflicts: libavformat-dev (<< 0.cvs20060329-4),
-           libavutil-dev (<< 0.svn20080206-8),
-           libavcodeccvs51-dev,
-           libavcodeccvs-dev
-Replaces: libavformat-dev (<< 0.cvs20060329-4),
-          libavutil-dev (<< 0.svn20080206-8),
-          libavcodeccvs51-dev,
-          libavcodeccvs-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...).
@@ -195,12 +171,6 @@
 Architecture: any
 Depends: libavdevice52 (= ${binary:Version}),
          libavformat-dev (= ${binary:Version})
-Conflicts: libavformat-dev (<< 0.cvs20060329-4),
-           libavdevicecvs52-dev,
-           libavdevicecvs-dev
-Replaces: libavformat-dev (<< 0.cvs20060329-4),
-          libavdevicecvs52-dev,
-          libavdevicecvs-dev
 Description: development files for libavdevice
  This is the device handling library from the ffmpeg project.
  .
@@ -212,10 +182,6 @@
 Architecture: any
 Depends: libpostproc51 (= ${binary:Version}),
          libavcodec-dev (= ${binary:Version})
-Conflicts: libpostproccvs51-dev,
-           libpostproccvs-dev
-Replaces: libpostproccvs51-dev,
-          libpostproccvs-dev
 Description: development files for libpostproc
  This is the video postprocessing library from the ffmpeg project.
  .
@@ -227,14 +193,6 @@
 Architecture: any
 Depends: libavformat52 (= ${binary:Version}),
          libavcodec-dev (= ${binary:Version})
-Conflicts: libavcodec-dev (<< 0.cvs20060306-1),
-           libavformatcvs51-dev,
-           libavformatcvs52-dev,
-           libavformatcvs-dev
-Replaces: libavcodec-dev (<< 0.cvs20060306-1),
-          libavformatcvs51-dev,
-          libavformatcvs52-dev,
-          libavformatcvs-dev
 Description: development files for libavformat
  This is the demuxer library from the ffmpeg project. It supports most
  existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@ -247,10 +205,6 @@
 Architecture: any
 Depends: libswscale0 (= ${binary:Version}),
          libavutil-dev (= ${binary:Version})
-Conflicts: libswscalecvs0-dev,
-           libswscalecvs-dev
-Replaces: libswscalecvs0-dev,
-          libswscalecvs-dev
 Description: development files for libswscale
  This is the video scaling library from the ffmpeg project.
  .