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

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 21cb2c1001ef8a4459ea22823277de466e9f5e7d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 5 17:15:03 2012 +0100

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

diff --git a/debian/control b/debian/control
index 63309c3..22f040f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,21 @@ Source: libdrumstick
 Section: libs
 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>,
  Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Arnout Engelen <arnouten at bzzt.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~),
- libasound2-dev,
+Build-Depends:
+ autotools-dev,
  cmake,
+ debhelper (>= 7.0.50~),
+ docbook-xsl,
+ libasound2-dev,
  libqt4-dev,
  libx11-dev,
  pkg-config,
- xsltproc,
- docbook-xsl,
- autotools-dev
+ xsltproc
 Standards-Version: 3.9.1
 Homepage: http://drumstick.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-multimedia/libdrumstick.git
@@ -23,38 +25,41 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libdrumstick.git
 Package: libdrumstick-dev
 Section: libdevel
 Architecture: all
-Depends: ${misc:Depends},
+Depends:
+ libdrumstick0 (<< ${source:Upstream-Version}+1~),
  libdrumstick0 (>= ${source:Version}),
- libdrumstick0 (<< ${source:Upstream-Version}+1~)
+ ${misc:Depends}
 Description: Qt4/C++ wrapper for ALSA Sequencer - development files
- This library is a C++ wrapper around the ALSA library sequencer interface, 
- using Qt4 objects, idioms and style. ALSA sequencer provides software support 
- for MIDI technology on Linux. Complementary classes for SMF and WRK file 
+ This library is a C++ wrapper around the ALSA library sequencer interface,
+ using Qt4 objects, idioms and style. ALSA sequencer provides software support
+ for MIDI technology on Linux. Complementary classes for SMF and WRK file
  processing are also included.
  .
  This package provides the development files.
 
 Package: libdrumstick0
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Qt4/C++ wrapper for ALSA Sequencer
- This library is a C++ wrapper around the ALSA library sequencer interface, 
- using Qt4 objects, idioms and style. ALSA sequencer provides software support 
- for MIDI technology on Linux. Complementary classes for SMF and WRK file 
+ This library is a C++ wrapper around the ALSA library sequencer interface,
+ using Qt4 objects, idioms and style. ALSA sequencer provides software support
+ for MIDI technology on Linux. Complementary classes for SMF and WRK file
  processing are also included.
 
 Package: libdrumstick-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends},
+Depends:
+ drumstick-tools (= ${binary:Version}),
  libdrumstick0 (= ${binary:Version}),
- drumstick-tools (= ${binary:Version})
+ ${misc:Depends}
 Description: Qt4/C++ wrapper for ALSA Sequencer - debugging symbols
- This library is a C++ wrapper around the ALSA library sequencer interface, 
- using Qt4 objects, idioms and style. ALSA sequencer provides software support 
- for MIDI technology on Linux. Complementary classes for SMF and WRK file 
+ This library is a C++ wrapper around the ALSA library sequencer interface,
+ using Qt4 objects, idioms and style. ALSA sequencer provides software support
+ for MIDI technology on Linux. Complementary classes for SMF and WRK file
  processing are also included.
  .
  This package provides the debugging symbols.
@@ -62,12 +67,13 @@ Description: Qt4/C++ wrapper for ALSA Sequencer - debugging symbols
 Package: drumstick-tools
 Section: sound
 Architecture: any
-Depends: ${misc:Depends},
+Depends:
+ ${misc:Depends},
  ${shlibs:Depends}
 Description: Qt4/C++ wrapper for ALSA Sequencer - utilities
- This library is a C++ wrapper around the ALSA library sequencer interface, 
- using Qt4 objects, idioms and style. ALSA sequencer provides software support 
- for MIDI technology on Linux. Complementary classes for SMF and WRK file 
+ This library is a C++ wrapper around the ALSA library sequencer interface,
+ using Qt4 objects, idioms and style. ALSA sequencer provides software support
+ for MIDI technology on Linux. Complementary classes for SMF and WRK file
  processing are also included.
  .
  This package provides utilities shipped with the library:
diff --git a/debian/drumstick-tools.install b/debian/drumstick-tools.install
index 9730a2a..580b8da 100644
--- a/debian/drumstick-tools.install
+++ b/debian/drumstick-tools.install
@@ -1,4 +1,4 @@
+drumstick.xml usr/share/mime/packages
 usr/bin/*
 usr/share/applications
 usr/share/icons
-drumstick.xml usr/share/mime/packages

-- 
libdrumstick packaging