[SCM] slv2/master: Update

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e0af9a04a6ea07f8c7385ea77efe0260d8725a1
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 1 14:31:01 2011 +0100

    Update

diff --git a/debian/changelog b/debian/changelog
index 9aadf93..ca2af89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
 slv2 (0.6.6-9) unstable; urgency=medium
 
   * Set slv2-jack's Section to sound.
-  * Upgrade path fix (Closes: #615968):
-    - Add Replaces: libslv2-9 (<< 0.6.6-8) to slv2-doc's stanza.
-    - Add Conflicts: libslv2-9 (<< 0.6.6-8) to slv2-doc's stanza
-      to prevent both packages install at the same time.
+  * Fix upgrade path (Closes: #615968):
+    - Add {Breaks,Replaces}: libslv2-9 (<< 0.6.6-8) to slv2-doc's stanza.
 
- -- Alessio Treglia <alessio at debian.org>  Tue, 01 Mar 2011 13:53:59 +0100
+ -- Alessio Treglia <alessio at debian.org>  Tue, 01 Mar 2011 14:30:12 +0100
 
 slv2 (0.6.6-8) unstable; urgency=medium
 

-- 
slv2 packaging