[Pkg-remote-commits] [guacamole-client] 01/01: wrap-and-sort

Dominik George natureshadow-guest at moszumanska.debian.org
Tue Nov 29 12:09:48 UTC 2016 

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 6aebfe0104dc9c5c8eb7cd1cfc141778bb9740e0
Author: Dominik George <nik at naturalnet.de>
Date:   Tue Nov 29 12:55:33 2016 +0100

    wrap-and-sort
---
 debian/changelog         |  4 ++--
 debian/control           | 20 ++++++++++----------
 debian/guacamole.install |  2 +-
 debian/guacamole.links   | 31 +++++++++++++------------------
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91cb0bc..8a3c08d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-guacamole-client (0.9.9+dfsg-1) UNRELEASED; urgency=medium
+guacamole-client (0.9.9+dfsg-1) unstable; urgency=medium
 
   [ Dominik George ]
   * Acknowledge NMUs.
@@ -21,7 +21,7 @@ guacamole-client (0.9.9+dfsg-1) UNRELEASED; urgency=medium
   * Disable websocket implementations we neither use nor can
     actually build in Debian stretch/sid.
 
- -- Dominik George <nik at naturalnet.de>  Sat, 26 Nov 2016 11:58:40 +0100
+ -- Dominik George <nik at naturalnet.de>  Tue, 29 Nov 2016 12:51:09 +0100
 
 guacamole-client (0.8.3-1.2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 9d8c895..f57ad3d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,22 @@ Priority: optional
 Maintainer: Debian Remote Maintainers <pkg-remote-team at lists.alioth.debian.org>
 Uploaders:
  Dominik George <nik at naturalnet.de>,
- Thorsten Glaser <tg at mirbsd.org>
+ Thorsten Glaser <tg at mirbsd.org>,
 Build-Depends:
  debhelper (>= 10),
  default-jdk,
  junit4,
  libangular-maven-plugin-java,
+ libatinject-jsr330-api-java,
  libcommons-codec-java,
  libguava-java,
  libguice-java,
  libjackson-json-java,
- libjsr311-api-java,
  libjersey1-core-java,
  libjersey1-guice-java,
  libjersey1-json-java,
  libjersey1-server-java,
- libatinject-jsr330-api-java,
+ libjsr311-api-java,
  liblogback-java,
  libmaven-assembly-plugin-java,
  libmaven-dependency-plugin-java,
@@ -42,23 +42,23 @@ Architecture: all
 Depends:
  debconf,
  guacd,
- libjs-angularjs,
- libjs-jquery,
- libjs-lodash,
- tomcat8,
+ libatinject-jsr330-api-java,
  libcommons-codec-java,
  libguava-java,
  libguice-java,
  libjackson-json-java,
- libjsr311-api-java,
  libjersey1-core-java,
  libjersey1-guice-java,
  libjersey1-json-java,
  libjersey1-server-java,
+ libjs-angularjs,
+ libjs-jquery,
+ libjs-lodash,
+ libjsr311-api-java,
  liblogback-java,
  libservlet3.1-java,
  libslf4j-java,
- libatinject-jsr330-api-java,
+ tomcat8,
  ${maven:Depends},
  ${misc:Depends},
 Recommends:
@@ -66,7 +66,7 @@ Recommends:
 Suggests:
  xrdp,
 Conflicts:
- guacamole-tomcat
+ guacamole-tomcat,
 Provides:
  guacamole-tomcat,
 Enhances:
diff --git a/debian/guacamole.install b/debian/guacamole.install
index bc1f096..46c7181 100644
--- a/debian/guacamole.install
+++ b/debian/guacamole.install
@@ -1,3 +1,3 @@
 debian/etc/* /etc/guacamole/
-guacamole/target/guacamole /usr/share/guacamole/
 extensions/guacamole-auth-noauth/target/guacamole-auth-noauth-0.9.9.jar /usr/share/java/
+guacamole/target/guacamole /usr/share/guacamole/
diff --git a/debian/guacamole.links b/debian/guacamole.links
index 9c418e7..0cbf35b 100644
--- a/debian/guacamole.links
+++ b/debian/guacamole.links
@@ -1,26 +1,23 @@
-# Stripped JavaScript libraries
-/usr/share/javascript/angular.js /usr/share/guacamole/guacamole/lib/angular
-/usr/share/javascript/jquery /usr/share/guacamole/guacamole/lib/jquery
-/usr/share/javascript/lodash.min.js /usr/share/guacamole/guacamole/lib/lodash.min.js
-
-# Java libraries
-/usr/share/java/guacamole-common-0.9.9.jar /usr/share/java/guacamole-common.jar
-/usr/share/java/guacamole-ext-0.9.9.jar /usr/share/java/guacamole-ext.jar
+/etc/guacamole/apache.conf /etc/apache2/conf-available/guacamole.conf
+/etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/guacamole.properties
+/etc/guacamole/tomcat.xml /etc/tomcat8/Catalina/localhost/guacamole.xml
+/usr/share/java/aopalliance.jar /usr/share/guacamole/guacamole/WEB-INF/lib/aopalliance.jar
+/usr/share/java/atinject-jsr330-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/atinject-jsr330-api.jar
+/usr/share/java/commons-codec.jar /usr/share/guacamole/guacamole/WEB-INF/lib/commons-codec.jar
 /usr/share/java/guacamole-auth-noauth-0.9.9.jar /usr/share/java/guacamole-auth-noauth.jar
 /usr/share/java/guacamole-auth-noauth.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guacamole-auth-noauth.jar
+/usr/share/java/guacamole-common-0.9.9.jar /usr/share/java/guacamole-common.jar
 /usr/share/java/guacamole-common.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guacamole-common.jar
+/usr/share/java/guacamole-ext-0.9.9.jar /usr/share/java/guacamole-ext.jar
 /usr/share/java/guacamole-ext.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guacamole-ext.jar
-/usr/share/java/aopalliance.jar /usr/share/guacamole/guacamole/WEB-INF/lib/aopalliance.jar
-/usr/share/java/commons-codec.jar /usr/share/guacamole/guacamole/WEB-INF/lib/commons-codec.jar
 /usr/share/java/guava.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guava.jar
-/usr/share/java/guice.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guice.jar
 /usr/share/java/guice-servlet.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guice-servlet.jar
+/usr/share/java/guice.jar /usr/share/guacamole/guacamole/WEB-INF/lib/guice.jar
 /usr/share/java/istack-commons-runtime.jar /usr/share/guacamole/guacamole/WEB-INF/lib/istack-commons-runtime.jar
 /usr/share/java/jackson-core-asl.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-core-asl.jar
 /usr/share/java/jackson-jaxrs.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-jaxrs.jar
 /usr/share/java/jackson-mapper-asl.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-mapper-asl.jar
 /usr/share/java/jackson-xc.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jackson-xc.jar
-/usr/share/java/jsr311-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jsr311-api.jar
 /usr/share/java/jaxb-impl.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jaxb-impl.jar
 /usr/share/java/jersey1-core.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-core.jar
 /usr/share/java/jersey1-guice.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-guice.jar
@@ -28,14 +25,12 @@
 /usr/share/java/jersey1-server.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-server.jar
 /usr/share/java/jersey1-servlet.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jersey-servlet.jar
 /usr/share/java/jettison.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jettison.jar
+/usr/share/java/jsr311-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/jsr311-api.jar
 /usr/share/java/logback-classic.jar /usr/share/guacamole/guacamole/WEB-INF/lib/logback-classic.jar
 /usr/share/java/logback-core.jar /usr/share/guacamole/guacamole/WEB-INF/lib/logback-core.jar
 /usr/share/java/slf4j-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/slf4j-api.jar
 /usr/share/java/stax-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/stax-api.jar
 /usr/share/java/txw2.jar /usr/share/guacamole/guacamole/WEB-INF/lib/txw2.jar
-/usr/share/java/atinject-jsr330-api.jar /usr/share/guacamole/guacamole/WEB-INF/lib/atinject-jsr330-api.jar
-
-# Config
-/etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/guacamole.properties
-/etc/guacamole/tomcat.xml /etc/tomcat8/Catalina/localhost/guacamole.xml
-/etc/guacamole/apache.conf /etc/apache2/conf-available/guacamole.conf
+/usr/share/javascript/angular.js /usr/share/guacamole/guacamole/lib/angular
+/usr/share/javascript/jquery /usr/share/guacamole/guacamole/lib/jquery
+/usr/share/javascript/lodash.min.js /usr/share/guacamole/guacamole/lib/lodash.min.js

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

More information about the Pkg-remote-commits mailing list