[SCM] mixxx/master: Wrap and sort

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 673fa935cead91f184be782694b3591ebbff860f
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 28 10:13:34 2012 +0200

    Wrap and sort
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 4c53c6c..ec7f620 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,12 @@ Source: mixxx
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Brossier <piem at debian.org>,
+Uploaders:
+ Paul Brossier <piem at debian.org>,
  Free Ekanayaka <freee at debian.org>,
  Alessio Treglia <alessio at debian.org>
-Build-Depends: autotools-dev,
+Build-Depends:
+ autotools-dev,
  debhelper (>= 7.0.50~),
  docbook-to-man,
  imagemagick,
@@ -36,12 +38,14 @@ Homepage: http://www.mixxx.org/
 
 Package: mixxx
 Architecture: linux-any
-Depends: ${shlibs:Depends},
- mixxx-data (= ${source:Version}),
+Depends:
  libqt4-sql-sqlite,
+ mixxx-data (= ${source:Version}),
  ${dist:Depends},
- ${misc:Depends}
-Suggests: pdf-viewer
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests:
+ pdf-viewer
 Description: Digital Disc Jockey Interface
  Mixxx is a digital DJ system, where Wave, Ogg, FLAC and MP3 files can be
  mixed on a computer for use in live performances. Filters, crossfader, and
@@ -53,7 +57,8 @@ Description: Digital Disc Jockey Interface
 
 Package: mixxx-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: Digital Disc Jockey Interface -- data files
  Mixxx is a digital DJ system, where Wave, Ogg, FLAC and MP3 files can be
  mixed on a computer for use in live performances. Filters, crossfader, and
diff --git a/debian/mixxx-data.install b/debian/mixxx-data.install
index 2871305..3b42707 100644
--- a/debian/mixxx-data.install
+++ b/debian/mixxx-data.install
@@ -1,2 +1,2 @@
-usr/share/mixxx
 Mixxx-Manual.pdf usr/share/mixxx-data
+usr/share/mixxx
diff --git a/debian/mixxx.install b/debian/mixxx.install
index 1c15f56..d842e13 100644
--- a/debian/mixxx.install
+++ b/debian/mixxx.install
@@ -1,4 +1,4 @@
-usr/bin
 mixxx.xpm usr/share/pixmaps
-usr/share/applications
 res/images/mixxx-icon.png usr/share/pixmaps
+usr/bin
+usr/share/applications

-- 
mixxx packaging