[Pkg-pulseaudio-devel] [SCM] UNNAMED PROJECT branch, master, updated. fc48548ba35e95e3c626078a42ae32a9502efe0c

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

The branch, master has been updated
       via  fc48548ba35e95e3c626078a42ae32a9502efe0c (commit)
      from  74c426de4d022d0a5850f52038923ce0ba112b07 (commit)


- Shortlog ------------------------------------------------------------
fc48548 Add conflicts for flashplugin-nonfree-extrasound

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

commit fc48548ba35e95e3c626078a42ae32a9502efe0c
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Thu Jan 24 00:22:28 2008 +0100

    Add conflicts for flashplugin-nonfree-extrasound

diff --git a/debian/control b/debian/control
index 74cd7e4..b0afd29 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Architecture: i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: flashplugin-nonfree
 Suggests: pulseaudio
-Conflicts: libflashsupport
+Conflicts: libflashsupport, flashplugin-nonfree-extrasound
 Replaces: libflashsupport
 Description: Adobe Flash Player platform support library for PulseAudio
  This is an open Source extension library for the Adobe Flash Player that

-- 
UNNAMED PROJECT