r1537 - /experimental/ffmpeg-debian/debian/

[siretart at users.alioth.debian.org]

Author: siretart
Date: Wed Nov  5 21:17:29 2008
New Revision: 1537

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1537
Log:

further adjustments so that the unstripped ffmpeg packages can actually build

implementing the plan outlined in
http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2008-October/002090.html

Added:
    experimental/ffmpeg-debian/debian/libavcodec-unstripped-52.install
    experimental/ffmpeg-debian/debian/libavdevice-unstripped-52.install
    experimental/ffmpeg-debian/debian/libavformat-unstripped-52.install
    experimental/ffmpeg-debian/debian/libavutil-unstripped-49.install
    experimental/ffmpeg-debian/debian/libpostproc-unstripped-51.install
    experimental/ffmpeg-debian/debian/libswscale-unstripped-0.install
Modified:
    experimental/ffmpeg-debian/debian/confflags
    experimental/ffmpeg-debian/debian/rules

Modified: experimental/ffmpeg-debian/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/confflags?rev=1537&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/confflags (original)
+++ experimental/ffmpeg-debian/debian/confflags Wed Nov  5 21:17:29 2008
@@ -1,9 +1,12 @@
 # -*- mode: makefile -*-
 # vim:syntax=make
 #
-# build a static version on every architecture
+# build a static version on every architecture in the ffmpeg-debian package
 # shared is generic, i.e. without arch specific opcodes
-FLAVORS := static shared
+FLAVORS := shared
+ifeq ($(DEB_SOURCE),ffmpeg-debian)
+FLAVORS += static
+endif
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

Added: experimental/ffmpeg-debian/debian/libavcodec-unstripped-52.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libavcodec-unstripped-52.install?rev=1537&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libavcodec-unstripped-52.install (added)
+++ experimental/ffmpeg-debian/debian/libavcodec-unstripped-52.install Wed Nov  5 21:17:29 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libavcodec.so.*

Added: experimental/ffmpeg-debian/debian/libavdevice-unstripped-52.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libavdevice-unstripped-52.install?rev=1537&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libavdevice-unstripped-52.install (added)
+++ experimental/ffmpeg-debian/debian/libavdevice-unstripped-52.install Wed Nov  5 21:17:29 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libavdevice.so.*

Added: experimental/ffmpeg-debian/debian/libavformat-unstripped-52.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libavformat-unstripped-52.install?rev=1537&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libavformat-unstripped-52.install (added)
+++ experimental/ffmpeg-debian/debian/libavformat-unstripped-52.install Wed Nov  5 21:17:29 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libavformat.so.*

Added: experimental/ffmpeg-debian/debian/libavutil-unstripped-49.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libavutil-unstripped-49.install?rev=1537&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libavutil-unstripped-49.install (added)
+++ experimental/ffmpeg-debian/debian/libavutil-unstripped-49.install Wed Nov  5 21:17:29 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libavutil.so.*

Added: experimental/ffmpeg-debian/debian/libpostproc-unstripped-51.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libpostproc-unstripped-51.install?rev=1537&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libpostproc-unstripped-51.install (added)
+++ experimental/ffmpeg-debian/debian/libpostproc-unstripped-51.install Wed Nov  5 21:17:29 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libpostproc.so.*

Added: experimental/ffmpeg-debian/debian/libswscale-unstripped-0.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libswscale-unstripped-0.install?rev=1537&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libswscale-unstripped-0.install (added)
+++ experimental/ffmpeg-debian/debian/libswscale-unstripped-0.install Wed Nov  5 21:17:29 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libswscale.so.*

Modified: experimental/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/rules?rev=1537&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/rules (original)
+++ experimental/ffmpeg-debian/debian/rules Wed Nov  5 21:17:29 2008
@@ -99,9 +99,17 @@
 	[ ! -d doxy ] || cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html
 	cp doc/ffserver.conf debian/tmp/etc/
 	cp debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
+ifneq ($(DEB_SOURCE),ffmpeg-debian)
+	dh_install --warn-missing --sourcedir=debian/tmp
+else
 	dh_install --fail-missing --sourcedir=debian/tmp
+endif
 
+ifneq ($(DEB_SOURCE),ffmpeg-debian)
+binary-indep: install
+else
 binary-indep: build-doxy install
+endif
 
 binary-arch: build install
 	dh_testdir
@@ -113,7 +121,11 @@
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installchangelogs Changelog
 	dh_link
+ifneq ($(DEB_SOURCE),ffmpeg-debian)
+	dh_strip
+else
 	dh_strip --dbg-package=ffmpeg-dbg
+endif
 	dh_compress
 	dh_fixperms
 	for pkg in $(LIB_PKGS); do \