[SCM] cantata/master: wrap-and-sort

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ad58f8eb4f468be5e02677870bced1962e086812
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Jan 23 10:29:57 2017 +1100

    wrap-and-sort

diff --git a/debian/control b/debian/control
index 44d5a63..27cf18d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,32 +2,34 @@ Source: cantata
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Stuart Prescott <stuart at debian.org>
-Build-Depends: cmake,
-               debhelper (>= 9),
-               libavcodec-dev,
-               libavformat-dev,
-               libavutil-dev,
-               libcddb-dev,
-               libcdparanoia-dev,
-               libebur128-dev,
-               libmusicbrainz5-dev (>= 5.1.0+git20150707),
-               libmpg123-dev,
-               libmtp-dev (>= 1.0.0),
-               libphonon4qt5-dev,
-               libqt5svg5-dev,
-               libspeex-dev,
-               libspeexdsp-dev,
-               libtag-extras-dev,
-               libtag1-dev,
-               libudev-dev,
-               libvlc-dev,
-               libvlccore-dev,
-               libx11-dev,
-               pkg-config,
-               pkg-kde-tools,
-               qtbase5-dev,
-               qttools5-dev-tools
+Uploaders:
+ Stuart Prescott <stuart at debian.org>
+Build-Depends:
+ cmake,
+ debhelper (>= 9),
+ libavcodec-dev,
+ libavformat-dev,
+ libavutil-dev,
+ libcddb-dev,
+ libcdparanoia-dev,
+ libebur128-dev,
+ libmpg123-dev,
+ libmtp-dev (>= 1.0.0),
+ libmusicbrainz5-dev (>= 5.1.0+git20150707),
+ libphonon4qt5-dev,
+ libqt5svg5-dev,
+ libspeex-dev,
+ libspeexdsp-dev,
+ libtag-extras-dev,
+ libtag1-dev,
+ libudev-dev,
+ libvlc-dev,
+ libvlccore-dev,
+ libx11-dev,
+ pkg-config,
+ pkg-kde-tools,
+ qtbase5-dev,
+ qttools5-dev-tools
 Standards-Version: 3.9.8
 Homepage: https://github.com/CDrummond/cantata
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-multimedia/cantata.git
@@ -35,10 +37,16 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/cantata.git
 
 Package: cantata
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: liburi-perl
-Provides: mpd-client
-Suggests: mpd, media-player-info
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ liburi-perl
+Provides:
+ mpd-client
+Suggests:
+ media-player-info,
+ mpd
 Description: Qt client for the music player daemon (MPD)
  Cantata is a graphical front-end for the music player daemon, MPD. It provides
  many tools to view and manage the music collection including:
diff --git a/debian/copyright b/debian/copyright
index dc24da5..db1b983 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -303,7 +303,7 @@ License: CC-BY-SA-4.0
       such as asking that all changes be marked or described.
       Although not required by our licenses, you are encouraged to
       respect those requests where reasonable. More_considerations
-      for the public: 
+      for the public:
    wiki.creativecommons.org/Considerations_for_licensees
  .
  =======================================================================
diff --git a/debian/examples b/debian/examples
index baf3a69..01c60ff 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1,4 +1,4 @@
+dynamic/init/README
+dynamic/init/cantata-dynamic.conf
 dynamic/init/cantata-dynamic.systemd
 dynamic/init/cantata-dynamic.ubuntu
-dynamic/init/cantata-dynamic.conf
-dynamic/init/README

-- 
cantata packaging