[SCM] pulseaudio packaging branch, master, updated. debian/5.0-1-8-g44013cd

[fsateler at users.alioth.debian.org]

The branch, master has been updated
       via  44013cde52e26472d62bf43b7f82d75dd28cae18 (commit)
       via  1b7140b56f304cb7043ced8750fdb40f920d6757 (commit)
       via  e765c032703fe0fb80b9a28b7e2174fb0b9b854a (commit)
       via  2b6bc28cc5e06aae223ceb936ad95e2870c6c8c3 (commit)
      from  bf53e77d5f088630f55a6571caeb185e94331d31 (commit)


- Shortlog ------------------------------------------------------------
44013cd Update changelog entries
1b7140b Merge remote-tracking branch 'origin/master'
e765c03 Add Breaks: on versions of jack with no latency API. Closes: #685258
2b6bc28 Install pulseaudio shell completions

Summary of changes:
 debian/changelog          | 8 ++++++++
 debian/control            | 1 +
 debian/pulseaudio.install | 2 ++
 debian/rules              | 4 ++++
 4 files changed, 15 insertions(+)
-----------------------------------------------------------------------
Details of changes:

commit 44013cde52e26472d62bf43b7f82d75dd28cae18
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Apr 7 17:32:25 2014 -0300

    Update changelog entries

diff --git a/debian/changelog b/debian/changelog
index fac730e..224b2b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 pulseaudio (5.0-2) UNRELEASED; urgency=low
 
+  [ Balint Reczey ]
   * Start working on next upload
+  * Fix FTBFS on ARM architectures
+
+  [ Felipe Sateler ]
+  * Install pulseaudio shell completions
+  * Add Breaks: on versions of jack with no latency API.
+     Closes: #685258
+  * Make pulseaudio-dbg Recommend libpulse0-dbg
 
  -- Balint Reczey <balint at balintreczey.hu>  Mon, 07 Apr 2014 15:13:52 +0200
 

commit 1b7140b56f304cb7043ced8750fdb40f920d6757
Merge: e765c032703fe0fb80b9a28b7e2174fb0b9b854a bf53e77d5f088630f55a6571caeb185e94331d31
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Apr 7 17:31:04 2014 -0300

    Merge remote-tracking branch 'origin/master'

diff --combined debian/rules
index 66bff9e,b7a1e63..c9fc6fd
--- a/debian/rules
+++ b/debian/rules
@@@ -34,14 -34,10 +34,14 @@@ common-install-arch:
  	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
  	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
  
 +install/pulseaudio::
 +	mkdir -p $(CURDIR)/debian/tmp/usr/share/zsh/vendor-completions/
 +	install -m 644 shell-completion/pulseaudio-zsh-completion.zsh \
 +		$(CURDIR)/debian/tmp/usr/share/zsh/vendor-completions/_pulseaudio
  
  common-configure-arch::
  ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
- 	make -C src libpulsecommon_5.0_la-svolume_arm.lo CFLAGS+=-march=armv6
+ 	make -C src pulsecore/libpulsecommon_5.0_la-svolume_arm.lo CFLAGS+=-march=armv6
  endif
  
  common-binary-post-install-arch:: list-missing

commit e765c032703fe0fb80b9a28b7e2174fb0b9b854a
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Apr 7 17:26:10 2014 -0300

    Add Breaks: on versions of jack with no latency API. Closes: #685258

diff --git a/debian/control b/debian/control
index b1377b1..9b30269 100644
--- a/debian/control
+++ b/debian/control
@@ -189,6 +189,7 @@ Description: Zeroconf module for PulseAudio sound server (debugging symbols)
 Package: pulseaudio-module-jack
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libjack-jackd2-0 (<< 1.9.7), libjack0 (<< 1:0.118+svn4104)
 Description: jackd modules for PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
  WIN32 systems. It is a drop in replacement for the ESD sound server with

commit 2b6bc28cc5e06aae223ceb936ad95e2870c6c8c3
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Apr 7 17:24:26 2014 -0300

    Install pulseaudio shell completions

diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 4046dd2..5072011 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -84,3 +84,5 @@ usr/share/locale
 usr/share/pulseaudio
 usr/lib/*/libpulsecore-*.so usr/lib
 usr/share/alsa
+usr/share/zsh/vendor-completions/*
+etc/bash_completion.d/*
diff --git a/debian/rules b/debian/rules
index f7cccd2..66bff9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,10 @@ common-install-arch::
 	install -d $(CURDIR)/debian/tmp/usr/share/apport/package-hooks
 	cp $(CURDIR)/debian/apport-hook.py $(CURDIR)/debian/tmp/usr/share/apport/package-hooks/source_pulseaudio.py
 
+install/pulseaudio::
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/zsh/vendor-completions/
+	install -m 644 shell-completion/pulseaudio-zsh-completion.zsh \
+		$(CURDIR)/debian/tmp/usr/share/zsh/vendor-completions/_pulseaudio
 
 common-configure-arch::
 ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))

-- 
pulseaudio packaging