[SCM] projectm packaging branch, master, updated. debian/2.0.1+dfsg-1-6-g2f02b04

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

The following commit has been merged in the master branch:
commit 2f02b04f795e962b1027badcc09f842a96d2c132
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Thu Jul 29 18:15:22 2010 +0200

    Target at unstable
    
    * All bugs preventing projectM from enetring unstable
      have now been fixed.

diff --git a/debian/changelog b/debian/changelog
index 741c640..bb3d5c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+projectm (2.0.1+dfsg-2) unstable; urgency=low
+
+  * Prevent projectM-pulseaudio from crashing if graphics are not supported (Closes #590706)
+  * Check if PulseAudio is running in projectM-pulseaudio
+  * Improve projectM error handling
+
+ -- Matthias Klumpp <matthias at nlinux.org>  Thu, 29 Jul 2010 18:11:52 +0200
+
 projectm (2.0.1+dfsg-1) experimental; urgency=low
 
   * Initial release (Closes: #565355, #588529)
diff --git a/debian/control b/debian/control
index 47d17a0..cca43e2 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Package: projectm-data
 Architecture: all
 Section: libs
 Replaces: libprojectm-data
-Breaks: libprojectm-data
+Conflicts: libprojectm-data
 Depends: ${misc:Depends}
 Description: Advanced Milkdrop-compatible music visualization library - data
  libprojectm is an iterative music visualization library which uses

-- 
projectm packaging