r1206 - in /unstable/ffmpeg/debian: changelog control libavcodec-dev.install libavutil-dev.install

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

Author: fabian-guest
Date: Wed May 28 14:13:31 2008
New Revision: 1206

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1206
Log:
* debian/control:
+ Removed conflicts for libswscale0 that made partial upgrades painful
(Closes: #481908), thanks Guillem Jover.
+ Made libavutil-dev depend on libavcodec-dev.
* debian/libavcodec.install, debian/libavutil.install:
+ Moved ffmpeg-config (script and manpage) from libavutil-dev to
libavcodec-dev.


Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/control
    unstable/ffmpeg/debian/libavcodec-dev.install
    unstable/ffmpeg/debian/libavutil-dev.install

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1206&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Wed May 28 14:13:31 2008
@@ -1,3 +1,15 @@
+ffmpeg-free (0.svn20080206-7) unstable; urgency=low
+
+  * debian/control:
+    + Removed conflicts for libswscale0 that made partial upgrades painful
+      (Closes: #481908), thanks Guillem Jover.
+    + Made libavutil-dev depend on libavcodec-dev.
+  * debian/libavcodec.install, debian/libavutil.install:
+    + Moved ffmpeg-config (script and manpage) from libavutil-dev to
+      libavcodec-dev.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 20 May 2008 16:02:03 +0200
+
 ffmpeg-free (0.svn20080206-6) unstable; urgency=low
 
   * Bug fix: "libavg: FTBFS: ld: cannot find -ldts", thanks to Lucas

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1206&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Wed May 28 14:13:31 2008
@@ -118,8 +118,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libswscale1d
-Replaces: libswscale1d
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .
@@ -130,6 +128,7 @@
 Section: libdevel
 Architecture: any
 Depends: libavutil49 (= ${binary:Version}),
+         libavcodec-dev (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libavformat-dev (<< 0.cvs20060329-4),

Modified: unstable/ffmpeg/debian/libavcodec-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavcodec-dev.install?rev=1206&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavcodec-dev.install (original)
+++ unstable/ffmpeg/debian/libavcodec-dev.install Wed May 28 14:13:31 2008
@@ -1,3 +1,5 @@
+usr/bin/ffmpeg-config
+usr/share/man/man1/ffmpeg-config.1
 usr/lib/pkgconfig/libavcodec.pc
 usr/include/ffmpeg/avcodec.h
 usr/include/ffmpeg/dsputil.h

Modified: unstable/ffmpeg/debian/libavutil-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavutil-dev.install?rev=1206&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavutil-dev.install (original)
+++ unstable/ffmpeg/debian/libavutil-dev.install Wed May 28 14:13:31 2008
@@ -1,5 +1,3 @@
-usr/bin/ffmpeg-config
-usr/share/man/man1/ffmpeg-config.1
 usr/lib/pkgconfig/libavutil.pc
 usr/include/ffmpeg/adler32.h
 usr/include/ffmpeg/avstring.h