[Pkg-remote-team] [guacamole-client] 05/08: Fix some lintian.

[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-client.

commit 563c084003c39f699bb17056e17b3b5e5a6b9e21
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Nov 27 14:07:40 2016 +0100

    Fix some lintian.
---
 debian/copyright                   | 10 +++++-----
 debian/patches/use-debian-js.patch |  5 +++++
 debian/rules                       | 12 ++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 2e376b2..2c7379d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,11 @@ Files-Excluded: guacamole/src/main/webapp/lib/angular
  guacamole/src/main/webapp/lib/jquery
  guacamole/src/main/webapp/lib/lodash
 
+Files: *
+Copyright: 2011, Michael Jumper <zhangmaike at users.sourceforge.net>
+ 2013-2015 Glyptodon LLC
+License: Expat
+
 Files: guacamole/src/main/webapp/lib/angular-module-shim/*
 Copyright: 2014 Jed Richards
 License: Expat
@@ -32,11 +37,6 @@ Copyright: 2011, Michael Jumper <zhangmaike at users.sourceforge.net>
  2016 Thorsten Glaser <tg at mirbsd.org>
 License: AGPL-3+
 
-Files: *
-Copyright: 2011, Michael Jumper <zhangmaike at users.sourceforge.net>
- 2013-2015 Glyptodon LLC
-License: Expat
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/patches/use-debian-js.patch b/debian/patches/use-debian-js.patch
index d25bd4b..c22b9d9 100644
--- a/debian/patches/use-debian-js.patch
+++ b/debian/patches/use-debian-js.patch
@@ -1,3 +1,8 @@
+From: Dominik George <nik at naturalnet.de>
+Subject: Load Debian JS libraries
+ We removed those libraries from the source that Debian has.
+ We need to load them here; upstream originally would have
+ compiled them into the minified main application file.
 --- a/guacamole/src/main/webapp/index.html
 +++ b/guacamole/src/main/webapp/index.html
 @@ -54,7 +54,10 @@
diff --git a/debian/rules b/debian/rules
index 4c5c9f0..db8ecfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,5 +10,17 @@ override_dh_auto_build:
 
 override_dh_install:
 	dh_install
+
+	# Move own libraries away and remove library copies
+	# dh_link will fix that later
 	mv debian/guacamole/usr/share/guacamole/guacamole/WEB-INF/lib/guacamole*.jar debian/guacamole/usr/share/java/
 	rm -f debian/guacamole/usr/share/guacamole/guacamole/WEB-INF/lib/*
+
+	# Remove unnecessary LICENSE files
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/fonts/carlito/LICENSE
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/lib/angular-module-shim/LICENSE
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/lib/angular-translate/LICENSE
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/lib/blob/LICENSE.md
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/lib/filesaver/LICENSE.md
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/lib/messageformat/LICENSE
+	rm -f debian/guacamole/usr/share/guacamole/guacamole/license.txt

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