[Pkg-owncloud-commits] [owncloud-client] 01/01: Wrap and sort

David Prévot taffit at moszumanska.debian.org
Tue Dec 31 17:01:17 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud-client.

commit 47a21180afcce863e3f98bce2b036f85265f31c5
Author: David Prévot <taffit at debian.org>
Date:   Tue Dec 31 13:00:43 2013 -0400

    Wrap and sort
    
    Git-Dch: Ignore
---
 debian/control                 | 34 ++++++++++++++++++++++++++--------
 debian/copyright               |  6 ++----
 debian/owncloud-client.install |  4 ++--
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 31c9199..2a68137 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,22 @@ Section: net
 Priority: optional
 Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
 Uploaders: Sandro Knauß <bugs at sandroknauss.de>
-Build-Depends: debhelper (>= 9), cmake, libqt4-dev, pkg-kde-tools, python-sphinx | python3-sphinx,
- qt4-dev-tools, libqtwebkit-dev,  kdelibs5-dev, libocsync-dev (>= 0.91.4), qtkeychain-dev, libneon27-gnutls-dev,
- libinotify-dev [kfreebsd-any]
-Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, xsltproc
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kdelibs5-dev,
+               libinotify-dev [kfreebsd-any],
+               libneon27-gnutls-dev,
+               libocsync-dev (>= 0.91.4),
+               libqt4-dev,
+               libqtwebkit-dev,
+               pkg-kde-tools,
+               python-sphinx | python3-sphinx,
+               qt4-dev-tools,
+               qtkeychain-dev
+Build-Depends-Indep: texlive-fonts-recommended,
+                     texlive-latex-extra,
+                     texlive-latex-recommended,
+                     xsltproc
 XS-Testsuite: autopkgtest
 Vcs-Git: git://anonscm.debian.org/pkg-owncloud/owncloud-client.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud-client.git
@@ -15,8 +27,11 @@ Homepage: http://owncloud.org/sync-clients/
 
 Package: owncloud-client
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libowncloudsync0 (= ${binary:Version}), owncloud-client-l10n, libqt4-sql-sqlite
+Depends: libowncloudsync0 (= ${binary:Version}),
+         libqt4-sql-sqlite,
+         owncloud-client-l10n,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: folder synchronization with an ownCloud server - GUI
  The ownCloudSync system lets you always have your latest files wherever
  you are. Just specify one or more folders on the local machine to and a server
@@ -87,8 +102,11 @@ Description: transitional dummy package for owncloud-client-l10n
 
 Package: owncloud-client-cmd
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libowncloudsync0 (= ${binary:Version}), owncloud-client-l10n, libqt4-sql-sqlite
+Depends: libowncloudsync0 (= ${binary:Version}),
+         libqt4-sql-sqlite,
+         owncloud-client-l10n,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: folder synchronization with an ownCloud server - cmd client
  The ownCloudSync system lets you always have your latest files wherever
  you are. Just specify one or more folders on the local machine to and a server
diff --git a/debian/copyright b/debian/copyright
index 3d333fa..ef3d33f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -175,7 +175,7 @@ License: Diaga-LGPL-Exception
  2.1, the object code form of a "work that uses the Library" may incorporate
  material from a header file that is part of the Library.  You may distribute
  such object code under terms of your choice, provided that:
-    (i)   the header files of the Library have not been modified; and 
+    (i)   the header files of the Library have not been modified; and
     (ii)  the incorporated material is limited to numerical parameters, data
           structure layouts, accessors, macros, inline functions and
           templates; and
@@ -264,7 +264,7 @@ License: BSD-3-clause
  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
@@ -356,5 +356,3 @@ License: BSL-1.0
  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
-
-
diff --git a/debian/owncloud-client.install b/debian/owncloud-client.install
index a2dd270..71c58f4 100644
--- a/debian/owncloud-client.install
+++ b/debian/owncloud-client.install
@@ -1,4 +1,4 @@
-usr/bin/owncloud
 etc/ownCloud
-usr/share/icons/*/*/apps/owncloud.png
+usr/bin/owncloud
 usr/share/applications/owncloud.desktop
+usr/share/icons/*/*/apps/owncloud.png

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list