[SCM] ffado/master: Merge branch 'master' of git://git.debian.org/pkg-multimedia/ffado

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

Enable signed tags in git-buildpackage config.
Prepare release: Update changelog and control file.
Add myself as uploader.
Add source local-options to ease building with git-buildpackage.
Tighten gitignore on .pc.
Drop needlessly breaking/replacing ffado-python-support. Thanks to Adam D. Barratt (see bug#597119).
Ease backporting to Debian stable: Relax inclusion of CDBS snippets required only in DEB_MAINTAINER_MODE, and suppress related build-dependencies.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1f3f9a58f60b5ed69173e6d0205cfcb509f1ba05
X-Git-Newrev: 908f1721c4805e5303cfb39f3dfa66e2d76befcc

The following commit has been merged in the master branch:
commit 908f1721c4805e5303cfb39f3dfa66e2d76befcc
Merge: 60e0d1546a1042042a46bdd320ab5a0e57c998c0 1f3f9a58f60b5ed69173e6d0205cfcb509f1ba05
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Fri Oct 29 14:57:55 2010 +0200

    Merge branch 'master' of git://git.debian.org/pkg-multimedia/ffado

diff --combined debian/rules
index 30f19d2,9d36f45..812a78f
--- a/debian/rules
+++ b/debian/rules
@@@ -9,7 -9,10 +9,10 @@@
  #
  
  include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/rules/utils.mk
+ -include /usr/share/cdbs/1/rules/utils.mk
+ 
+ # Suppress optional build-dependencies
+ CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
  
  DEB_CLEAN_EXCLUDE=debian/tmp
  
@@@ -41,27 -44,22 +44,27 @@@ DEB_SCONS_EXTRA_FLAGS := 
  	$(NJOBS)
  
  
 -DEB_SCONS_NOOPT_FLAGS := DEBUG=1 ENABLE_OPTIMIZATION=no
 +DEB_SCONS_NOOPT_FLAGS := ENABLE_OPTIMIZATION=no
  
  DEB_DH_MAKESHLIBS_ARGS := --version-info="libffado2 (>=${DEBIAN_FFADO_COMPATIBLE_VERSION})"
  
  DEB_SCONS_ENVVARS :=
  DEB_SCONS_INVOKE = $(DEB_SCONS_ENVVARS) scons 
  
 +DEB_SCONS_ARGS_COMMON = 'COMPILE_FLAGS=$(CFLAGS)' $(DEB_SCONS_EXTRA_FLAGS) \
 +				$(DEB_SCONS_NOOPT_FLAGS)
 +
 +DEB_SCONS_ARGS_NODBG = $(DEB_SCONS_ARGS_COMMON) DESTDIR=$(DEB_DESTDIR) DEBUG=0
 +DEB_SCONS_ARGS_DBG = $(DEB_SCONS_ARGS_COMMON) DESTDIR=$(DEB_DESTDIR)/dbg DEBUG=1
 +
  #common-build-arch:: debian/stamp-scons-build
  ### Mangle libffado filename ###
  debian/stamp-scons-build:
  	-mkdir -p $(DEB_DESTDIR)
 -	$(DEB_SCONS_INVOKE) 'COMPILE_FLAGS=$(CFLAGS)' DESTDIR=$(DEB_DESTDIR) \
 -		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS) 
 -	$(DEB_SCONS_INVOKE) 'COMPILE_FLAGS=$(CFLAGS)' DESTDIR=$(DEB_DESTDIR) \
 -		$(DEB_SCONS_EXTRA_FLAGS) $(DEB_SCONS_NOOPT_FLAGS) \
 -		install
 +	$(DEB_SCONS_INVOKE) $(DEB_SCONS_ARGS_NODBG)
 +	$(DEB_SCONS_INVOKE) $(DEB_SCONS_ARGS_NODBG) install
 +	$(DEB_SCONS_INVOKE) $(DEB_SCONS_ARGS_DBG)
 +	$(DEB_SCONS_INVOKE) $(DEB_SCONS_ARGS_DBG) install
  	touch debian/stamp-scons-build
  
  # this is bad but the only easy way to have ardour.rc generated from

-- 
Free Firewire Audio Drivers (ffado.org) packaging