[SCM] libav/ubuntu: finish up the merge

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit de117b6d166865c57fa828abe626d025ff073c08
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Nov 1 17:58:24 2012 +0100

    finish up the merge
    
    Git-Dch: ignore

diff --git a/debian/control b/debian/control
index ba2760a..efb4500 100644
--- a/debian/control
+++ b/debian/control
@@ -78,13 +78,10 @@ Section: debug
 Priority: extra
 Architecture: any
 Replaces:
- ffmpeg-dbg (<< 6:0.8.3-5),
  libav-extra-dbg (<< 6:0.8.3-5)
 Breaks:
- ffmpeg-dbg (<< 6:0.8.3-5),
  libav-extra-dbg (<< 6:0.8.3-5)
 Depends:
- ffmpeg (= ${binary:Version}),
  libav-tools (= ${binary:Version}),
  libavcodec54 (= ${binary:Version}),
  libavdevice53 (= ${binary:Version}),
@@ -379,100 +376,3 @@ Description: Libav audo resampling library
  convert and stream audio and video.
  .
  This is the audio software resampling library from Libav.
-
-Package: libavutil-extra-52
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavutil52,
- ${misc:Depends},
-Description: Libav utility library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavcodec-extra-54
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Replaces:
- libavcodec54
-Breaks:
- libavcodec54,
- mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
-Description: Libav codec library (additional codecs)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the codec library from Libav (both encoding and decoding).
- .
- This package is a replacement for the regular libavcodec54 library package;
- it contains the following additional codecs:
- .
-  * OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band (Encoder/Decoder)
-  * OpenCORE Adaptive Multi-Rate (AMR) Wide-Band (Decoder)
-  * Android VisualOn AAC (Encoder)
-  * Android VisualOn Adaptive Multi-Rate (AMR) Wide-Band (Encoder)
- .
- Because this package links against libraries that are licensed under
- Apache License 2.0, the resulting binaries are distributed under the
- GPL version 3 or later.
-
-Package: libavdevice-extra-53
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavdevice53,
- ${misc:Depends},
-Description: Libav device handling library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavfilter-extra-3
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavfilter3,
- ${misc:Depends},
-Description: Libav filter library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libavformat-extra-54
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libavformat54,
- ${misc:Depends},
-Description: Libav file format library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
-Package: libswscale-extra-2
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends:
- libswscale2,
- ${misc:Depends},
-Description: Libav video software scaling library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
diff --git a/debian/rules b/debian/rules
index 0b425f0..beedb53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,6 +136,7 @@ ifeq ($(DEB_SOURCE), libav)
 	  	 --exclude 'debian*' --exclude .git  --exclude .pc --exclude '*-stamp' \
 	  	 --transform 's,^./,libav/,' ; \
 	fi
+endif
 	dh_installdirs -ptmp usr/src
 	dh_installdirs -ptmp usr/share/doc/libav/html etc
 	dh_installdirs -ptmp usr/share/doc/libav-doc/html
@@ -143,8 +144,8 @@ ifeq ($(DEB_SOURCE), libav)
 	# don't fail on binary-indep only builds.
 	[ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
 	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
-	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 	install -m 644 -D doc/avserver.conf debian/tmp/etc/
+	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
 		-Xusr/share/doc/libav-doc \
 		-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp

-- 
Libav/FFmpeg packaging