debian/: Update Debian packaging from official Debian package.

4 files changed, 86 insertions, 11 deletions

diff --git a/debian/control b/debian/control
index f941030..046e9c0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: libpam-x2go
-Section: misc
+Section: admin
 Priority: optional
 Maintainer: Artica Project <devs@lists.arctica-project.org>
 Uploaders:
@@ -14,7 +14,7 @@ Build-Depends:
  pkg-config,
  cdbs (>= 0.4.93~),
 Standards-Version: 4.1.4
-Homepage: http://github.com/ArcticaProject/libpam-x2go
+Homepage: https://github.com/ArcticaProject/libpam-x2go
 Vcs-Git: https://github.com/ArcticaProject/libpam-x2go/
 Vcs-Browser: https://github.com/ArcticaProject/libpam-x2go/
 
@@ -25,10 +25,12 @@ Depends:
  ${misc:Depends},
 Suggests:
  pyhoca-cli,
-Description: PAM Module to auth against an X2Go server using PyHoca
+Description: PAM Module to check credentials against X2Go servers
  Auth and session PAM module that uses SSH to authenticate against
  an X2Go server as the remote host and user. Local account required.
- Most useful with the pam-temp-account module.
+ .
+ This PAM module is intended for facilitating Remote Logon into X2Go
+ servers using LightDM's Arctica Greeter.
 
 Package: libpam-x2go-dev
 Section: libdevel
@@ -36,9 +38,11 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
-Description: PAM Module to auth against an X2Go server using PyHoca (development files)
+Description: PAM Module to check credentials against X2Go servers (development files)
  Auth and session PAM module that uses SSH to authenticate against
  an X2Go server as the remote host and user. Local account required.
- Most useful with the pam-temp-account module.
+ .
+ This PAM module is intended for facilitating Remote Logon into X2Go
+ servers using LightDM's Arctica Greeter.
  .
  This package contains the pam_x2go.so header files.
diff --git a/debian/copyright b/debian/copyright
index da27ef9..4b2c0b5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,52 @@ Upstream-Name: libpam-x2go
 Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Source: https://github.com/ArcticaProject/libpam-x2go
 
-Files: *
-Copyright:
- 2012-2013, Mike Gabriel (X2Go Project) <mike.gabriel@das-netzwerkteam.de>
- 2012, Canonical Ltd.
+Files: AUTHORS
+ ChangeLog
+ Makefile.am
+ Makefile.am.coverage
+ NEWS
+ README.md
+ configure.ac
+ m4/gcov.m4
+ src/Makefile.am
+ src/auth-check-path.c
+ src/auth-check-path.h
+ tests/Makefile.am
+Copyright: 2012, Canonical Ltd.
+  2012-2013, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL-3
+Comment:
+ Assuming same license and copyright holders as found in the rest of the
+ code files.
+
+Files: m4/gtest.m4
+Copyright: 2012, Canonical, Ltd.
+License: Expat
+
+Files: include/pam-x2go.h
+ src/pam-x2go-children.c
+ src/pam-x2go-children.h
+ src/pam-x2go.c
+ src/x2go-auth-check.c
+ tests/test-x2go-auth.c
+Copyright: 2012, Canonical Ltd.
+  2012-2013, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+License: GPL-3
+
+Files: tests/mock_guest.c
+ tests/mock_guest.h
+ tests/mock_pam.c
+ tests/mock_pam.h
+ tests/test-x2go-wrapper.cc
+Copyright: 2012, Canonical Ltd.
+  2012-2013, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>.
+License: GPL-3
+Comment:
+ Assuming license as found in COPYING file.
+
+Files: src/pam-x2go-private.h
+Copyright: 2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 License: GPL-3
 
 Files: debian/*
@@ -29,3 +71,23 @@ License: GPL-3
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+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
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 0969a92..96d8b0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,12 @@ include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_MAKE_CHECK_TARGET = check
 
+#pre-build::
+#	cp README.md README
+#
+#cleanbuilddir::
+#	rm -f README
+
 # Remove .a and .la files from /lib/security
 remove-cruft::
 	find $(DEB_DESTDIR)/lib/security -type f \
@@ -20,3 +26,6 @@ remove-cruft::
 common-install-indep:: remove-cruft
 common-install-arch:: remove-cruft
 common-binary-post-install-arch:: list-missing
+
+get-orig-source:
+	uscan --noconf --force-download --rename --download-current-version --destdir=..
diff --git a/debian/watch b/debian/watch
index 51d920e..ac9b532 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/ \
-http://releases.arctica-project.org/source/libpam-x2go/libpam-x2go-(.+)\.tar\.gz
+https://releases.arctica-project.org/source/libpam-x2go/libpam-x2go-(.+)\.tar\.gz