[SCM] rosegarden/master: Wrap and sort.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit de200b5139ad82a3462511dcc0e275fbcbb4f508
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 16 11:10:15 2011 +0100

    Wrap and sort.

diff --git a/debian/control b/debian/control
index c68a794..871f7b3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,21 +7,21 @@ Uploaders: Free Ekanayaka <freee at debian.org>,
  Alessio Treglia <alessio at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  automake,
- pkg-config,
- xutils-dev,
- libx11-dev,
- libsm-dev,
- libqt4-dev,
+ dssi-dev (>= 0.4),
+ fftw3-dev,
+ ladspa-sdk,
  libasound2-dev (>= 1.0.0),
  libjack-dev,
- ladspa-sdk,
- liblrdf0-dev,
  liblircclient-dev,
- dssi-dev (>= 0.4),
  liblo-dev,
- fftw3-dev,
+ liblrdf0-dev,
+ libqt4-dev,
+ libsamplerate-dev,
+ libsm-dev,
  libsndfile1-dev,
- libsamplerate-dev
+ libx11-dev,
+ pkg-config,
+ xutils-dev
 Standards-Version: 3.9.2
 Homepage: http://www.rosegardenmusic.com/
 Vcs-Git: git://git.debian.org/pkg-multimedia/rosegarden.git
@@ -29,21 +29,26 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/rosegarden.git
 
 Package: rosegarden
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends:
+ flac,
  libxml-twig-perl,
  sndfile-programs,
- flac
-Replaces: rosegarden-data
-Conflicts: rosegarden-data
-Recommends: jackd,
- lilypond,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ rosegarden-data
+Conflicts:
+ rosegarden-data
+Recommends:
+ cups-bsd | lpr,
  ghostscript,
+ jackd,
+ konqueror | www-browser,
+ lilypond,
  okular | pdf-viewer,
- cups-bsd | lpr,
- swh-plugins | ladspa-plugin,
- konqueror | www-browser
-Suggests: qjackctl
+ swh-plugins | ladspa-plugin
+Suggests:
+ qjackctl
 Description: music editor and MIDI/audio sequencer
  Rosegarden is a Qt application which provides a mixed Audio/MIDI
  sequencer (for playback and recording), a multi-track editor, music
@@ -54,7 +59,8 @@ Package: rosegarden-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: rosegarden (= ${binary:Version}),
+Depends:
+ rosegarden (= ${binary:Version}),
  ${misc:Depends}
 Description: Debugging symbols for Rosegarden
  Rosegarden is a Qt application which provides a mixed Audio/MIDI
diff --git a/debian/copyright b/debian/copyright
index fbe0fe4..7ca57b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,4 +52,3 @@ The Debian packging is
   Copyright (c) Stuart Prescott <stuart+debian at nanonanonano.net> 2010
   Copyright (c) Mike O'Connor <stew at debian.org> 2006-2009
   Copyright (c) Enrique Robledo Arnuncio <era at debian.org> 2002
-
diff --git a/debian/rosegarden.install b/debian/rosegarden.install
index e9d3d09..4910695 100644
--- a/debian/rosegarden.install
+++ b/debian/rosegarden.install
@@ -1,2 +1,2 @@
-usr
 debian/rosegarden.xpm usr/share/pixmaps
+usr

-- 
rosegarden packaging