[SCM] Akonadi packaging branch, master, updated. debian/1.12.1-1-8-g3c40286

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=b7f8fb9

The following commit has been merged in the master branch:
commit b7f8fb99fdf67844afbb3188e5b88e3c28a745d8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 19 18:31:34 2014 +0200

    wrap-and-sort
---
 debian/control   | 47 ++++++++++++++++++++++++++++-------------------
 debian/copyright |  4 ++--
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index 2aea634..3b0ec00 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,20 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Modestas Vainius <modax at debian.org>,
            Fathi Boudra <fabo at debian.org>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: debhelper (>= 9), cmake (>= 2.8.8), automoc,
- pkg-kde-tools (>= 0.12),
- libqt4-dev (>= 4:4.8.0), shared-mime-info (>= 0.20), libmysqlclient-dev,
- libxslt-dev, libsoprano-dev (>= 2.7.56), xsltproc, libdbus-1-dev,
- libboost-program-options-dev,
- libsqlite3-dev (>= 3.6.23), mysql-server-core
+Build-Depends: automoc,
+               cmake (>= 2.8.8),
+               debhelper (>= 9),
+               libboost-program-options-dev,
+               libdbus-1-dev,
+               libmysqlclient-dev,
+               libqt4-dev (>= 4:4.8.0),
+               libsoprano-dev (>= 2.7.56),
+               libsqlite3-dev (>= 3.6.23),
+               libxslt-dev,
+               mysql-server-core,
+               pkg-kde-tools (>= 0.12),
+               shared-mime-info (>= 0.20),
+               xsltproc
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest
 Homepage: http://pim.kde.org/akonadi
@@ -21,13 +29,12 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/akonadi.git
 Package: akonadi-server
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- akonadi-backend-mysql (= ${source:Version}) |
- akonadi-backend-sqlite (= ${binary:Version}) |
- akonadi-backend-postgresql (= ${source:Version})
+Depends: akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}) | akonadi-backend-postgresql (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: akonadi-backend-mysql (= ${source:Version}),
- akonadi-backend-sqlite (= ${binary:Version}),
- akonadi-backend-postgresql (= ${source:Version})
+          akonadi-backend-postgresql (= ${source:Version}),
+          akonadi-backend-sqlite (= ${binary:Version})
 Description: Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -37,7 +44,7 @@ Description: Akonadi PIM storage service
 
 Package: libakonadiprotocolinternals1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: akonadi-server (= ${binary:Version})
 Replaces: libakonadiprivate1 (<< 1.4.90)
 Breaks: libakonadiprivate1 (<< 1.4.90)
@@ -51,8 +58,9 @@ Description: libraries for the Akonadi PIM storage service
 Package: libakonadi-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libakonadiprotocolinternals1 (= ${binary:Version}),
- libboost-dev
+Depends: libakonadiprotocolinternals1 (= ${binary:Version}),
+         libboost-dev,
+         ${misc:Depends}
 Suggests: pkg-config
 Description: development files for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
@@ -65,8 +73,9 @@ Description: development files for the Akonadi PIM storage service
 Package: akonadi-backend-mysql
 Section: misc
 Architecture: all
-Depends: ${misc:Depends}, mysql-server-core-5.5 | mysql-server-core,
- libqt4-sql-mysql
+Depends: libqt4-sql-mysql,
+         mysql-server-core-5.5 | mysql-server-core,
+         ${misc:Depends}
 Recommends: akonadi-server
 Replaces: akonadi-server (<< 1.3.60~)
 Breaks: akonadi-server (<< 1.3.60~)
@@ -83,7 +92,7 @@ Description: MySQL storage backend for Akonadi
 Package: akonadi-backend-postgresql
 Section: misc
 Architecture: all
-Depends: ${misc:Depends}, libqt4-sql-psql
+Depends: libqt4-sql-psql, ${misc:Depends}
 Recommends: akonadi-server, postgresql
 Replaces: akonadi-server (<< 1.3.60~)
 Breaks: akonadi-server (<< 1.3.60~)
@@ -101,7 +110,7 @@ Package: akonadi-backend-sqlite
 Section: misc
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: akonadi-server
 Description: SQLite storage backend for Akonadi
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
diff --git a/debian/copyright b/debian/copyright
index 4cd7018..9661ad1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,7 +70,7 @@ are met:
 2. Redistributions in binary form must reproduce the copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products 
+3. The name of the author may not be used to endorse or promote products
    derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -86,7 +86,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 The rest is according to the file lgpl-license:
-  
+
 License:
 
     This library is free software; you can redistribute it and/or

-- 
Akonadi packaging