[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.3+dfsg-1-10-gf51915d

[David Prévot]

The following commit has been merged in the master branch:
commit b5116ef5c426e7bf9eacd4f0f6f40753c66074d1
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 10 09:30:16 2013 -0400

    Wrap and sort

diff --git a/debian/control b/debian/control
index d08c8ec..93e03e3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: owncloud
 Section: web
 Priority: extra
 Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>, Paul van Tilburg <paulvt at debian.org>
+Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>,
+           Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.0.0), yui-compressor
 Standards-Version: 3.9.3
@@ -12,21 +13,32 @@ Vcs-Browser: http://git.debian.org/?p=pkg-owncloud/owncloud.git;a=summary
 
 Package: owncloud
 Architecture: all
-Depends: ${misc:Depends},
- apache2 | httpd,
- php5, php5-gd, php-pear, php-xml-parser, php-crypt-blowfish, php-sabre-dav,
- php-sabre-vobject,
- php-mdb2, php-mdb2-schema, libphp-phpmailer, php-getid3 (>= 1.9.3-1),
- php5-curl,
- owncloud-mysql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
- libjs-jquery (>= 1.7.2-1), libjs-jquery-ui, libjs-jquery-jplayer,
- libjs-underscore,
- mediawiki (>= 1:1.19)
-Recommends: exim4 | mail-transport-agent,
- php-services-json, liboauth-php,
- php5-ldap,
- clamav | clamav-daemon,
- zendframework
+Depends: apache2 | httpd,
+         libjs-jquery (>= 1.7.2-1),
+         libjs-jquery-jplayer,
+         libjs-jquery-ui,
+         libjs-underscore,
+         libphp-phpmailer,
+         mediawiki (>= 1:1.19),
+         owncloud-mysql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}),
+         php-crypt-blowfish,
+         php-getid3 (>= 1.9.3-1),
+         php-mdb2,
+         php-mdb2-schema,
+         php-pear,
+         php-sabre-dav,
+         php-sabre-vobject,
+         php-xml-parser,
+         php5,
+         php5-curl,
+         php5-gd,
+         ${misc:Depends}
+Recommends: clamav | clamav-daemon,
+            exim4 | mail-transport-agent,
+            liboauth-php,
+            php-services-json,
+            php5-ldap,
+            zendframework
 Description: cloud storage for files, music, contacts, calendars and many more
  ownCloud gives you universal access to your files through a web interface
  or WebDAV.  It also provides a platform to easily view & sync your
@@ -35,8 +47,9 @@ Description: cloud storage for files, music, contacts, calendars and many more
 
 Package: owncloud-mysql
 Architecture: all
-Depends: php-mdb2-driver-mysql,
- mysql-client | virtual-mysql-client, ${misc:Depends}
+Depends: mysql-client | virtual-mysql-client,
+         php-mdb2-driver-mysql,
+         ${misc:Depends}
 Suggests: mysql-server
 Description: meta-package providing MySQL dependencies for ownCloud
  This package provides MySQL dependencies for ownCloud, a cloud storage
diff --git a/debian/copyright b/debian/copyright
index 423b1b5..3c75e19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -417,7 +417,7 @@ Comment: Expat license referred to as MIT license.
 
 Files: apps/files/js/jquery-visibility.js
 Copyright: 2012, Mathias Bynens
-License: Expat or GPL-2 
+License: Expat or GPL-2
 
 Files: apps/files_external/3rdparty/phpseclib/*
 Copyright: 2006-2012, Jim Wigginton <terrafrost at php.net>
@@ -510,7 +510,7 @@ License: MPL-2.0
      means any form of the work other than Source Code Form.
  .
  1.7. "Larger Work"
-     means a work that combines Covered Software with other material, in 
+     means a work that combines Covered Software with other material, in
      a separate file or files, that is not Covered Software.
  .
  1.8. "License"
@@ -751,7 +751,7 @@ License: MPL-2.0
   *  authorized under this License except under this disclaimer.         *
   *                                                                      *
   ************************************************************************
- . 
+ .
   ************************************************************************
   *                                                                      *
   *  7. Limitation of Liability                                          *
@@ -925,7 +925,7 @@ License: BSD-3-clause-Zend
  .
  * Neither the name of Zend Technologies USA, Inc. nor the names of its
    contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission. 
+   software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

-- 
owncloud.git