r1267 - in /unstable/ffmpeg/debian: changelog libavutil-dev.install patches/010_ffmpeg-config.diff rules

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

Author: fabian-guest
Date: Wed Jun 25 08:46:51 2008
New Revision: 1267

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1267
Log:
* debian/libavutil-dev.install, debian/rules,
debian/patches/010_ffmpeg-config.diff:
+ Removed ffmpeg-config, use pkg-config instead (maintainers of affected
packages have been informed, see #487917 to #487922).


Removed:
    unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/libavutil-dev.install
    unstable/ffmpeg/debian/rules

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1267&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Wed Jun 25 08:46:51 2008
@@ -21,8 +21,12 @@
   * 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, 19 Jun 2008 14:17:26 +0200
+  * debian/libavutil-dev.install, debian/rules,
+    debian/patches/010_ffmpeg-config.diff:
+    + Removed ffmpeg-config, use pkg-config instead (maintainers of affected
+      packages have been informed, see #487917 to #487922).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 25 Jun 2008 10:26:13 +0200
 
 ffmpeg-free (0.svn20080206-8) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/libavutil-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavutil-dev.install?rev=1267&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavutil-dev.install (original)
+++ unstable/ffmpeg/debian/libavutil-dev.install Wed Jun 25 08:46:51 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

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1267&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Wed Jun 25 08:46:51 2008
@@ -67,10 +67,8 @@
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
   lib1394-dev = libraw1394-dev, libdc1394-22-dev
-  FIREWIRELIBS="-lraw1394 -ldc1394"
 else
   lib1394-dev =
-  FIREWIRELIBS=""
 endif
 
 ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
@@ -194,10 +192,6 @@
 	cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/
 	cp doc/ffserver.conf debian/tmp/etc/
 
-	sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e s/@VERSION@/$(DEB_VERSION)/ \
-		ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config
-	chmod 644 debian/tmp/usr/bin/ffmpeg-config
-	cp ffmpeg-config.1 debian/tmp/usr/share/man/man1/ffmpeg-config.1
 	cp tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 
 	dh_install --fail-missing --sourcedir=debian/tmp