r1263 - in /unstable/ffmpeg/debian: changelog control rules

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

Author: fabian-guest
Date: Thu Jun 19 12:32:19 2008
New Revision: 1263

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1263
Log:
Changed Build-Depends from libdc1394-13-dev to libdc1394-22-dev,
which is supported upstream since r11501.


Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/control
    unstable/ffmpeg/debian/rules

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1263&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Thu Jun 19 12:32:19 2008
@@ -14,13 +14,15 @@
     + Added doxygen to Build-Depends.
     + Introduced new package 'ffmpeg-doc' that contains html doxygen
       documentation of the ffmpeg API (Closes: 438369).
+    + Changed Build-Depends from libdc1394-13-dev to libdc1394-22-dev,
+      which is supported upstream since r11501.
   * debian/ffmpeg-doc.install:
     + Added.
   * debian/rules:
     + Build and install html doxygen documentation.
     + Avoid dependency of build-stamp rule on phony targets.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 18 Jun 2008 14:11:01 +0200
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 19 Jun 2008 14:17:26 +0200
 
 ffmpeg-free (0.svn20080206-8) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1263&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Thu Jun 19 12:32:19 2008
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 5.0.0),
                doxygen,
                liba52-0.7.4-dev | liba52-dev,
-               libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libfaad-dev | libfaad2-dev,
                libfreetype6-dev,
                libgsm1-dev,

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1263&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Thu Jun 19 12:32:19 2008
@@ -66,8 +66,8 @@
 
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
-  lib1394-dev = libraw1394-dev, libdc1394-13-dev
-  FIREWIRELIBS="-lraw1394 -ldc1394_control"
+  lib1394-dev = libraw1394-dev, libdc1394-22-dev
+  FIREWIRELIBS="-lraw1394 -ldc1394"
 else
   lib1394-dev =
   FIREWIRELIBS=""