r1099 - in /experimental/ffmpeg.20080206/debian: changelog ffmpeg.install rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Fri Mar 21 17:53:40 2008
New Revision: 1099

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1099
Log:
revert the previous commit

Modified:
    experimental/ffmpeg.20080206/debian/changelog
    experimental/ffmpeg.20080206/debian/ffmpeg.install
    experimental/ffmpeg.20080206/debian/rules

Modified: experimental/ffmpeg.20080206/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/changelog?rev=1099&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/changelog (original)
+++ experimental/ffmpeg.20080206/debian/changelog Fri Mar 21 17:53:40 2008
@@ -13,14 +13,6 @@
   * introduce new package: libavdevice52 and libavdevice-dev.
   * Implemented debian/get-orig-source.sh and adjusted the get-orig-source
     target in debian/rules to use that.
-
-  [Stefan Hermann]
-  * install qt-faststart. (Closes: #470484)
-  * debian/rules:
-    - build: $(MAKE) qt-faststart
-    - install: cp this to debian/tmp/usr/bin/
-  * debian/ffmpeg.install:
-    - added usr/bin/qt-faststart
 
   [ Fabian Greffrath ]
   * debian/changelog:

Modified: experimental/ffmpeg.20080206/debian/ffmpeg.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/ffmpeg.install?rev=1099&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/ffmpeg.install (original)
+++ experimental/ffmpeg.20080206/debian/ffmpeg.install Fri Mar 21 17:53:40 2008
@@ -3,7 +3,6 @@
 usr/bin/ffmpeg
 usr/bin/ffserver
 usr/bin/ffplay
-usr/bin/qt-faststart
 usr/share/doc/ffmpeg
 usr/share/man/man1/ffmpeg.1
 usr/share/man/man1/ffserver.1

Modified: experimental/ffmpeg.20080206/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/rules?rev=1099&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/rules (original)
+++ experimental/ffmpeg.20080206/debian/rules Fri Mar 21 17:53:40 2008
@@ -92,12 +92,11 @@
 	  touch $$d/$$d.a ; \
 	done
 	touch ffmpeg ffmpeg_g ffplay ffplay_g
+
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	-$(MAKE) -C tests
 endif
 
-	$(MAKE) qt-faststart
-	
 	touch build-stamp
 
 clean:
@@ -139,11 +138,11 @@
 	for d in $(LIBS); do cp $$d/$$d.so* debian/tmp/usr/lib; done
 	cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/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 qt-faststart debian/tmp/usr/bin/qt-faststart
-	
+
 	dh_install --fail-missing --sourcedir=debian/tmp
 
 # Build architecture-independent files here.