[SCM] libav/experimental: Install all debug symbols into libav-dbg (Closes: #680602).
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Mon Oct 1 08:42:56 UTC 2012
The following commit has been merged in the experimental branch:
commit 01e1cce229086b8c5414206cfd2135332db89f27
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Sat Jul 14 22:40:51 2012 +0200
Install all debug symbols into libav-dbg (Closes: #680602).
Conflicts:
debian/control
debian/libav-extra-dbg.copyright
debian/libavcodec-extra-54.copyright
debian/rules
diff --git a/debian/control b/debian/control
index 471988d..6760e50 100644
--- a/debian/control
+++ b/debian/control
@@ -91,9 +91,13 @@ Architecture: any
Provides:
ffmpeg-dbg
Replaces:
- ffmpeg-dbg (<< 5:0.8.1-3)
+ ffmpeg-dbg (<< 6:0.8.3-4),
+ libav-regular-dbg (<< 6:0.8.3-4),
+ libav-extra-dbg (<< 6:0.8.3-4)
Breaks:
- ffmpeg-dbg (<< 5:0.8.1-3)
+ ffmpeg-dbg (<< 6:0.8.3-4),
+ libav-regular-dbg (<< 6:0.8.3-4),
+ libav-extra-dbg (<< 6:0.8.3-4)
Depends:
libav-tools (= ${binary:Version}),
libavcodec54 (= ${binary:Version}),
@@ -112,36 +116,30 @@ Description: Debug symbols for Libav related packages
stacktraces to help debugging the Libav library.
Package: libav-regular-dbg
-Section: debug
+Section: oldlibs
Priority: extra
Architecture: any
Depends:
- libavcodec54 (= ${binary:Version}),
+ libav-dbg,
${misc:Depends}
-Description: Debug symbols for Libav related packages
+Description: Debug symbols for Libav related packages (transitional package)
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.
+ This package serves as a transitional package to libav-dbg.
Package: libav-extra-dbg
-Section: debug
+Section: oldlibs
Priority: extra
Architecture: any
Depends:
- libavcodec-extra-54 (= ${binary:Version}),
+ libav-dbg,
${misc:Depends}
-Description: Debug symbols for Libav related packages
+Description: Debug symbols for Libav related packages (transitional package)
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.
+ This package serves as a transitional package to libav-dbg.
Package: libav-doc
Section: doc
diff --git a/debian/copyright b/debian/copyright
index 9f1e2d3..eb5f322 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -85,3 +85,7 @@ The rest of the code is licensed under the GNU LGPL:
On Debian GNU/Linux systems, the complete text of the GNU General Public
License can be found in `/usr/share/common-licenses/GPL' and the text of the
GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+Note: Because the libavcodec-extra-54 package links against libraries that
+are licensed under Apache License 2.0, it is distributed under the GPL
+version 3. The libav-dbg package does also contain its debug symbols.
diff --git a/debian/libav-extra-dbg.copyright b/debian/libav-extra-dbg.copyright
deleted file mode 100644
index e3301ae..0000000
--- a/debian/libav-extra-dbg.copyright
+++ /dev/null
@@ -1,91 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/libavcodec-extra-54.copyright b/debian/libavcodec-extra-54.copyright
deleted file mode 100644
index e3301ae..0000000
--- a/debian/libavcodec-extra-54.copyright
+++ /dev/null
@@ -1,91 +0,0 @@
-This package was downloaded from http://libav.org
-
-Upstream Authors: Fabrice Bellard
- Alex Beregszaszi
- BERO
- Mario Brito
- Ronald Bultje
- Tim Ferguson
- Brian Foley
- Arpad Gereoffy
- Philip Gladstone
- Vladimir Gneushev
- Wolfgang Hesseler
- Falk Hueffner
- Zdenek Kabelac
- Robin Kay
- Todd Kirby
- Nick Kurshev
- Mike Melanson
- Michael Niedermayer
- François Revol
- Roman Shaposhnik
- Dieter Shirley
- Juan J. Sierralta
- Ewald Snel
- Leon van Stuivenberg
- Roberto Togni
- Lionel Ulmer
-
-Copyright (c) 2000-2004 Fabrice Bellard et al.
-
-The following files are licensed under the GNU GPL, as clarified below:
-
- * ffmpeg.c
- * libavcodec:
- + dtsdec.c
- + i386/idct_mmx.c
- + liba52/*.[ch]
- * libavformat:
- + x11grab.c
- + gxfenc.c
- * libswscale:
- + swscale.c
- + swscale-example.c
- + yuv2rgb_template.c
- + swscale_altivec_template.c
- + yuv2rgb_altivec.c
- + swscale_template.c
- + rgb2rgb_template.c
- + rgb2rgb.c
- + cs_test.c
- + yuv2rgb_mlib.c
- + yuv2rgb.c
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU General Public License as
- | published by the Free Software Foundation; either version 2 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The rest of the code is licensed under the GNU LGPL:
-
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public License as
- | published by the Free Software Foundation; either version 2.1 of
- | the License, or (at your option) any later version.
- |
- | This library is distributed in the hope that it will be useful,
- | but WITHOUT ANY WARRANTY; without even the implied warranty of
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU General Public License
- | along with this program; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
-
-Note: Because this package links against libraries that are licensed
-under Apache License 2.0, the resulting binaries are distributed under the
-GPL version 3.
diff --git a/debian/rules b/debian/rules
index 19dd086..762bc71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,8 +132,6 @@ install-common: build $(DH_INSTALL_FILES)
dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) \
-Xusr/share/doc/libav-doc \
-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
- 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-$(DEB_HOST_ARCH).txt
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -147,7 +145,6 @@ 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-54 codecs.txt
@@ -171,7 +168,7 @@ binary-arch: build install
dh_link
dh_compress
dh_fixperms
- dh_strip
+ dh_strip --dbg-package=libav-dbg
for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION))"; \
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list