[debian-edu-commits] debian-edu/ 11/12: wrap-and-sort

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository guacamole-server.

commit 4afc9bb6a81df556951e2609df03d8a70d1a0452
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 6 23:05:32 2016 +0200

    wrap-and-sort
---
 debian/control                     | 99 ++++++++++++++++++++++----------------
 debian/copyright                   |  1 -
 debian/libguac-client-rdp0.install |  2 +-
 3 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/debian/control b/debian/control
index 2d23602..79e6483 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,20 @@
 Source: guacamole-server
 Priority: extra
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
-Uploaders: Dominik George <nik at naturalnet.de>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
+Uploaders:
+ Dominik George <nik at naturalnet.de>,
+Build-Depends:
  autotools-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
  libcairo-dev,
  libcunit1-dev,
  libfreerdp-dev (>= 1.0.1),
- libvorbis-dev,
- libvncserver-dev,
- libssh-dev,
  libpango1.0-dev,
- libpulse-dev
+ libpulse-dev,
+ libssh-dev,
+ libvncserver-dev,
+ libvorbis-dev,
 Standards-Version: 3.9.8
 Section: net
 Homepage: http://guacamole.incubator.apache.org/
@@ -23,31 +25,23 @@ Package: libguac-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libguac5 (= ${binary:Version}),
- ${misc:Depends}
-Replaces: libguac1-dev
+Depends:
+ libguac5 (= ${binary:Version}),
+ ${misc:Depends},
+Replaces:
+ libguac1-dev,
 Description: Development headers for the core Guacamole library
  The development headers for the core Guacamole library used by guacd and
  all client plugins. This package is required for development of new client
  plugins, or for building existing plugins and guacd.
 
-Package: libguac5
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Core Guacamole library used by guacd and client plugins
- The core Guacamole library which both guacd and client plugins depend on
- to provide low-level I/O and protocol support.
-
 Package: guacd
 Section: net
 Architecture: any
-Depends: lsb-base (>= 3.0-6),
+Depends:
+ lsb-base (>= 3.0-6),
+ ${misc:Depends},
  ${shlibs:Depends},
- ${misc:Depends}
 Description: Guacamole proxy daemon
  The Guacamole proxy daemon, guacd, translates between remote desktop
  protocols (like VNC) and the Guacamole protocol using protocol plugins.
@@ -55,27 +49,18 @@ Description: Guacamole proxy daemon
  is established through the web application to guacd, allowing the JavaScript
  client to communicate to an arbitrary remote desktop server through guacd.
 
-Package: libguac-client-vnc0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Recommends: vnc4server
-Description: VNC support plugin for Guacamole
- A plugin for the Guacamole proxy daemon (guacd) that provides
- support for the VNC protocol.
-
 Package: libguac-client-rdp0
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ghostscript,
  ${misc:Depends},
- ghostscript
-Recommends: libfreerdp-plugins-standard
+ ${shlibs:Depends},
+Recommends:
+ libfreerdp-plugins-standard,
 Description: RDP support plugin for Guacamole
  A plugin for the Guacamole proxy daemon (guacd) that provides
  support for the RDP protocol (Windows Remote Desktop).
@@ -84,9 +69,39 @@ Package: libguac-client-ssh0
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: SSH support plugin for Guacamole
  A plugin for the Guacamole proxy daemon (guacd) that provides
  support for the SSH protocol.
+
+Package: libguac-client-vnc0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ vnc4server,
+Description: VNC support plugin for Guacamole
+ A plugin for the Guacamole proxy daemon (guacd) that provides
+ support for the VNC protocol.
+
+Package: libguac5
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Core Guacamole library used by guacd and client plugins
+ The core Guacamole library which both guacd and client plugins depend on
+ to provide low-level I/O and protocol support.
diff --git a/debian/copyright b/debian/copyright
index 6ef4d03..f45064f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,4 +48,3 @@ License: LGPL-2.1
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2.1'.
-
diff --git a/debian/libguac-client-rdp0.install b/debian/libguac-client-rdp0.install
index 98c5a1f..adfa705 100644
--- a/debian/libguac-client-rdp0.install
+++ b/debian/libguac-client-rdp0.install
@@ -1,3 +1,3 @@
+usr/lib/*/freerdp/*.so
 usr/lib/*/libguac-client-rdp.so
 usr/lib/*/libguac-client-rdp.so.*
-usr/lib/*/freerdp/*.so

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