[X2Go-Commits] [x2go-keyring] 14/47: debian/rules: simplify file... a lot.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2go-keyring.

commit 0ae9c29fb0d865cf1f402a46c4c78f89876b9ffb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Aug 4 10:58:33 2019 +0200

    debian/rules: simplify file... a lot.
---
 debian/changelog |  2 ++
 debian/rules     | 62 ++++++--------------------------------------------------
 2 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a27d19d..2f0f7a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,8 @@ x2go-keyring (2014.07.09) UNRELEASED; urgency=medium
     - Add ${misc:Depends}, mostly for good measure.
     - Add build-dependency upon bash.
     - Add build-dependency upon coreutils.
+  * debian/rules:
+    - Simplify file... a lot.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 09 Jul 2014 20:10:47 +0200
 
diff --git a/debian/rules b/debian/rules
index 62f83c0..7a397ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,18 @@
 #!/usr/bin/make -f
 # debian/rules file - for x2go-keyring
-# Based on sample debian/rules file - for GNU Hello (1.3).
+# Based on sample debian/rules file - for Debian Archive Keyring (2019.01).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998-2003 James Troup
 # Copyright 2010-2015 Mike Gabriel
-# Copyright 2016 Mihai Moldovan
+# Copyright 2016-2019 Mihai Moldovan
 # I hereby give you perpetual unlimited permission to copy,
 # modify and relicense this file, provided that you do not remove
 # my name from the file itself.  (I assert my moral right of
 # paternity under the Copyright, Designs and Patents Act 1988.)
 # This file may have to be extensively modified
 
-install_dir=install -d -m 755
-install_file=install -m 644
-install_script=install -m 755
-install_binary=install -m 755 -s
+%:
+	dh "$@"
 
-build:
-	-mkdir -p output/keyrings
-	make
-
-clean:
-	$(checkdir)
-	make clean
-	-rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/substvars
-	-rm -rf debian/tmp
-
-binary-indep: checkroot
-	$(checkdir)
-	-rm -rf debian/tmp
-	$(install_dir) debian/tmp/DEBIAN/
-
-	$(install_script) debian/postinst debian/tmp/DEBIAN/
-	$(install_script) debian/prerm debian/tmp/DEBIAN/
-
-	$(install_dir) debian/tmp/usr/share/keyrings/
-	$(install_file) output/keyrings/x2go-maintainers.gpg debian/tmp/usr/share/keyrings/
-	$(install_file) output/keyrings/x2go-keyring.gpg debian/tmp/usr/share/keyrings/
-
-	$(install_dir) debian/tmp/usr/share/doc/x2go-keyring/
-	$(install_file) README debian/tmp/usr/share/doc/x2go-keyring/
-	$(install_file) debian/changelog debian/tmp/usr/share/doc/x2go-keyring/changelog
-	gzip -9v debian/tmp/usr/share/doc/x2go-keyring/*
-	$(install_file) debian/copyright debian/tmp/usr/share/doc/x2go-keyring/
-
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
-
-	cd debian/tmp && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
-
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -d x2go-maintainers-gpg
-	test -d x2go-keyring-gpg
-endef
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+override_dh_auto_build:
+	dh_auto_build --no-parallel

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git