Record xtrlock (2.9) in archive suite sid

17 files changed, 150 insertions, 117 deletions

diff --git a/debian/changelog b/debian/changelog
index 91ebaab..5f749d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xtrlock (2.9) unstable; urgency=medium
+
+  * Apply a patch from Helmut Grohne to move away from the (deprecated) xmkmf.
+    (Closes: #902648)
+  * Correct a typo in the manual page.
+  * Add Vcs-Git and Vcs-Browser metadata; packaging has been added to Salsa.
+  * Add an example systemd service file to lock screen on suspend/sleep.
+  * debian/rules:
+    - Move to minimal "dh" style.
+    - Ensure that patchlevel.h always matches the version in debian/changelog.
+  * Misc packaging improvements:
+    - Add a debian/gitlab-ci.yml.
+    - Drop trailing whitepaces to prevent future VCS noise.
+    - Explicitly specify the 3.0 (native) source format.
+    - Drop versioned dependency on dpkg-dev for a version now satisfied in
+      oldoldstable.
+    - Drop double-space in long description.
+    - Move to DEP-5 copyright file.
+    - Add a simple autopkgtest.
+  * Add myself to Uploaders.
+  * Bump Standards-Version to 4.4.0.
+
+ -- Chris Lamb <lamby@debian.org>  Tue, 06 Aug 2019 16:08:41 +0100
+
 xtrlock (2.8) unstable; urgency=low
 
   * patch from Simon Tatham to add a -f option [fork, and return success
@@ -17,7 +41,7 @@ xtrlock (2.6) unstable; urgency=low
   * patch from Simon Ruderich to correctly add hardening flags
   * check returns of setuid and setgid
   * build-depend on dpkg-dev
-  
+
  -- Matthew Vernon <matthew@debian.org>  Tue, 07 Jan 2014 14:22:55 +0000
 
 xtrlock (2.5) unstable; urgency=low
@@ -31,7 +55,7 @@ xtrlock (2.5) unstable; urgency=low
 xtrlock (2.4) unstable; urgency=low
 
   * add a -b option to blank the screen (code based on patch by Markus,
-    waldeck@gmx.de, for which thanks; documentation by myself. 
+    waldeck@gmx.de, for which thanks; documentation by myself.
     (Closes: #636993)
 
  -- Matthew Vernon <matthew@debian.org>  Sun, 05 Jan 2014 12:01:48 +0000
@@ -48,7 +72,7 @@ xtrlock (2.2) unstable; urgency=low
   * Change menu section to Screen/Locking
   * Update standards-version
   * Add a lintian override for being setgid shadow
-  
+
  -- Matthew Vernon <matthew@debian.org>  Tue, 26 Jun 2012 20:22:20 +0100
 
 xtrlock (2.1) unstable; urgency=low
@@ -61,7 +85,7 @@ xtrlock (2.1) unstable; urgency=low
     in the binary package (rather than one and a symlink)
   * Don't install README.Debian any more, as it's mostly just build
     instructions
-  
+
  -- Matthew Vernon <matthew@debian.org>  Tue, 26 Jun 2012 19:12:02 +0100
 
 xtrlock (2.0-14) unstable; urgency=low
@@ -87,23 +111,23 @@ xtrlock (2.0-11) unstable; urgency=low
   * Fix build-depends: for new etch (closes: #346840)
 
  -- Matthew Vernon <matthew@debian.org>  Sat, 14 Jan 2006 15:30:28 +0000
-	
+
 xtrlock (2.0-10) unstable; urgency=low
 
   * Take over this package, since I seem to have some tuits
   * Correct the Author's address in the manpage to something sensible
   * Similarly the original packager's.
   * For reference, the security problem fixed in -9 was CAN-2005-0079
-	
+
  -- Matthew Vernon <matthew@debian.org>  Thu, 20 Jan 2005 14:02:10 +0000
-	
+
 xtrlock (2.0-9) unstable; urgency=high
 
   * Fix the problem whereby we unlocked on long input (closes: #278191, #278190)
   * tidy up a switch statement (closes: #264173)
 
  -- Matthew Vernon <matthew@debian.org>  Mon, 17 Jan 2005 10:47:09 +0000
-	
+
 xtrlock (2.0-8) unstable; urgency=low
 
   * Uploading with maintainer set to QA group
@@ -123,10 +147,10 @@ xtrlock (2.0-6.1) unstable; urgency=low
 
   * NMU
   * Removed the buffer overrun potentiallity (closes: #154738)
-  * Update the code for remove the possibilty to read shadow file 
+  * Update the code for remove the possibilty to read shadow file
   (closes: #154740)
   * Fix spelling error in the copyright file
-  * Fix the place where is stored the common-licenses 
+  * Fix the place where is stored the common-licenses
   * Update the debian/rules to:
     - strip the /usr/X11R6/bin/xtrlock
     - include the section and priority in control
@@ -164,7 +188,7 @@ xtrlock (2.0-3) unstable; urgency=low
  -- Martin Mitchell <martin@debian.org>  Thu, 27 Nov 1997 01:34:14 +1100
 
 xtrlock (2.0-2.2) unstable; urgency=low
-  
+
   * Non-maintainer release.
   * Libc6 compile.
   * Update from pre-2.0.0.0 standards.
@@ -180,6 +204,3 @@ gzip manpage
 xtrlock-2.0 Debian 0 - sde
 
 Initial release.
-
-
-
diff --git a/debian/control b/debian/control
index c01554d..33582b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,24 @@
 Source: xtrlock
 Maintainer: Matthew Vernon <matthew@debian.org>
+Uploaders: Chris Lamb <lamby@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: libx11-dev, x11proto-core-dev, xutils-dev, dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.1
+Build-Depends:
+ debhelper-compat (= 12),
+ libx11-dev,
+ x11proto-core-dev,
+Vcs-Git: https://salsa.debian.org/debian/xtrlock.git
+Vcs-Browser: https://salsa.debian.org/debian/xtrlock
+Standards-Version: 4.4.0
+Rules-Requires-Root: binary-targets
 
 Package: xtrlock
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Minimal X display lock program
  xtrlock is a very minimal X display lock program, which uses nothing
- except the Xlib library.  It doesn't obscure the screen, it is
+ except the Xlib library. It doesn't obscure the screen, it is
  completely idle while the display is locked and you don't type at it,
  and it doesn't do funny things to the X access control lists.
diff --git a/debian/copyright b/debian/copyright
index fa5463f..0026c62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,35 @@
-This is Debian GNU/Linux's prepackaged version of Ian Jackson's xtrlock
-utility.  This package provides a minimal X display lock program.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Ian Jackson <ian@chiark.greenend.org.uk>
+Upstream-Name: xtrlock
 
-This package was put together by Stephen Early
-<steve@greenend.org.uk>, from the source by Ian Jackson, which he
-obtained from Usenet.  Apart from a couple of bugfixes the changes
-were very minimal - merely adding support for the Debian package
-maintenance scheme, by adding various debian.* files.
+Files: *
+Copyright:
+ © 1993, 1994 Ian Jackson <ian@chiark.greenend.org.uk>
+ © 1996 Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>
+License: GPL-3+
 
-This package is now maintained by Matthew Vernon <matthew@debian.org>.
+Files: debian/*
+Copyright:
+ © 1995 Stephen Early <steve@greenend.org.uk>
+ © 1997 — 2002 Martin Mitchell <martin@debian.org>
+ © 2002 Otavio Salvador <otavio@debian.org>
+ © 2005 — 2016 Matthew Vernon <matthew@debian.org>
+ © 2019 Chris Lamb <lamby@debian.org>
+License: GPL-3+
 
-Program Copyright (C) 1993, 1994 Ian Jackson.
-Modifications for Debian GNU/Linux Copyright (C) 1995 Stephen Early.
-Modifications for Debian GNU/Linux since v2.0-9 Copyright (C)
-2005-2012 Matthew Vernon
-
-This program and its documentation are free software; you can
-redistribute them and/or modify them under the terms of the GNU
-General Public License as published by the Free Software Foundation;
-either version 3, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-On Debian GNU/Linux, a copy of the GNU General Public License version
-3 may be found in /usr/share/common-licenses/GPL-3. It is also
-included in the source package as GPL-3.txt
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in the /usr/share/common-licenses/GPL-3 file.
diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
new file mode 100644
index 0000000..9dc298b
--- /dev/null
+++ b/debian/gitlab-ci.yml
@@ -0,0 +1,12 @@
+image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
+
+pages:
+  stage: deploy
+  except:
+    - tags
+  artifacts:
+    paths:
+    - public
+  script:
+   - gitlab-ci-git-buildpackage-all
+   - gitlab-ci-aptly
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index d6c27dd..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100755
index d6c27dd..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh -e
-if [ -x /usr/bin/update-menus ] ; then update-menus ; fi
diff --git a/debian/rules b/debian/rules
index 91b1572..8c6893c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,75 +1,26 @@
 #!/usr/bin/make -f
-# debian/rules file for xtrlock-2.0
-# Based upon the sample debian.rules file by Ian Jackson.
-
-package=xtrlock
-
-arch=$(shell dpkg --print-architecture)
-STRIP=strip
 
 DPKG_EXPORT_BUILDFLAGS = 1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-include /usr/share/dpkg/buildflags.mk
-
-CFLAGS+=-DSHADOW_PWD
-
-build:
-	$(checkdir)
-	xmkmf
-	$(MAKE) CFLAGS="$(CFLAGS)" CDEBUGFLAGS="" LOCAL_LDFLAGS="$(LDFLAGS)" xtrlock
-	touch build
-
-clean:
-	$(checkdir)
-	-rm -f build
-	-rm -f xtrlock *.o *.bak Makefile
-	-rm -rf debian/tmp *~ debian/files debian/substvars debian/*~
+include /usr/share/dpkg/default.mk
 
-binary-indep:	checkroot
-#No binary independent files in this package
+CFLAGS += -DSHADOW_PWD
 
-binary-arch:	checkroot build
-	-rm -rf debian/tmp
-	install -m 755 -d debian/tmp/usr/bin debian/tmp/usr/share/man/man1
-	install -m 755 -d debian/tmp/usr/share/doc/xtrlock debian/tmp/DEBIAN
-	install -m 755 -d debian/tmp/usr/share/menu
-	install -m 755 -d debian/tmp/usr/share/lintian/overrides
-	# has to be setgid shadow to support shadow passwords.  --marekm
-	install -m 755 xtrlock debian/tmp/usr/bin/xtrlock
-	# Is nostrip set in DEB_BUILD_OPTIONS?
-	case "$$DEB_BUILD_OPTIONS" in \
-	*nostrip*)\
-	;; \
-	*) \
-	$(STRIP) debian/tmp/usr/bin/xtrlock \
-	;; \
-	esac
-	install -m 644 xtrlock.man debian/tmp/usr/share/man/man1/xtrlock.1x
-	gzip -9nv debian/tmp/usr/share/man/man1/xtrlock.1x
-	install -m 644 debian/changelog debian/tmp/usr/share/doc/xtrlock
-	gzip -9nv debian/tmp/usr/share/doc/xtrlock/*
-	install -m 644 debian/copyright debian/tmp/usr/share/doc/xtrlock
-	install -m 644 debian/menu debian/tmp/usr/share/menu/xtrlock
-	install -m 644 debian/xtrlock.lintian-overrides \
-	debian/tmp/usr/share/lintian/overrides/xtrlock
-	install -m 755 debian/postinst debian/postrm debian/tmp/DEBIAN
-	cp debian/control debian/tmp/DEBIAN/control
-	dpkg-shlibdeps debian/tmp/usr/bin/xtrlock
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chown root.shadow debian/tmp/usr/bin/xtrlock
-	chmod -R g-w debian/tmp
-	chmod 2755 debian/tmp/usr/bin/xtrlock
-	dpkg --build debian/tmp ..
+ifeq (,$(findstring ^$(DEB_VERSION_UPSTREAM),^$(shell cut -d'"' -f2 patchlevel.h)))
+$(error (patchlevel.h out of sync with Debian version))
+endif
 
-binary:	binary-indep binary-arch
+%:
+	dh $@
 
-define checkdir
-	test -f debian/rules
-endef
+override_dh_auto_build:
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) xtrlock.c -o xtrlock -lcrypt -lX11
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
+override_dh_fixperms:
+	dh_fixperms -X/usr/bin/xtrlock
 
-.PHONY: binary clean checkroot
+override_dh_install:
+	dh_install
+	# xtrlock has to be setgid shadow to support shadow passwords
+	chown root.shadow debian/xtrlock/usr/bin/xtrlock
+	chmod 2755 debian/xtrlock/usr/bin/xtrlock
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/tests/0001-smoketest b/debian/tests/0001-smoketest
new file mode 100755
index 0000000..9ad2c5a
--- /dev/null
+++ b/debian/tests/0001-smoketest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/xtrlock --help 2>&1 | grep usage
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..b9ef8d8
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: 0001-smoketest
+Depends:
+ @,
+Restrictions: allow-stderr
diff --git a/debian/xtrlock.examples b/debian/xtrlock.examples
new file mode 100644
index 0000000..3d0e946
--- /dev/null
+++ b/debian/xtrlock.examples
@@ -0,0 +1 @@
+xtrlock.service
diff --git a/debian/xtrlock.install b/debian/xtrlock.install
new file mode 100644
index 0000000..57cd0c9
--- /dev/null
+++ b/debian/xtrlock.install
@@ -0,0 +1 @@
+xtrlock usr/bin
diff --git a/debian/xtrlock.lintian-overrides b/debian/xtrlock.lintian-overrides
index 505c290..e0df932 100644
--- a/debian/xtrlock.lintian-overrides
+++ b/debian/xtrlock.lintian-overrides
@@ -1,3 +1,2 @@
-#Lintian overrides for xtrlock
-#xtrlock needs to be setgit shadow so it can read the shadow file
+# xtrlock needs to be setgit shadow so it can read the shadow file
 xtrlock: setgid-binary usr/bin/xtrlock 2755 root/shadow 
diff --git a/debian/xtrlock.manpages b/debian/xtrlock.manpages
new file mode 100644
index 0000000..40db00b
--- /dev/null
+++ b/debian/xtrlock.manpages
@@ -0,0 +1 @@
+xtrlock.man
diff --git a/patchlevel.h b/patchlevel.h
index e482441..2ecc7e6 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1 +1 @@
-const char program_version[] = "2.8";
+const char program_version[] = "2.9";
diff --git a/xtrlock.man b/xtrlock.man
index e211bd5..fccbca3 100644
--- a/xtrlock.man
+++ b/xtrlock.man
@@ -40,7 +40,7 @@ None.
 Additional input devices other than the keyboard and mouse are not
 disabled.
 
-The timeouts, bitmaps and mouse cursor colour cannot be modifed.
+The timeouts, bitmaps and mouse cursor colour cannot be modified.
 .SH SEE ALSO
 .BR X "(1), Xlib Documentation."
 .SH AUTHOR
diff --git a/xtrlock.service b/xtrlock.service
new file mode 100644
index 0000000..58d85de
--- /dev/null
+++ b/xtrlock.service
@@ -0,0 +1,28 @@
+# Example systemd service to lock screen on sleep/suspend
+#
+# To install:
+#
+#  * Copy this file to /etc/systemd/system/xtrlock.service
+#  * Replace the "FIXME" entries.
+#  * Run: sudo systemctl enable xtrlock
+# 
+# As user units cannot depend on system units, we cannot provide this via the
+# per-user systemd instance.
+#
+#  -- Chris Lamb <lamby@debian.org>  Tue, 06 Aug 2019 16:05:59 +0100
+
+[Unit]
+Description=Lock screen
+Requires=network.target
+After=sleep.target
+DefaultDependencies=no
+
+[Service]
+ExecStart=/usr/bin/xtrlock
+User=FIXME
+Group=FIXME
+Environment=DISPLAY=:0
+Type=oneshot
+
+[Install]
+WantedBy=sleep.target