[debian-edu-commits] debian-edu/ 04/26: Imported Debian patch 0.8.3-1.1

Dominik George natureshadow-guest at moszumanska.debian.org
Fri Oct 7 19:05:40 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 b372a4713c1bef2281a46020313124c09c9bb549
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 28 14:49:45 2015 +0100

    Imported Debian patch 0.8.3-1.1
---
 debian/README                     | 14 +++++++-------
 debian/changelog                  |  7 +++++++
 debian/control                    |  4 ++--
 debian/guacamole-tomcat.links     |  4 ++--
 debian/guacamole-tomcat.postinst  |  4 ++--
 debian/guacamole-tomcat.templates |  2 +-
 debian/po/cs.po                   |  4 ++--
 debian/po/da.po                   |  4 ++--
 debian/po/de.po                   |  4 ++--
 debian/po/es.po                   |  4 ++--
 debian/po/fr.po                   |  4 ++--
 debian/po/ja.po                   |  4 ++--
 debian/po/nl.po                   |  4 ++--
 debian/po/pt.po                   |  4 ++--
 debian/po/pt_BR.po                |  4 ++--
 debian/po/ru.po                   |  4 ++--
 debian/po/sv.po                   |  4 ++--
 debian/po/templates.pot           |  2 +-
 18 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/debian/README b/debian/README
index f2d195e..aff1f85 100644
--- a/debian/README
+++ b/debian/README
@@ -55,9 +55,9 @@ For a complete installation, you must:
        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 @@ For a complete installation, you must:
        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 @@ For a complete installation, you must:
 
        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 @@ read/write permissions, guacamole-web has read permissions, and no other user
 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.
 
 
diff --git a/debian/changelog b/debian/changelog
index a2acbd3..2c8d40f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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 --git a/debian/control b/debian/control
index b9f2f81..12bc5d4 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Section: net
 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 @@ Description: HTML5 web application for accessing remote desktops
 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 --git a/debian/guacamole-tomcat.links b/debian/guacamole-tomcat.links
index c45949f..22a73b6 100644
--- a/debian/guacamole-tomcat.links
+++ b/debian/guacamole-tomcat.links
@@ -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 --git a/debian/guacamole-tomcat.postinst b/debian/guacamole-tomcat.postinst
index 4ea343e..baec02a 100644
--- a/debian/guacamole-tomcat.postinst
+++ b/debian/guacamole-tomcat.postinst
@@ -11,7 +11,7 @@ set -e
 . /usr/share/debconf/confmodule
 
 GUAC_GROUP="guacamole-web"
-SC_USER="tomcat6"
+SC_USER="tomcat8"
 
 # Convenience function for error conditions
 fail() {
@@ -29,6 +29,6 @@ usermod --append -G "$GUAC_GROUP" "$SC_USER" ||\
 db_get guacamole-tomcat/restart-server
 if [ "$RET" = "true" ]
 then
-    invoke-rc.d tomcat6 restart
+    invoke-rc.d tomcat8 restart
 fi
 
diff --git a/debian/guacamole-tomcat.templates b/debian/guacamole-tomcat.templates
index ac81eb1..58a5540 100644
--- a/debian/guacamole-tomcat.templates
+++ b/debian/guacamole-tomcat.templates
@@ -15,5 +15,5 @@ _Description: Restart Tomcat server?
  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 --git a/debian/po/cs.po b/debian/po/cs.po
index b1c9f5d..a2f1da5 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -36,8 +36,8 @@ msgstr ""
 #. 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 --git a/debian/po/da.po b/debian/po/da.po
index afc41c6..3e2d422 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -36,8 +36,8 @@ msgstr ""
 #. 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 --git a/debian/po/de.po b/debian/po/de.po
index df62341..48518c7 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -36,8 +36,8 @@ msgstr ""
 #. 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 --git a/debian/po/es.po b/debian/po/es.po
index 690a6cc..aed7c87 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -61,8 +61,8 @@ msgstr ""
 #. 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 --git a/debian/po/fr.po b/debian/po/fr.po
index 3f6598c..d10c934 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -36,8 +36,8 @@ msgstr ""
 #. 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 --git a/debian/po/ja.po b/debian/po/ja.po
index 7f0d66d..1d2bfae 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -36,8 +36,8 @@ msgstr ""
 #. 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 --git a/debian/po/nl.po b/debian/po/nl.po
index f155265..f0d43d5 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -37,8 +37,8 @@ msgstr ""
 #. 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 --git a/debian/po/pt.po b/debian/po/pt.po
index 0987161..104f395 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -36,8 +36,8 @@ msgstr ""
 #. 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 --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 63f1c31..c2e6dbd 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -37,8 +37,8 @@ msgstr ""
 #. 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 --git a/debian/po/ru.po b/debian/po/ru.po
index 4b0b3d9..b35e7e1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -38,8 +38,8 @@ msgstr ""
 #. 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 --git a/debian/po/sv.po b/debian/po/sv.po
index c8bbcc5..ee64403 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -38,8 +38,8 @@ msgstr ""
 #. 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 --git a/debian/po/templates.pot b/debian/po/templates.pot
index 421cdda..447e230 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -35,6 +35,6 @@ msgstr ""
 #. 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 ""

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



More information about the debian-edu-commits mailing list