[debian-edu-commits] debian-edu/ 25/26: Update debian/.

Dominik George natureshadow-guest at moszumanska.debian.org
Fri Oct 7 19:05:44 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 71a842507fd121542526988d589db430d8d7f7ea
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Oct 7 21:00:45 2016 +0200

    Update debian/.
---
 debian/README                                      | 202 ---------------------
 debian/changelog                                   |   6 +
 debian/compat                                      |   2 +-
 debian/control                                     |  13 +-
 debian/guacamole.docs                              |   2 +-
 .../0001-guacamole-maven-debian-helper.patch       |  21 +--
 6 files changed, 20 insertions(+), 226 deletions(-)

diff --git a/debian/README b/debian/README
deleted file mode 100644
index aff1f85..0000000
--- a/debian/README
+++ /dev/null
@@ -1,202 +0,0 @@
-
-------------------------------------------------------------
- Contents
-------------------------------------------------------------
-
- * About this README
- * What is Guacamole?
- * Installation within Servlet Container
- * Adding / Removing User Accounts
- * Permissions and Security
- * Reporting problems
-
-
-------------------------------------------------------------
- About this README
-------------------------------------------------------------
-
-This README is intended to provide quick and to-the-point documentation for
-installing and configuring Guacamole under Debian.
-
-Distribution-independent configuration documentation is provided on the
-Guacamole wiki:
-
-    http://guac-dev.org/Configuring%20Guacamole
-
-
-------------------------------------------------------------
- What is Guacamole?
-------------------------------------------------------------
-
-Guacamole is an HTML5 web application that provides access to your desktop
-using remote desktop protocols. A centralized server acts as a tunnel and
-proxy, allowing access to multiple desktops through a web browser; no plugins
-needed. The client requires nothing more than a web browser supporting HTML5
-and AJAX.
-
-
-------------------------------------------------------------
- Installation within Servlet Container
-------------------------------------------------------------
-
-Although Guacamole documentation frequently references Tomcat, the application
-is servlet container agnostic, and should work under any servlet container.
-Your servlet container of choice will have documentation for web application
-installation similar to what is provided here.
-
-If you already use Tomcat, the easiest way to install Guacamole is to install
-the guacamole-tomcat package. This package depends on Tomcat and Guacamole,
-and will automatically create links and set permissions appropriately for a
-Tomcat-based Guacamole installation.
-
-For a complete installation, you must:
-
-    1) Place a link to /etc/guacamole/guacamole.properties in your servlet
-       container's classpath.
-
-       In the case of Tomcat, this means creating a symbolic link in
-       /usr/share/tomcat8/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
-       to use, the location of the file containing user account definitions,
-       and the host and port guacd will be listening on.
-
-    2) Place a link to /var/lib/guacamole/guacamole.war in the directory
-       your servlet container looks for .war files.
-
-       In the case of Tomcat, this means creating a symbolic link in
-       /var/lib/tomcat8/webapps:
-
-       ln -s /var/lib/guacamole/guacamole.war /var/lib/tomcat8/webapps/
-
-    3) Restart your servlet container.
-
-       Most servlet containers will only search their classpaths once on
-       startup, thus the servlet container will only pick up and read the
-       guacamole.properties file if it is restarted. Even though many
-       servlet containers (including Tomcat) will automatically deploy
-       the web application once the .war file is in place, Guacamole will
-       not be able to read its configuration until the servlet container
-       is restarted.
-
-       If you are using Tomcat, just use the init.d script to restart:
-
-       /etc/init.d/tomcat8 restart
-
-    4) Install VNC support and a VNC server.
-
-       The Guacamole architecture supports multiple protocols, even though
-       the only current stable support is for VNC.
-
-       VNC support for Guacamole on Debian is provided by the
-       libguac-client-vnc0 package. This package will be installed
-       automatically if you install guacamole-tomcat.
-
-       Once VNC support for Guacamole is installed, you need to install and
-       configure a VNC server. The server from RealVNC (available in the
-       vnc4server package) is a good choice and performs well.
-
-    5) Configure user accounts.
-
-       Once Guacamole is installed and you visit it in a browser, you will be
-       given a login page. Logging in on this page will connect you to
-       whichever server is configured for that user in user-mapping.xml.
-
-       See the section below entitled "Adding / Removing User Accounts" for
-       instructions on configuring users.
-
-    6) Set permissions such that your servlet container can read user
-       account information, and other users cannot.
-
-       The user-mapping.xml file will contain sensitive information including
-       passwords and should be readable only by the user that your servlet 
-       container runs as.
-
-       See the section below entitled "Permissions and Security" for
-       instructions on setting permissions properly.
-
-
-------------------------------------------------------------
- Adding / Removing User Accounts
-------------------------------------------------------------
-
-User accounts correspond to available connections and not necessarily to
-individual users of the system.
-
-Examples of user accounts are available (commented out) in the provided
-/etc/guacamole/user-mapping.xml file.
-
-In general, a user account definition in the user-mapping.xml file will
-look like this:
-
-    <authorize username="SOMEUSER" password="SOMEPASSWORD">
-        <protocol>vnc</protocol>
-        <param name="hostname">localhost</param>
-        <param name="port">5900</param>
-        <param name="password">VNCPASS</param>
-    </authorize>
-
-The authorize tag defines a single authorized username/password combination and
-associates it with specific connection parameters. It may contain a single
-protocol tag, which defines which protocol will be used, and any number of
-param tags, which define protocol-specific parameters (such as hostname, port,
-and password).
-
-The username and password attributes are required. If you wish to store your
-password hashed rather than in plain-text, you can also specify encoding="md5"
-and include your MD5-hashed password instead.
-
-Included in the above example are three VNC-specific parameters. The VNC
-support plugin accepts other parameters, not all of which are required:
-
-    hostname
-        The hostname or IP of the VNC server you wish to connect to.
-        This parameter is REQUIRED.
-
-    port
-        The port of the VNC server you wish to connect to.
-        This parameter is REQUIRED.
-
-    password
-        The password required, if any, when connecting to the VNC server. Note
-        that unlike the passwords specified in authorize tags, this password
-        must be stored unhashed, as it needs to be sent to the VNC server.
-
-    read-only
-        Set to true if you wish to disallow input and clipboard functions, and
-        force server-side rendering of the mouse cursor. This is distinct from
-        the "view-only" feature provided by some VNC servers and will work even
-        if your VNC server does not provide a "view-only" mode.
-
-
-------------------------------------------------------------
- Permissions and Security
-------------------------------------------------------------
-
-As VNC and user account passwords may be stored in user-mapping.xml, only the
-servlet container user should have permission to read this file, and only root
-should have permission to write to it.
-
-The Debian "guacamole" package will set permissions appropriately, with this
-file owned by the user root and the group guacamole-web, where the user has
-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 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.
-
-
-------------------------------------------------------------
- Reporting problems
-------------------------------------------------------------
-
-Please report any bugs encountered by opening a new ticket at the Trac system
-hosted at:
-    
-    http://sourceforge.net/apps/trac/guacamole/
-
diff --git a/debian/changelog b/debian/changelog
index 3bca1bc..3ef277c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guacamole-client (0.9.9-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Dominik George <nik at naturalnet.de>  Fri, 07 Oct 2016 20:55:43 +0200
+
 guacamole-client (0.8.3-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 10479be..18960df 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: guacamole-client
 Priority: extra
-Maintainer: Michael Jumper <mike.jumper at guac-dev.org>
-Build-Depends: debhelper (>= 9),
+Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
+Uploaders: Dominik George <nik at naturalnet.de>
+Build-Depends: debhelper (>= 10),
                default-jdk,
                libmaven-assembly-plugin-java,
                libmaven-install-plugin-java,
@@ -11,11 +12,11 @@ Build-Depends: debhelper (>= 9),
                libslf4j-java,
                maven-debian-helper,
                po-debconf
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Section: net
-Vcs-Git: git://anonscm.debian.org/pkg-java/guacamole-client.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/guacamole-client.git
-Homepage: http://guac-dev.org
+Homepage: http://guacamole.incubator.apache.org/
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-edu/pkg-team/guacamole-client.git
+Vcs-Git: https://anonscm.debian.org/git/debian-edu/pkg-team/guacamole-client.git
 
 Package: guacamole
 Architecture: all
diff --git a/debian/guacamole.docs b/debian/guacamole.docs
index df6f1f3..e845566 100644
--- a/debian/guacamole.docs
+++ b/debian/guacamole.docs
@@ -1 +1 @@
-debian/README
+README
diff --git a/debian/patches/0001-guacamole-maven-debian-helper.patch b/debian/patches/0001-guacamole-maven-debian-helper.patch
index b66507a..336a8e6 100644
--- a/debian/patches/0001-guacamole-maven-debian-helper.patch
+++ b/debian/patches/0001-guacamole-maven-debian-helper.patch
@@ -1,8 +1,6 @@
-diff --git a/guacamole/pom.xml b/guacamole/pom.xml
-index bd00f4d..f2f471f 100644
 --- a/guacamole/pom.xml
 +++ b/guacamole/pom.xml
-@@ -14,8 +14,11 @@
+@@ -48,8 +48,11 @@
      </properties>
  
      <build>
@@ -15,21 +13,12 @@ index bd00f4d..f2f471f 100644
              <!-- Written for 1.6 -->
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -27,8 +30,6 @@
-             </plugin>
- 
-             <plugin>
--                <groupId>org.apache.maven.plugins</groupId>
--                <artifactId>maven-war-plugin</artifactId>
-                 <configuration>
- 
-                     <!-- Filter webapp dir --> 
-@@ -49,6 +50,8 @@
-                     </overlays>
-                     
+@@ -64,6 +67,8 @@
+                     </compilerArgs>
+                     <fork>true</fork>
                  </configuration>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-war-plugin</artifactId>
              </plugin>
  
-         </plugins>
+             <plugin>

-- 
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