[SCM] projectm/master: normalize fields with wrap-and-sort(1)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bf165b8b065cbfa2a63627e05e22c5f51acac50b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 23 20:36:28 2011 +0100

    normalize fields with wrap-and-sort(1)

diff --git a/debian/control b/debian/control
index aafb316..c38c13c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,32 +2,34 @@ Source: projectm
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Matthias Klumpp <matthias at nlinux.org>,
+Uploaders:
+ Matthias Klumpp <matthias at nlinux.org>,
  Reinhard Tartler <siretart at tauware.de>
 Vcs-Git: git://git.debian.org/pkg-multimedia/projectm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/projectm.git
-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
+Build-Depends:
+ cmake,
+ debhelper (>= 8),
+ libfreetype6-dev,
+ libftgl-dev,
+ libgl1-mesa-dev,
+ libglew-dev,
+ libglu-dev,
+ libice-dev,
+ libjack-dev,
+ libpulse-dev,
+ libqt4-dev,
+ libqt4-opengl-dev,
+ libsdl1.2-dev,
+ libvisual-0.4-dev,
+ libx11-dev
 Standards-Version: 3.9.1
 Homepage: http://projectm.sf.net
 
 Package: libprojectm2
 Architecture: any
 Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}, ttf-bitstream-vera, projectm-data
+Depends: projectm-data, ttf-bitstream-vera, ${misc:Depends}, ${shlibs:Depends}
 Replaces: libprojectm-data (<< 2.0.1)
 Description: Advanced Milkdrop-compatible music visualization library
  libprojectm is an iterative music visualization library which uses
@@ -40,7 +42,7 @@ Description: Advanced Milkdrop-compatible music visualization library
 Package: libprojectm-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libprojectm2 (= ${binary:Version})
+Depends: libprojectm2 (= ${binary:Version}), ${misc:Depends}
 Description: Advanced Milkdrop-compatible music visualization library - dev
  libprojectm is an iterative music visualization library which uses
  OpenGL for hardware acceleration. It is compatible with Milkdrop
@@ -87,7 +89,7 @@ Description: projectM Qt4 bindings
 Package: libprojectm-qt-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libprojectm-qt1 (= ${binary:Version})
+Depends: libprojectm-qt1 (= ${binary:Version}), ${misc:Depends}
 Description: projectM Qt4 (development files)
  projectM is an iterative music visualization library which uses
  OpenGL for hardware acceleration. It is compatible with Milkdrop
@@ -97,7 +99,7 @@ Description: projectM Qt4 (development files)
 
 Package: projectm-jack
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, jackd
+Depends: jackd, ${misc:Depends}, ${shlibs:Depends}
 Description: projectM JackAudio module
  projectM is an iterative music visualization library which uses
  OpenGL for hardware acceleration. It is compatible with Milkdrop
@@ -107,7 +109,7 @@ Description: projectM JackAudio module
 
 Package: projectm-pulseaudio
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, pulseaudio
+Depends: pulseaudio, ${misc:Depends}, ${shlibs:Depends}
 Description: projectM PulseAudio module
  projectM is an iterative music visualization library which uses
  OpenGL for hardware acceleration. It is compatible with Milkdrop
@@ -119,7 +121,7 @@ Package: projectm-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, libprojectm2 (= ${binary:Version})
+Depends: libprojectm2 (= ${binary:Version}), ${misc:Depends}
 Description: Debugging symbols for projectM
  This package includes debugging symbols for all projectM
  libraries and applications.
diff --git a/debian/copyright b/debian/copyright
index f62eeeb..bd9d498 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,12 +12,12 @@ Copyright:
      Evaluator
      Pulse Audio support (projectM-pulseaudio)
      Qt GUI (projectM-qt)
-	
+
     Peter Sperl <peter at sperl.com>
      Beat Detection
      Rendering
      XMMS Support (projectM-xmms)
-     libvisual Support (projectM-libvisual)   
+     libvisual Support (projectM-libvisual)
 
     Alligator Descartes
      Media Player Support (iTunes, Winamp, Windows Media Player)
@@ -27,7 +27,7 @@ Copyright:
 
     Roger Dannenburg
      Advice & Support
-     
+
 Removed components:
     The following modules were removed from the Debian version of projectM:
      	src/WinLibs - Binary modules for Windows
@@ -42,19 +42,19 @@ Licenses:
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
- 
+
     ProjectM is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
     along with this package; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 .
-    
+
     The libprojectm library code is licensed under LGPLv2.1+:
-    
+
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
diff --git a/debian/libprojectm-qt1.install b/debian/libprojectm-qt1.install
index bc15cc2..4d128f3 100644
--- a/debian/libprojectm-qt1.install
+++ b/debian/libprojectm-qt1.install
@@ -1,2 +1,2 @@
-usr/lib/libprojectM-qt.so.*
 
+usr/lib/libprojectM-qt.so.*

-- 
projectm packaging