[SCM] fluidsynth/master: wrap-and-sort -s

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4d018963602e8f0d1fc8a3ed2990212d1fe219f5
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Aug 5 09:44:52 2011 +0200

    wrap-and-sort -s

diff --git a/debian/control b/debian/control
index 7b07db5..8597608 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,20 @@ Source: fluidsynth
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>,
+Uploaders:
+ Alessio Treglia <alessio at debian.org>,
  David Henningsson <diwic at ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends:
  cmake,
- libreadline-dev (>= 5),
- libjack-dev | libjack-jackd2-dev,
+ debhelper (>= 7.0.50~),
  ladspa-sdk,
- libtool,
  libasound2-dev,
- libpulse-dev,
  libglib2.0-dev (>= 2.6.5),
- libsndfile-dev
+ libjack-dev | libjack-jackd2-dev,
+ libpulse-dev,
+ libreadline-dev (>= 5),
+ libsndfile-dev,
+ libtool
 Standards-Version: 3.9.2
 Homepage: http://www.fluidsynth.org/
 Vcs-Git: git://git.debian.org/pkg-multimedia/fluidsynth.git
@@ -21,9 +23,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/fluidsynth.git
 
 Package: fluidsynth
 Architecture: any
-Depends: libfluidsynth1 (>= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ libfluidsynth1 (>= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Conflicts: iiwusynth
 Replaces: iiwusynth
 Provides: iiwusynth
@@ -37,8 +40,7 @@ Description: Real-time MIDI software synthesizer
 Package: libfluidsynth1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Real-time MIDI software synthesizer (runtime library)
  Fluidsynth is a real-time midi synthesizer based on the soundfont2
  specifications. It can be used to render MIDI input or MIDI files to audio.
@@ -50,14 +52,15 @@ Description: Real-time MIDI software synthesizer (runtime library)
 Package: libfluidsynth-dev
 Architecture: all
 Section: libdevel
-Depends: libfluidsynth1 (>= ${source:Version}),
+Depends:
+ libasound2-dev,
  libfluidsynth1 (<< ${source:Upstream-Version}+1~),
- libreadline-dev (>= 5), 
- libncurses5-dev | libncurses-dev,
- libasound2-dev, 
+ libfluidsynth1 (>= ${source:Version}),
+ libglib2.0-dev (>= 2.6.5),
  libjack-dev | libjack-jackd2-dev,
+ libncurses5-dev | libncurses-dev,
  libpulse-dev,
- libglib2.0-dev (>= 2.6.5),
+ libreadline-dev (>= 5),
  libsndfile-dev,
  ${misc:Depends}
 Description: Real-time MIDI software synthesizer (development files)
diff --git a/debian/copyright b/debian/copyright
index a30f0e4..c073e1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This package was debianized by Eric Van Buggenhaut <ericvb at debian.org> on
-Mon, 14 Apr 2003 02:10:02 +0200. 
+Mon, 14 Apr 2003 02:10:02 +0200.
 Current maintainer is David Henningsson <diwic at ubuntu.com>.
 
 It was downloaded from http://fluidsynth.resonance.org
diff --git a/debian/libfluidsynth-dev.install b/debian/libfluidsynth-dev.install
index a55a24c..1cfae64 100644
--- a/debian/libfluidsynth-dev.install
+++ b/debian/libfluidsynth-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libfluidsynth.so
 usr/include/*
+usr/lib/libfluidsynth.so
 usr/lib/pkgconfig/fluidsynth.pc

-- 
fluidsynth packaging