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

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

Correct team's name.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8ae1646bc3eb019c066faa794706b02c29c82236
X-Git-Newrev: 77d3374ca6ea922972dc69d6894f98dc59e77249

The following commit has been merged in the master branch:
commit 77d3374ca6ea922972dc69d6894f98dc59e77249
Merge: 57705552cf8189bcdcfa096835fffb85c453c619 8ae1646bc3eb019c066faa794706b02c29c82236
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Wed Mar 23 14:10:37 2011 +0100

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

diff --combined debian/control
index 76ef405,2d1c081..d3be799
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,13 +1,25 @@@
  Source: projectm
  Section: sound
  Priority: optional
- Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Matthias Klumpp <matthias at nlinux.org>
  Vcs-Git: git://git.debian.org/pkg-multimedia/projectm.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/projectm.git
 -Build-Depends: debhelper (>= 7.0.50~), cmake, libqt4-dev, libqt4-opengl-dev, libjack-dev,
 - libglew-dev, libgl1-mesa-dev, libglu-dev, libx11-dev, libice-dev, libpulse-dev, libfreetype6-dev,
 - libvisual-0.4-dev, libsdl1.2-dev, libftgl-dev
 +Build-Depends: debhelper (>= 8),
 +               cmake,
 +               libqt4-dev,
 +               libqt4-opengl-dev,
 +               libjack-dev,
 +               libglew-dev,
 +               libgl1-mesa-dev,
 +               libglu-dev,
 +               libx11-dev,
 +               libice-dev,
 +               libpulse-dev,
 +               libfreetype6-dev,
 +               libvisual-0.4-dev,
 +               libsdl1.2-dev,
 +               libftgl-dev
  Standards-Version: 3.9.1
  Homepage: http://projectm.sf.net
  
@@@ -126,4 -114,4 +126,4 @@@ Description: Debugging symbols for proj
   OpenGL for hardware acceleration. It is compatible with Milkdrop
   presets.
   .
 - Most people will not need this package. 
 + Most people will not need this package.

-- 
projectm packaging