[pkg-remote-commits] [xrdp] 01/02: Update pulse install script.

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 827f35ed013e69bd537db631a9829f67749b7bc8
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Thu Dec 21 19:34:04 2017 +0100

    Update pulse install script.
---
 debian/changelog                | 2 +-
 debian/copyright                | 1 +
 debian/xrdp-build-pulse-modules | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83affce..4558a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ xrdp (0.9.4-4) unstable; urgency=high
   * Update README.Debian.
   * Update bug report instructions.
 
- -- Dominik George <nik at portux.lan.naturalnet.de>  Wed, 20 Dec 2017 19:57:05 +0100
+ -- Dominik George <nik at naturalnet.de>  Thu, 21 Dec 2017 19:33:54 +0100
 
 xrdp (0.9.4-3) unstable; urgency=high
 
diff --git a/debian/copyright b/debian/copyright
index 009a991..84843d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -813,6 +813,7 @@ License: Expat
 Files: debian/xrdp-build-pulse-modules
 Copyright: 2017 Wolfgang Schweer <wschweer at arcor.de>
  2017 Dominik George <nik at naturalnet.de>
+ 2017 mirabilos <thorsten.glaser at teckids.org>
 License: GPL-2+
 
 Files: sesman/chansrv/pcsc/dumps/*
diff --git a/debian/xrdp-build-pulse-modules b/debian/xrdp-build-pulse-modules
index d417b61..64e68fb 100755
--- a/debian/xrdp-build-pulse-modules
+++ b/debian/xrdp-build-pulse-modules
@@ -13,7 +13,7 @@
 # corresponding to the installed binary version, then builds the PulseAudio
 # module for xrdp and installs it.
 
-set -e
+set -ex
 
 # Get an empty temporary directory
 tmp=$(mktemp -d); cd "$tmp"
@@ -24,14 +24,17 @@ pulseaudio_upstream_version=$(dpkg-query -W -f='${source:Upstream-Version}' puls
 
 # Determine mirror
 if test -x /usr/bin/apt ; then
-	mirror=$(apt show "pulseaudio=$pulseaudio_version" 2>/dev/null | awk '/^APT-Sources: / { print $2; exit }')
+	set -- $(apt show "pulseaudio=$pulseaudio_version" 2>/dev/null)
+	mirror=$2
+	suite=${3#*/}
 fi
 if test "x$mirror" = x; then
 	mirror="http://ftp.debian.org/debian/"
+	suite=main
 fi
 
 # Download source packages
-dget "${mirror}pool/main/p/pulseaudio/pulseaudio_${pulseaudio_version}.dsc"
+dget "$mirror/pool/$suite/p/pulseaudio/pulseaudio_$pulseaudio_version.dsc"
 
 # Configure pulseaudio source
 cd "pulseaudio-$pulseaudio_upstream_version"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git