[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.6-2-34-gfab2ff7

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

The branch, master has been updated
       via  fab2ff7e703b060339041ac54fb3042d63706098 (commit)
      from  4ec5b0832dc4059b86060c01860f2bc0f406d9af (commit)


- Shortlog ------------------------------------------------------------
fab2ff7 Conflict pulseaudio < 0.9.7 in -esound-compat due to moved manpage.

Summary of changes:
 debian/changelog |    3 ++-
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit fab2ff7e703b060339041ac54fb3042d63706098
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Oct 31 15:31:16 2007 +0100

    Conflict pulseaudio < 0.9.7 in -esound-compat due to moved manpage.

diff --git a/debian/changelog b/debian/changelog
index fa60b42..54ec361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pulseaudio (0.9.7-1) UNRELEASED; urgency=low
   * debian/control:
     + Replace ${Source-Version} with ${binary:Version}.
     + Add XS-Vcs-* tags.
+    + Conflict pulseaudio < 0.9.7 in -esound-compat due to moved manpage.
   * debian/rules:
     + Add list-missing to catch new modules
     + Remove all .la files.
@@ -27,7 +28,7 @@ pulseaudio (0.9.7-1) UNRELEASED; urgency=low
   * debian/patches:
     + Added 0001-Set-ESD-socket-to-tmp-.esd-socket-to- match-up-with.patch
 
- -- CJ van den Berg <cj at vdbonline.com>  Wed, 31 Oct 2007 14:26:14 +0100
+ -- CJ van den Berg <cj at vdbonline.com>  Wed, 31 Oct 2007 15:31:44 +0100
 
 pulseaudio (0.9.6-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 88888ee..f241a96 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,7 @@ Description: PulseAudio command line tools detached debugging symbols
 Package: pulseaudio-esound-compat
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: esound
+Conflicts: esound, pulseaudio (< 0.9.7)
 Replaces: esound
 Provides: esound
 Description: PulseAudio ESD compatibility layer

-- 
pulseaudio packaging