r1317 - in /unstable/ffmpeg/debian: changelog confflags control

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

Author: fabian-guest
Date: Mon Jul 14 09:04:51 2008
New Revision: 1317

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1317
Log:
  * debian/confflags, debian/control:
    + Build-Depend on libdc1394-22-dev explicitely and add
      Build-Conflicts on libdc1394-13-dev (Closes: 490319).


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

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1317&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Mon Jul 14 09:04:51 2008
@@ -1,10 +1,16 @@
 ffmpeg-debian (0.svn20080206-11) unstable; urgency=low
 
+  [ Reinhard Tartler ]
   * new patch: patches/010_fix_ftbfs_hppa.diff: On hppa shared objects
     do required object files to be build "-fPIC -DPIC". Patch taken
     from upstream svn.
 
- -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Jul 2008 18:01:16 +0200
+  [ Fabian Greffrath ]
+  * debian/confflags, debian/control:
+    + Build-Depend on libdc1394-22-dev explicitely and add
+      Build-Conflicts on libdc1394-13-dev (Closes: 490319).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 14 Jul 2008 11:02:05 +0200
 
 ffmpeg-debian (0.svn20080206-10) unstable; urgency=high
 

Modified: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1317&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Mon Jul 14 09:04:51 2008
@@ -36,7 +36,7 @@
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
-  lib1394-dev = libraw1394-dev, libdc1394-22-dev | libdc1394-13-dev
+  lib1394-dev = libraw1394-dev, libdc1394-22-dev
 else
   lib1394-dev =
 endif

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1317&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Mon Jul 14 09:04:51 2008
@@ -8,7 +8,7 @@
            Fabian Greffrath <fabian at debian-unofficial.org>
 Build-Depends: debhelper (>= 5.0.0),
                doxygen,
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | 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,
@@ -22,6 +22,7 @@
                quilt,
                texi2html,
                zlib1g-dev
+Build-Conflicts: libdc1394-13-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/ffmpeg/debian/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/