[openal-soft] 01/01: adding fixes adn closing bugs

[Bret Curtis]

This is an automated email from the git hooks/post-receive script.

psi29a-guest pushed a commit to branch master
in repository openal-soft.

commit 147e9dd0c9d5af8486230b8c53fa6f8864fb213e
Author: Bret Curtis <psi29a at gmail.com>
Date:   Mon Sep 12 13:35:50 2016 +0200

    adding fixes adn closing bugs
---
 debian/changelog | 13 +++++++++++++
 debian/control   |  2 +-
 debian/rules     | 29 ++++++++++-------------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67b9d02..d374327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+openal-soft (1:1.17.2-1.1) unstable; urgency=medium
+
+  [ Bret Curtis ]
+  * add support back to sndio (Closes: #808184)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #-1)
+    + Invoke cmake via dh_auto_configure
+    + Pass --builddirectory to dh
+    + Invoke triplet-prefixed CC from d/rules
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 04 Sep 2016 07:59:01 +0200
+
 openal-soft (1:1.17.2-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 37d6b2c..9709fc8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at tauware.de>,
            Bret Curtis <psi29a at gmail.com>
 Build-Depends: debhelper (>= 9),
                libasound2-dev [linux-any],
-               cmake, portaudio19-dev, libpulse-dev,
+               cmake, portaudio19-dev, libpulse-dev, libsndio-dev
 Standards-Version: 3.9.7
 Section: libs
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/openal-soft.git
diff --git a/debian/rules b/debian/rules
index bf0ff68..317b911 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,13 @@ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-# For multiarch
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+ifeq ($(origin CC),default)
+	CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
 
 # Use this variable to allow options passed to cmake to be overridable
 DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
 		-DEXAMPLES=OFF \
 		..
@@ -28,22 +27,17 @@ DLOPENED_RECOMMENDS_LIBS = -lpulse
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 DLOPENED_RECOMMENDS_LIBS += -lasound
 endif
-DLOPENED_SUGGESTS_LIBS = -lportaudio
+DLOPENED_SUGGESTS_LIBS = -lportaudio -lsndio
 
 .PHONY: build
 %:
-	dh $@ --parallel
-
-build:
-	dh $@ --parallel
+	dh $@ --builddirectory=$(BUILD_TREE) --parallel
 
 override_dh_auto_clean:
 	rm -rf $(BUILD_TREE)
 
 override_dh_auto_configure:
-	mkdir -p $(BUILD_TREE)
-	cd $(BUILD_TREE) && \
-		cmake $(DEB_CMAKE_OPTIONS)
+	dh_auto_configure -- $(DEB_CMAKE_OPTIONS)
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog 
@@ -56,11 +50,8 @@ copyright_check:
 	${MAKE} -f /usr/share/cdbs/1/rules/utils.mk debian/stamp-copyright-check
 	rm debian/stamp-copyright-check
 
-override_dh_auto_build:
-	$(MAKE) --directory=$(BUILD_TREE)
-
 override_dh_auto_install:
-	$(MAKE) --directory=$(BUILD_TREE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install
 	install -d debian/tmp/etc/openal
 	install -m644 \
 		debian/tmp/usr/share/openal/alsoftrc.sample \
@@ -75,11 +66,11 @@ override_dh_shlibdeps: debian/tmp/openal-soft-Recommends-dummy.so debian/tmp/ope
 
 debian/tmp/openal-soft-Recommends-dummy.so:
 	mkdir -p debian/tmp
-	cc -xc -shared -Wl,--no-as-needed -o $@ /dev/null $(DLOPENED_RECOMMENDS_LIBS)
+	$(CC) -xc -shared -Wl,--no-as-needed -o $@ /dev/null $(DLOPENED_RECOMMENDS_LIBS)
 
 debian/tmp/openal-soft-Suggests-dummy.so:
 	mkdir -p debian/tmp
-	cc -xc -shared -Wl,--no-as-needed -o $@ /dev/null $(DLOPENED_SUGGESTS_LIBS)
+	$(CC) -xc -shared -Wl,--no-as-needed -o $@ /dev/null $(DLOPENED_SUGGESTS_LIBS)
 
 get-orig-source:
 	$(dir $_)openal-soft-get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openal-soft.git