[debian-edu-commits] debian-edu/ 09/26: Wrap and sort

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit 1e1378a9c9129dc1bcaff83027849fe012533bc9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 6 00:09:21 2016 +0100

    Wrap and sort
---
 debian/control           | 13 ++++++++++---
 debian/copyright         |  1 -
 debian/guacamole.dirs    |  2 +-
 debian/guacamole.install |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 992b78c..05964c7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,15 @@
 Source: guacamole-client
 Priority: extra
 Maintainer: Michael Jumper <mike.jumper at guac-dev.org>
-Build-Depends: po-debconf, debhelper (>= 9), default-jdk | java6-sdk, maven-debian-helper, libmaven-war-plugin-java, libmaven-assembly-plugin-java, libmaven-plugin-testing-java, libslf4j-java, libservlet2.5-java
+Build-Depends: debhelper (>= 9),
+               default-jdk | java6-sdk,
+               libmaven-assembly-plugin-java,
+               libmaven-plugin-testing-java,
+               libmaven-war-plugin-java,
+               libservlet2.5-java,
+               libslf4j-java,
+               maven-debian-helper,
+               po-debconf
 Standards-Version: 3.9.6
 Section: net
 Vcs-Git: git://anonscm.debian.org/pkg-java/guacamole-client.git
@@ -24,7 +32,7 @@ Description: HTML5 web application for accessing remote desktops
 Package: guacamole-tomcat
 Section: net
 Architecture: all
-Depends: debconf, guacamole, tomcat8, libguac-client-vnc0, ${misc:Depends}
+Depends: debconf, guacamole, libguac-client-vnc0, tomcat8, ${misc:Depends}
 Description: Tomcat-based Guacamole install with VNC support
  Guacamole is an HTML5 web application that provides access to a desktop
  environment using remote desktop protocols. A centralized server acts as a
@@ -35,4 +43,3 @@ Description: Tomcat-based Guacamole install with VNC support
  This metapackage depends on Tomcat, Guacamole, and the VNC support plugin for
  guacamole. Guacamole is automatically installed and configured under
  Tomcat.
-
diff --git a/debian/copyright b/debian/copyright
index 726e80b..b90f5a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,4 +23,3 @@ License: AGPL-3+
  .
  The complete text of the GNU Affero General Public License can be found in
  the `AGPL' file in the same directory as this file.
-
diff --git a/debian/guacamole.dirs b/debian/guacamole.dirs
index 6ef00c8..fd797ea 100644
--- a/debian/guacamole.dirs
+++ b/debian/guacamole.dirs
@@ -1,2 +1,2 @@
-/var/lib/guacamole
 /etc/guacamole
+/var/lib/guacamole
diff --git a/debian/guacamole.install b/debian/guacamole.install
index 7b7045e..5447b70 100644
--- a/debian/guacamole.install
+++ b/debian/guacamole.install
@@ -1,2 +1,2 @@
-guacamole/target/*.war /var/lib/guacamole
 debian/etc/* /etc/guacamole
+guacamole/target/*.war /var/lib/guacamole

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