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

[siretart at users.alioth.debian.org]

Author: siretart
Date: Tue Jun  3 22:47:26 2008
New Revision: 1235

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1235
Log:
* Move ffmpeg-config back to libavutil. This way we can avoid a circular
  dependency between libavutil-dev and libavcodec-dev. (Closes: #484132).
  libavcodec uses libavutil internally, so this dependency cannot be avoided.

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/control
    unstable/ffmpeg/debian/libavcodec-dev.install
    unstable/ffmpeg/debian/libavutil-dev.install

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Tue Jun  3 22:47:26 2008
@@ -1,1 +1,0 @@
-patches/015_reenable-img_convert.diff	015_reenableimgresam-20080603151101-5xfer1f3rojms8o0-1

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Tue Jun  3 22:47:26 2008
@@ -5,3 +5,4 @@
 29 siretart at tauware.de-20080603195133-14hlasp8shso9edw
 30 siretart at tauware.de-20080603195421-11yj4yxn9h2423uh
 31 siretart at tauware.de-20080603210858-4ai5h4ys6pn0ong2
+32 siretart at tauware.de-20080603221248-j0e3d30nokk647zy

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Jun  3 22:47:26 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-03 23:08:58.484999895 +0200
+timestamp: 2008-06-04 00:12:48.815000057 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
-	branch-nick: patch.cleanup
+	branch-nick: bug.484132

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1235&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Jun  3 22:47:26 2008
@@ -28,8 +28,11 @@
   * refactor quilt usage: use /usr/share/quilt/quilt.make.
   * support building in paralell. make snippet taken from the qemu package.
   * cleanups in debian/rules.
-
- -- Reinhard Tartler <siretart at tauware.de>  Mon, 02 Jun 2008 22:37:28 +0200
+  * Move ffmpeg-config back to libavutil. This way we can avoid a circular
+    dependency between libavutil-dev and libavcodec-dev. (Closes: #484132).
+    libavcodec uses libavutil internally, so this dependency cannot be avoided.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 04 Jun 2008 00:04:08 +0200
 
 ffmpeg-free (0.svn20080206-7) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1235&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Tue Jun  3 22:47:26 2008
@@ -128,13 +128,12 @@
 Section: libdevel
 Architecture: any
 Depends: libavutil49 (= ${binary:Version}),
-         libavcodec-dev (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libavformat-dev (<< 0.cvs20060329-4),
-           libavcodec-dev (<< 0.cvs20070307-1)
+           libavcodec-dev (<< 0.svn20080206-7)
 Replaces: libavformat-dev (<< 0.cvs20060329-4),
-          libavcodec-dev (<< 0.cvs20070307-1)
+          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,9 +156,9 @@
          ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: libavformat-dev (<< 0.cvs20060329-4),
-           libavutil-dev (<< 0.svn20080206-7)
+           libavutil-dev (<< 0.svn20080206-8)
 Replaces: libavformat-dev (<< 0.cvs20060329-4),
-          libavutil-dev (<< 0.svn20080206-7)
+          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...).

Modified: unstable/ffmpeg/debian/libavcodec-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavcodec-dev.install?rev=1235&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavcodec-dev.install (original)
+++ unstable/ffmpeg/debian/libavcodec-dev.install Tue Jun  3 22:47:26 2008
@@ -1,5 +1,3 @@
-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=1235&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavutil-dev.install (original)
+++ unstable/ffmpeg/debian/libavutil-dev.install Tue Jun  3 22:47:26 2008
@@ -1,3 +1,5 @@
+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