[SCM] projectm packaging branch, master, updated. debian/2.0.1+dfsg-2-2-gc455529

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

The following commit has been merged in the master branch:
commit c4555290b3c561c76d9e350e449d1e209da796d4
Merge: f2f52c149d83eb21c64e8fa67f83c1490864d687 2d48a464d2af1a5ee91d81551b8f26ea8ed822f7
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Thu Jul 29 23:27:35 2010 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/projectm

diff --combined debian/control
index 677c1a3,b9712f3..12d23e5
--- a/debian/control
+++ b/debian/control
@@@ -15,6 -15,7 +15,7 @@@ Package: libprojectm
  Architecture: any
  Section: libs
  Depends: ${misc:Depends}, ${shlibs:Depends}, ttf-bitstream-vera, projectm-data
+ Replaces: libprojectm-data (<< 2.0.1)
  Description: Advanced Milkdrop-compatible music visualization library
   libprojectm is an iterative music visualization library which uses
   OpenGL for hardware acceleration. It is compatible with Milkdrop
@@@ -37,8 -38,8 +38,8 @@@ Description: Advanced Milkdrop-compatib
  Package: projectm-data
  Architecture: all
  Section: libs
- Replaces: libprojectm-data
- Conflicts: libprojectm-data
+ Replaces: libprojectm-data (<< 2.0.1)
+ Conflicts: libprojectm-data (<< 2.0.1)
  Depends: ${misc:Depends}
  Description: Advanced Milkdrop-compatible music visualization library - data
   libprojectm is an iterative music visualization library which uses
@@@ -50,6 -51,7 +51,6 @@@
  
  Package: libvisual-projectm
  Architecture: any
 -Section: libs
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Description: libvisual module for projectM
   projectM is an iterative music visualization library which uses

-- 
projectm packaging