[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-10-g68ae328

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

The following commit has been merged in the master branch:
commit 9de31733d0b33167ac1258310d76bfa3e3360273
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 13:55:37 2009 -0400

    Revert "    + Reorder when dh_strip is done so qt-faststart is also stripped."
    
    This reverts commit 9d2c3f7feb41b4f361ee514d7e367b6444cbb439.

diff --git a/debian/changelog b/debian/changelog
index 6d9b20d..9c10754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,6 @@ ffmpeg-debian (4:0.5+svn20090420-3) unstable; urgency=low
     + Don't install LICENSE. The licensing information should be, and is,
       covered in debian/copyright.
     + Fix 'breaks-without-version libavcodec51' warning.
-    + Reorder when dh_strip is done so qt-faststart is also stripped.
-    + Write man page for qt-faststart.
   * Register ffmpeg documentation with doc-base.
   * Install documentation with dh_installdocs.
 
diff --git a/debian/libavcodec52.override b/debian/libavcodec52.override
index bd52722..1a69d8d 100644
--- a/debian/libavcodec52.override
+++ b/debian/libavcodec52.override
@@ -1,4 +1,4 @@
 # ffmpeg is being built with -fPIC yet the result binaries still get these
-# TEXTRELs. This requires further work. Please see bug #528080.
+# TEXTRELs. This requires further investigation.
 libavcodec52: shlib-with-non-pic-code usr/lib/i686/cmov/libavcodec.so.52.20.0
 libavcodec52: shlib-with-non-pic-code usr/lib/libavcodec.so.52.20.0
diff --git a/debian/libpostproc51.override b/debian/libpostproc51.override
index a7b7dd6..0fa7e78 100644
--- a/debian/libpostproc51.override
+++ b/debian/libpostproc51.override
@@ -1,4 +1,4 @@
 # ffmpeg is being built with -fPIC yet the result binaries still get these
-# TEXTRELs. This requires further work. Please see bug #528080.
+# TEXTRELs. This requires further investigation.
 libpostproc51: shlib-with-non-pic-code usr/lib/i686/cmov/libpostproc.so.51.2.0
 libpostproc51: shlib-with-non-pic-code usr/lib/libpostproc.so.51.2.0
diff --git a/debian/libswscale0.override b/debian/libswscale0.override
index 2f4c570..09d83ba 100644
--- a/debian/libswscale0.override
+++ b/debian/libswscale0.override
@@ -1,4 +1,4 @@
 # ffmpeg is being built with -fPIC yet the result binaries still get these
-# TEXTRELs. This requires further work. Please see bug #528080.
+# TEXTRELs. This requires further investigation.
 libswscale0: shlib-with-non-pic-code usr/lib/i686/cmov/libswscale.so.0.7.1
 libswscale0: shlib-with-non-pic-code usr/lib/libswscale.so.0.7.1
diff --git a/debian/qt-faststart.1 b/debian/qt-faststart.1
deleted file mode 100644
index b78da3d..0000000
--- a/debian/qt-faststart.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH QT-FASTSTART 1 "May 10, 2009"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-qt-faststart \- utility for Quicktime files
-.SH SYNOPSIS
-.B qt-faststart
-.br
-.SH DESCRIPTION
-\fBqt-faststart\fP is a utility that rearranges a Quicktime file such that the
-moov atom is in front of the data, thus facilitating network streaming.
-.SH OPTIONS
-Options processed by the executable:
-.TP
-\fB\<infile.mov>\fR
-The source Quicktime file.
-.TP
-\fB\<outfile.mov>\fR
-The destination Quicktime file.
-.SH AUTHOR
-This manual page was written by Andres Mejia <mcitadel at gmail.com>
-for the Debian GNU/Linux system, but may be used by others.
diff --git a/debian/rules b/debian/rules
index 9748948..b3a776b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,7 +142,6 @@ binary-arch: build install formats.txt
 		$(CURDIR)/debian/libpostproc51/usr/share/lintian/overrides/libpostproc51
 	install -D -m 0644 debian/libavcodec52.override \
 		$(CURDIR)/debian/libavcodec52/usr/share/lintian/overrides/libavcodec52
-	dh_installman -pffmpeg debian/qt-faststart.1
 	dh_installdocs $(extradoc) doc/optimization.txt
 	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
 	dh_installdocs -A debian/README.Debian
@@ -156,13 +155,13 @@ endif
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installchangelogs Changelog
 	dh_link
-	dh_compress
-	dh_fixperms
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
 	dh_strip
 else
 	dh_strip --dbg-package=ffmpeg-dbg
 endif
+	dh_compress
+	dh_fixperms
 # strict internal dependencies
 ifeq ($(DEB_SOURCE),ffmpeg-debian)
 	for pkg in $(LIB_PKGS); do \

-- 
FFmpeg packaging