This is an automated email from the git hooks/post-receive script.
fsateler pushed a commit to branch master
in repository pulseaudio.
commit 550178688af100ef362a57c0c38a3326cbbc2068
Author: Felipe Sateler <fsateler at debian.org>
Date: Sat Apr 2 20:31:06 2016 -0300
Fix Build-Profile stage1 support
* Fix Build-Profile stage1 support
- Mark libbluetooth-dev dependency as <!stage1>
- Mark pulseaudio-module-bluetooth as <!stage1>
- Build-depend on new enough debhelper (9.20141010)
- Use correct flag --disable-bluez5
- Drop manual ignoring of bluetooth packages, debhelper knows to do so
---
debian/changelog | 6 ++++++
debian/control | 7 +++----
debian/rules | 9 +--------
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5a4f82..9de3ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ pulseaudio (8.0-2) UNRELEASED; urgency=medium
* Drop XS-Testsuite header.
- Newer dpkg-dev adds the field automatically
- Add versioned Build-Depends for such a version (1.17.14)
+ * Fix Build-Profile stage1 support
+ - Mark libbluetooth-dev dependency as <!stage1>
+ - Mark pulseaudio-module-bluetooth as <!stage1>
+ - Build-depend on new enough debhelper (9.20141010)
+ - Use correct flag --disable-bluez5
+ - Drop manual ignoring of bluetooth packages, debhelper knows to do so
-- Felipe Sateler <fsateler at debian.org> Sat, 02 Apr 2016 19:29:18 -0300
diff --git a/debian/control b/debian/control
index aa72222..7a54513 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,7 @@ Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debia
Uploaders: Sjoerd Simons <sjoerd at debian.org>,
Balint Reczey <balint at balintreczey.hu>,
Felipe Sateler <fsateler at debian.org>
-# The following packages can be omitted for bootstrapping (DEB_BUILD_PROFILES=stage1):
-# libbluetooth-dev
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20141010),
cdbs (>= 0.4.93),
check,
dh-autoreconf,
@@ -18,7 +16,7 @@ Build-Depends: debhelper (>= 9),
libasyncns-dev,
libatomic-ops-dev,
libavahi-client-dev,
- libbluetooth-dev (>= 4.99) [linux-any],
+ libbluetooth-dev (>= 4.99) [linux-any] <!stage1>,
libsbc-dev [linux-any],
libcap-dev [linux-any],
libfftw3-dev,
@@ -188,6 +186,7 @@ Description: RAOP module for PulseAudio sound server
This module enables PulseAudio to stream audio to an Apple Airport Express.
Package: pulseaudio-module-bluetooth
+Build-Profiles: <!stage1>
Architecture: linux-any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, bluez (>= 5.23)
diff --git a/debian/rules b/debian/rules
index 6896f3b..4211237 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,6 @@ export AUTOPOINT=intltoolize --automake --copy
export XDG_RUNTIME_DIR = $(CURDIR)/debian/tmp/tmp/xdgruntimedir
export CK_TIMEOUT_MULTIPLIER = 0
-#Don't build all the modules packages when bootstrapping
-ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
- $(warning Bootstrap profile build)
- export DH_OPTIONS += -Npulseaudio-module-bluetooth -Npulseaudio-module-bluetooth-dbg
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez
-endif
-
common-install-arch::
find $(DEB_DESTDIR) -name "*.la" -delete
mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d
@@ -41,7 +34,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 --disable-hal-compat \
ifeq ($(words $(sort $(filter stage1,$(DEB_BUILD_PROFILES)))),1)
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez
+ DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluez5
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git