[SCM] libav/libav-extra: Fix issue with installation of debug symbols. (Closes: #642798)

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

The following commit has been merged in the libav-extra branch:
commit 37c2356776844ee11633f0dc28d55c624da8c2dd
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Tue Mar 20 23:36:00 2012 -0400

    Fix issue with installation of debug symbols. (Closes: #642798)

diff --git a/debian/changelog b/debian/changelog
index 0a8a528..9ca265d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ libav (5:0.8.1-2) UNRELEASED; urgency=low
   * Remove dependencies and suggests of FAAD, no longer needed.
   * Set Enhances field and update package description for libavcodec-extra
     package. (Closes: #653451)
+  * Fix issue with installation of debug symbols. (Closes: #642798)
 
- -- Andres Mejia <amejia at debian.org>  Tue, 20 Mar 2012 23:00:19 -0400
+ -- Andres Mejia <amejia at debian.org>  Tue, 20 Mar 2012 23:21:56 -0400
 
 libav (4:0.8.1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 3fc588e..9bb8e21 100644
--- a/debian/control
+++ b/debian/control
@@ -125,7 +125,6 @@ Priority: extra
 Architecture: any
 Depends:
  libav-tools (= ${binary:Version}),
- libavcodec53 (= ${binary:Version}),
  libavdevice53 (= ${binary:Version}),
  libavformat53 (= ${binary:Version}),
  libavutil51 (= ${binary:Version}),
@@ -141,6 +140,38 @@ Description: Debug symbols for Libav related packages
  Most people will not need this package. Please install it to produce useful
  stacktraces to help debugging the Libav library.
 
+Package: libav-regular-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ libavcodec53 (= ${binary:Version}),
+ ${misc:Depends}
+Description: Debug symbols for Libav related packages
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package contains debug data of the libavcodec regular shared library.
+ .
+ Most people will not need this package. Please install it to produce useful
+ stacktraces to help debugging the Libav library.
+
+Package: libav-extra-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ libavcodec-extra-53 (= ${binary:Version}),
+ ${misc:Depends}
+Description: Debug symbols for Libav related packages
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package contains debug data of the libavcodec extra shared library.
+ .
+ Most people will not need this package. Please install it to produce useful
+ stacktraces to help debugging the Libav library.
+
 Package: ffmpeg-doc
 Section: oldlibs
 Priority: extra
diff --git a/debian/libavcodec-extra-53.copyright b/debian/libav-extra-dbg.copyright
similarity index 100%
copy from debian/libavcodec-extra-53.copyright
copy to debian/libav-extra-dbg.copyright
diff --git a/debian/rules b/debian/rules
index c433a74..9748ecc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,8 @@ install-common: build $(DH_INSTALL_FILES)
 	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
-	dh_strip --dbg-package=libav-dbg
+	dh_strip $(addprefix -N,$(LIB_PKGS2)) --dbg-package=libav-dbg
+	dh_strip $(addprefix -p,$(LIB_PKGS2)) --dbg-package=libav-regular-dbg
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -formats | tee formats.txt
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -141,6 +142,7 @@ install-extra: build $(DH_INSTALL_FILES)
 	dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) -Xusr/share/doc/libav-doc \
 		-Xusr/share/doc/libav --fail-missing \
 		--sourcedir=debian/tmp/extra
+	dh_strip $(addprefix -p,$(LIB_EXTRA_PKGS)) --dbg-package=libav-extra-dbg
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
 	dh_installdocs -plibavcodec-extra-53 codecs.txt

-- 
Libav/FFmpeg packaging