[SCM] swami/master: wrap-and-sort -a -s

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8c1f0e71da5ee6258811651b95d2fa9c88fe95e6
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 12 21:18:49 2012 +0100

    wrap-and-sort -a -s
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 1b660b9..9e8309a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,28 @@ Source: swami
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends: debhelper (>= 7.0.50~),
+Uploaders:
+ Jaromír Mikeš <mira.mikes at seznam.cz>
+Build-Depends:
  cmake,
- libsndfile1-dev,
+ debhelper (>= 7.0.50~),
+ docbook-xml,
+ gettext,
+ gtk-doc-tools,
+ libasound2-dev,
  libaudiofile-dev,
- libgtk2.0-dev (>= 2.8.17),
- pkg-config,
+ libfftw3-dev,
  libfluidsynth-dev,
- libpopt-dev,
- libpng-dev,
- libjack-dev,
- libasound2-dev,
- gettext,
- libinstpatch-dev,
+ libglade2-dev,
  libgnomecanvas2-dev (>= 2.0),
+ libgtk2.0-dev (>= 2.8.17),
+ libinstpatch-dev,
+ libjack-dev,
+ libpng-dev,
+ libpopt-dev,
  librsvg2-dev (>= 2.8),
- libglade2-dev,
- libfftw3-dev,
- gtk-doc-tools,
- docbook-xml,
+ libsndfile1-dev,
+ pkg-config,
  python-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/swami.git
@@ -30,9 +32,10 @@ Homepage: http://swami.sf.net
 
 Package: swami
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends:
  libswami0 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: MIDI instrument editor application
  Swami (Sampled Waveforms And Musical Instruments) is an application
  for editing and managing MIDI instruments, such as SoundFont files.
@@ -42,8 +45,9 @@ Description: MIDI instrument editor application
 Package: libswami0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: MIDI instrument editor - shared libraries
  Swami (Sampled Waveforms And Musical Instruments) is an application
  for editing and managing MIDI instruments, such as SoundFont files.
@@ -55,12 +59,13 @@ Description: MIDI instrument editor - shared libraries
 Package: libswami-dev
 Section: libdevel
 Architecture: all
-Depends: libswami0 (>= ${source:Version}),
- libswami0 (<< ${source:Upstream-Version}+1~),
- ${misc:Depends},
- libinstpatch-dev,
+Depends:
+ libgnomecanvas2-dev (>= 2.0),
  libgtk2.0-dev (>= 2.8.17),
- libgnomecanvas2-dev (>= 2.0)
+ libinstpatch-dev,
+ libswami0 (<< ${source:Upstream-Version}+1~),
+ libswami0 (>= ${source:Version}),
+ ${misc:Depends}
 Description: MIDI instrument editor - development files
  Swami (Sampled Waveforms And Musical Instruments) is an application
  for editing and managing MIDI instruments, such as SoundFont files.
@@ -73,7 +78,8 @@ Package: swami-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libswami0 (= ${binary:Version}),
+Depends:
+ libswami0 (= ${binary:Version}),
  swami (= ${binary:Version}),
  ${misc:Depends}
 Description: MIDI instrument editor - debugging symbols
diff --git a/debian/swami.install b/debian/swami.install
index d9c3f6b..e695f22 100644
--- a/debian/swami.install
+++ b/debian/swami.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/share/icons/*
+debian/tmp/usr/bin/swami
 debian/tmp/usr/share/applications/*
-debian/tmp/usr/share/swami/*
+debian/tmp/usr/share/icons/*
 debian/tmp/usr/share/mime/*
-debian/tmp/usr/bin/swami
+debian/tmp/usr/share/swami/*

-- 
swami packaging