Bug#776486: unblock: guacamole-client/0.8.3-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package guacamole-client. This update replaces the dependency
on tomcat6 which is going away with tomcat8.
Thank you
unblock guacamole-client/0.8.3-1.1
diff -Nru guacamole-client-0.8.3/debian/changelog guacamole-client-0.8.3/debian/changelog
--- guacamole-client-0.8.3/debian/changelog 2013-09-20 23:34:37.000000000 +0200
+++ guacamole-client-0.8.3/debian/changelog 2015-01-28 15:57:12.000000000 +0100
@@ -1,3 +1,10 @@
+guacamole-client (0.8.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Depend on tomcat8 instead of tomcat6 (Closes: #759621)
+
+ -- Emmanuel Bourg <ebourg@apache.org> Wed, 28 Jan 2015 14:49:45 +0100
+
guacamole-client (0.8.3-1) unstable; urgency=low
* Merge changes from 0.8.3
diff -Nru guacamole-client-0.8.3/debian/control guacamole-client-0.8.3/debian/control
--- guacamole-client-0.8.3/debian/control 2013-09-20 20:27:51.000000000 +0200
+++ guacamole-client-0.8.3/debian/control 2015-01-28 15:45:46.000000000 +0100
@@ -13,7 +13,7 @@
Architecture: all
Depends: guacd, ${misc:Depends}
Recommends: libguac-client-vnc0
-Suggests: tomcat6 | jetty
+Suggests: tomcat8 | jetty
Description: HTML5 web application for accessing remote desktops
Guacamole is an HTML5 web application that provides access to a desktop
environment using remote desktop protocols. A centralized server acts as a
@@ -24,7 +24,7 @@
Package: guacamole-tomcat
Section: net
Architecture: all
-Depends: debconf, guacamole, tomcat6, libguac-client-vnc0, ${misc:Depends}
+Depends: debconf, guacamole, tomcat8, libguac-client-vnc0, ${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
diff -Nru guacamole-client-0.8.3/debian/guacamole-tomcat.links guacamole-client-0.8.3/debian/guacamole-tomcat.links
--- guacamole-client-0.8.3/debian/guacamole-tomcat.links 2013-09-20 20:27:51.000000000 +0200
+++ guacamole-client-0.8.3/debian/guacamole-tomcat.links 2015-01-28 14:46:50.000000000 +0100
@@ -1,2 +1,2 @@
-/etc/guacamole/guacamole.properties /usr/share/tomcat6/lib/guacamole.properties
-/var/lib/guacamole/guacamole.war /var/lib/tomcat6/webapps/guacamole.war
+/etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/guacamole.properties
+/var/lib/guacamole/guacamole.war /var/lib/tomcat8/webapps/guacamole.war
diff -Nru guacamole-client-0.8.3/debian/guacamole-tomcat.postinst guacamole-client-0.8.3/debian/guacamole-tomcat.postinst
--- guacamole-client-0.8.3/debian/guacamole-tomcat.postinst 2013-09-20 20:27:51.000000000 +0200
+++ guacamole-client-0.8.3/debian/guacamole-tomcat.postinst 2015-01-28 14:46:19.000000000 +0100
@@ -11,7 +11,7 @@
. /usr/share/debconf/confmodule
GUAC_GROUP="guacamole-web"
-SC_USER="tomcat6"
+SC_USER="tomcat8"
# Convenience function for error conditions
fail() {
@@ -29,6 +29,6 @@
db_get guacamole-tomcat/restart-server
if [ "$RET" = "true" ]
then
- invoke-rc.d tomcat6 restart
+ invoke-rc.d tomcat8 restart
fi
diff -Nru guacamole-client-0.8.3/debian/guacamole-tomcat.templates guacamole-client-0.8.3/debian/guacamole-tomcat.templates
--- guacamole-client-0.8.3/debian/guacamole-tomcat.templates 2013-09-20 20:27:51.000000000 +0200
+++ guacamole-client-0.8.3/debian/guacamole-tomcat.templates 2015-01-28 14:49:04.000000000 +0100
@@ -15,5 +15,5 @@
server, as Tomcat will only read configuration files on startup.
.
You can also restart Tomcat manually by running
- "invoke-rc.d tomcat6 restart" as root.
+ "invoke-rc.d tomcat8 restart" as root.
diff -Nru guacamole-client-0.8.3/debian/po/cs.po guacamole-client-0.8.3/debian/po/cs.po
--- guacamole-client-0.8.3/debian/po/cs.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/cs.po 2015-01-28 14:56:06.000000000 +0100
@@ -36,8 +36,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
-"Tomcat můžete restartovat také ručně spuštěním \"invoke-rc.d tomcat6 restart"
+"Tomcat můžete restartovat také ručně spuštěním \"invoke-rc.d tomcat8 restart"
"\" jako uživatel root."
diff -Nru guacamole-client-0.8.3/debian/po/da.po guacamole-client-0.8.3/debian/po/da.po
--- guacamole-client-0.8.3/debian/po/da.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/da.po 2015-01-28 14:56:06.000000000 +0100
@@ -36,8 +36,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
-"Du kan også genstarte Tomcat manuelt ved at køre »invoke-rc.d tomcat6 "
+"Du kan også genstarte Tomcat manuelt ved at køre »invoke-rc.d tomcat8 "
"restart« som administrator (root)."
diff -Nru guacamole-client-0.8.3/debian/po/de.po guacamole-client-0.8.3/debian/po/de.po
--- guacamole-client-0.8.3/debian/po/de.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/de.po 2015-01-28 14:56:06.000000000 +0100
@@ -36,8 +36,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
-"Sie können Tomcat auch manuell neu starten, indem Sie »invoke-rc.d tomcat6 "
+"Sie können Tomcat auch manuell neu starten, indem Sie »invoke-rc.d tomcat8 "
"restart« ausführen."
diff -Nru guacamole-client-0.8.3/debian/po/es.po guacamole-client-0.8.3/debian/po/es.po
--- guacamole-client-0.8.3/debian/po/es.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/es.po 2015-01-28 14:56:06.000000000 +0100
@@ -61,8 +61,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
"También puede reiniciar Tomcat manualmente ejecutando, como administrador, "
-"«invoke-rc.d tomcat6 restart»."
+"«invoke-rc.d tomcat8 restart»."
diff -Nru guacamole-client-0.8.3/debian/po/fr.po guacamole-client-0.8.3/debian/po/fr.po
--- guacamole-client-0.8.3/debian/po/fr.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/fr.po 2015-01-28 14:56:06.000000000 +0100
@@ -36,8 +36,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
"Vous pouvez également relancer Tomcat vous-même en exécutant la commande "
-"« invoke-rc.d tomcat6 restart » avec les privilèges du superutilisateur."
+"« invoke-rc.d tomcat8 restart » avec les privilèges du superutilisateur."
diff -Nru guacamole-client-0.8.3/debian/po/ja.po guacamole-client-0.8.3/debian/po/ja.po
--- guacamole-client-0.8.3/debian/po/ja.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/ja.po 2015-01-28 14:56:06.000000000 +0100
@@ -36,8 +36,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
-"「invoke-rc.d tomcat6 restart」を root で実行することで、手作業で Tomcat を再"
+"「invoke-rc.d tomcat8 restart」を root で実行することで、手作業で Tomcat を再"
"起動することもできます"
diff -Nru guacamole-client-0.8.3/debian/po/nl.po guacamole-client-0.8.3/debian/po/nl.po
--- guacamole-client-0.8.3/debian/po/nl.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/nl.po 2015-01-28 14:56:06.000000000 +0100
@@ -37,8 +37,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
"U kunt Tomcat ook handmatig herstarten door als beheerder het commando "
-"\"invoke-rc.d tomcat6 restart\" uit te voeren."
+"\"invoke-rc.d tomcat8 restart\" uit te voeren."
diff -Nru guacamole-client-0.8.3/debian/po/pt_BR.po guacamole-client-0.8.3/debian/po/pt_BR.po
--- guacamole-client-0.8.3/debian/po/pt_BR.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/pt_BR.po 2015-01-28 14:56:06.000000000 +0100
@@ -37,8 +37,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
"Você também pode reiniciar o Tomcat manualmente, executando \"invoke-rc.d "
-"tomcat6 restart\" como root."
+"tomcat8 restart\" como root."
diff -Nru guacamole-client-0.8.3/debian/po/pt.po guacamole-client-0.8.3/debian/po/pt.po
--- guacamole-client-0.8.3/debian/po/pt.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/pt.po 2015-01-28 14:56:06.000000000 +0100
@@ -36,8 +36,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
-"Pode também reiniciar manualmente o Tomcat correndo \"invoke-rc.d tomcat6 "
+"Pode também reiniciar manualmente o Tomcat correndo \"invoke-rc.d tomcat8 "
"restart\" como root."
diff -Nru guacamole-client-0.8.3/debian/po/ru.po guacamole-client-0.8.3/debian/po/ru.po
--- guacamole-client-0.8.3/debian/po/ru.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/ru.po 2015-01-28 14:56:06.000000000 +0100
@@ -38,8 +38,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
"Также, вы можете перезапустить Tomcat вручную, выполнив команду «invoke-rc.d "
-"tomcat6 restart» имея права суперпользователя."
+"tomcat8 restart» имея права суперпользователя."
diff -Nru guacamole-client-0.8.3/debian/po/sv.po guacamole-client-0.8.3/debian/po/sv.po
--- guacamole-client-0.8.3/debian/po/sv.po 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/sv.po 2015-01-28 14:56:06.000000000 +0100
@@ -38,8 +38,8 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
-"Du kan också starta om Tomcat manuellt genom att köra \"invoke-rc.d tomcat6 "
+"Du kan också starta om Tomcat manuellt genom att köra \"invoke-rc.d tomcat8 "
"restart\" som root."
diff -Nru guacamole-client-0.8.3/debian/po/templates.pot guacamole-client-0.8.3/debian/po/templates.pot
--- guacamole-client-0.8.3/debian/po/templates.pot 2013-09-24 00:49:47.000000000 +0200
+++ guacamole-client-0.8.3/debian/po/templates.pot 2015-01-28 14:56:16.000000000 +0100
@@ -35,6 +35,6 @@
#. Description
#: ../guacamole-tomcat.templates:2001
msgid ""
-"You can also restart Tomcat manually by running \"invoke-rc.d tomcat6 restart"
+"You can also restart Tomcat manually by running \"invoke-rc.d tomcat8 restart"
"\" as root."
msgstr ""
diff -Nru guacamole-client-0.8.3/debian/README guacamole-client-0.8.3/debian/README
--- guacamole-client-0.8.3/debian/README 2013-09-20 20:27:51.000000000 +0200
+++ guacamole-client-0.8.3/debian/README 2015-01-28 14:48:16.000000000 +0100
@@ -55,9 +55,9 @@
container's classpath.
In the case of Tomcat, this means creating a symbolic link in
- /usr/share/tomcat6/lib:
+ /usr/share/tomcat8/lib:
- ln -s /etc/guacamole/guacamole.properties /usr/share/tomcat6/lib/
+ ln -s /etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/
The guacamole.properties file is the core configuration file for the
Guacamole web application. It tells Guacamole what authentication method
@@ -68,9 +68,9 @@
your servlet container looks for .war files.
In the case of Tomcat, this means creating a symbolic link in
- /var/lib/tomcat6/webapps:
+ /var/lib/tomcat8/webapps:
- ln -s /var/lib/guacamole/guacamole.war /var/lib/tomcat6/webapps/
+ ln -s /var/lib/guacamole/guacamole.war /var/lib/tomcat8/webapps/
3) Restart your servlet container.
@@ -84,7 +84,7 @@
If you are using Tomcat, just use the init.d script to restart:
- /etc/init.d/tomcat6 restart
+ /etc/init.d/tomcat8 restart
4) Install VNC support and a VNC server.
@@ -186,8 +186,8 @@
can read or write. This means you should add the user that your servlet
container runs as to the group guacamole-web.
-If you are using Tomcat, installed via the Debian tomcat6 package, the
-use you need to add to guacamole-web is tomcat6. If you installed the
+If you are using Tomcat, installed via the Debian tomcat8 package, the
+use you need to add to guacamole-web is tomcat8. If you installed the
guacamole-tomcat package, this has been done for you.
Reply to: