r1278 - in /unstable/ffmpeg/debian: ./ confflags control

[siretart at users.alioth.debian.org]

Author: siretart
Date: Mon Jun 30 14:26:22 2008
New Revision: 1278

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1278
Log:
fixup dependencies for lib1394-dev

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/confflags
    unstable/ffmpeg/debian/control

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Mon Jun 30 14:26:22 2008
@@ -20,3 +20,4 @@
 53 siretart at tauware.de-20080630132119-e2wkrw6eug0jcguy
 54 siretart at tauware.de-20080630134834-3sz4ajk51eww79dz
 55 siretart at tauware.de-20080630140311-8yarzkn3kyczbdkc
+56 siretart at tauware.de-20080630141223-97fhxp6a2gjl6hmd

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Mon Jun 30 14:26:22 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-30 16:03:11.575000048 +0200
+timestamp: 2008-06-30 16:12:23.312999964 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1278&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Mon Jun 30 14:26:22 2008
@@ -106,7 +106,7 @@
 
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
-  lib1394-dev = libraw1394-dev, libdc1394-22-dev
+  lib1394-dev = libraw1394-dev, libdc1394-22-dev | libdc1394-13-dev 
 else
   lib1394-dev =
 endif

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