[debian-edu-commits] debian-edu/ 03/03: this actually builds; remove commented-out B-Ds, sync changelog

[Thorsten Glaser]

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

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

commit efcd66e6f2e98b9cef8fbb2a3abec5a6251aacec
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Tue Nov 8 22:07:57 2016 +0100

    this actually builds; remove commented-out B-Ds, sync changelog
---
 debian/changelog | 6 +++++-
 debian/control   | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9e86f1..7e43845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,11 @@ guacamole-client (0.9.9-1) UNRELEASED; urgency=medium
     with the versions of its dependencies Debian provides.
   * Unbreak Maven build of backend and extensions.
 
- -- Thorsten Glaser <thorsten.glaser at teckids.org>  Sat, 29 Oct 2016 00:38:08 +0200
+  [ Emmanuel Bourg ]
+  * Disable websocket implementations we neither use nor can
+    actually build in Debian stretch/sid.
+
+ -- Thorsten Glaser <thorsten.glaser at teckids.org>  Tue, 08 Nov 2016 22:07:15 +0100
 
 guacamole-client (0.8.3-1.2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e601428..a5edb20 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,6 @@ Build-Depends:
  libjersey1-guice-java,
  libjersey1-json-java,
  libjersey1-server-java,
-# libjetty8-extra-java,
-# libjetty8-java,
-# libjetty9-extra-java,
-# libjetty9-java,
  liblogback-java,
  libmaven-assembly-plugin-java,
  libmaven-dependency-plugin-java,
@@ -29,7 +25,6 @@ Build-Depends:
  libminify-maven-plugin-java,
  libservlet3.1-java,
  libslf4j-java,
-# libtomcat7-java,
  maven-debian-helper,
  po-debconf,
 Standards-Version: 3.9.8

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