[X2Go-Commits] [x2gobroker] 18/18: debian/*: Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 30 19:10:57 CEST 2018 

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit df961d8d8abdbe48b4ce929822df42e7c5323957
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 30 19:03:27 2018 +0200

    debian/*: Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic.
---
 debian/python3-x2gobroker.install      |  3 ++-
 debian/rules                           |  9 ++++++---
 debian/x2gobroker-agent.install        |  5 +++--
 debian/x2gobroker-agent.manpages       |  1 -
 debian/x2gobroker-authservice.install  |  7 ++++---
 debian/x2gobroker-authservice.manpages |  1 -
 debian/x2gobroker-common.install       | 10 +++++-----
 debian/x2gobroker-daemon.install       |  6 ++++--
 debian/x2gobroker-daemon.manpages      |  2 --
 debian/x2gobroker-loadchecker.install  |  7 ++++---
 debian/x2gobroker-loadchecker.manpages |  1 -
 debian/x2gobroker-ssh.install          |  5 +++--
 debian/x2gobroker-ssh.manpages         |  1 -
 debian/x2gobroker-wsgi.install         |  6 +++---
 debian/x2gobroker.install              | 12 ++++++++----
 debian/x2gobroker.manpages             |  4 ----
 16 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/debian/python3-x2gobroker.install b/debian/python3-x2gobroker.install
index 1b91047..6745aa6 100644
--- a/debian/python3-x2gobroker.install
+++ b/debian/python3-x2gobroker.install
@@ -1 +1,2 @@
-usr/
+usr/lib/python3/
+etc/default/python-x2gobroker
diff --git a/debian/rules b/debian/rules
index ee0bf1c..4fdc8f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,23 +23,26 @@
 #include /usr/share/dpkg/buildflags.mk
 
 export PREFIX=/usr
+export DESTDIR="$(DEB_DESTDIR)"
+export SKIP_INSTALL_PYMODULE=1
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_MAKE_CHECK_TARGET = check
+DEB_MAKE_INSTALL_TARGET = install
 
 DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python3 && echo "" || echo "pysupport")
-DEB_PYTHON_INSTALL_ARGS_python3-x2gobroker ?= --root=$(DEB_DESTDIR) --no-compile -O0 --install-layout=deb
 
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-# needed when building with pysupport (e.g. on Ubuntu lucid)
 common-binary-indep::
-	mkdir -p debian/tmp/usr
 	cp pam/x2gobroker.Debian pam/x2gobroker
 	cp x2gobroker-ssh.sudo x2gobroker-ssh
 
 common-binary-arch:: common-binary-indep
+common-binary-post-install-arch:: list-missing
 
 clean::
 	rm -f pam/x2gobroker
diff --git a/debian/x2gobroker-agent.install b/debian/x2gobroker-agent.install
index a9bf1d8..c9dc1a7 100644
--- a/debian/x2gobroker-agent.install
+++ b/debian/x2gobroker-agent.install
@@ -1,2 +1,3 @@
-lib/x2gobroker-agent* usr/lib/x2go/
-sbin/x2gobroker-pubkeyauthorizer usr/sbin/
\ No newline at end of file
+usr/lib/x2go/x2gobroker-agent*
+usr/sbin/x2gobroker-pubkeyauthorizer
+usr/share/man/man8/x2gobroker-pubkeyauthorizer.8*
diff --git a/debian/x2gobroker-agent.manpages b/debian/x2gobroker-agent.manpages
deleted file mode 100644
index 747905f..0000000
--- a/debian/x2gobroker-agent.manpages
+++ /dev/null
@@ -1 +0,0 @@
-man/man8/x2gobroker-pubkeyauthorizer.8
\ No newline at end of file
diff --git a/debian/x2gobroker-authservice.install b/debian/x2gobroker-authservice.install
index ec482d3..a85b54a 100644
--- a/debian/x2gobroker-authservice.install
+++ b/debian/x2gobroker-authservice.install
@@ -1,4 +1,5 @@
-sbin/x2gobroker-authservice usr/sbin/
-logrotate/x2gobroker-authservice etc/logrotate.d/
-etc/broker/x2gobroker-authservice-logger.conf etc/x2go/broker
+usr/sbin/x2gobroker-authservice
+etc/logrotate.d/x2gobroker-authservice
+etc/x2go/broker/x2gobroker-authservice-logger.conf
 usr/share/tmpfiles.d/x2gobroker-authservice.conf
+usr/share/man/man8/x2gobroker-authservice.8*
diff --git a/debian/x2gobroker-authservice.manpages b/debian/x2gobroker-authservice.manpages
deleted file mode 100644
index 8b080d0..0000000
--- a/debian/x2gobroker-authservice.manpages
+++ /dev/null
@@ -1 +0,0 @@
-man/man8/x2gobroker-authservice.8
\ No newline at end of file
diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install
index 99e4765..181d0d3 100644
--- a/debian/x2gobroker-common.install
+++ b/debian/x2gobroker-common.install
@@ -1,5 +1,5 @@
-etc/x2gobroker.conf etc/x2go/
-etc/broker/x2gobroker-sessionprofiles.conf etc/x2go/broker/
-etc/broker/x2gobroker-loggers.conf etc/x2go/broker/
-etc/broker/defaults.conf etc/x2go/broker/
-pam/x2gobroker etc/pam.d/
+etc/x2go/x2gobroker.conf
+etc/x2go/broker/x2gobroker-sessionprofiles.conf
+etc/x2go/broker/x2gobroker-loggers.conf
+etc/x2go/broker/defaults.conf
+etc/pam.d/x2gobroker
diff --git a/debian/x2gobroker-daemon.install b/debian/x2gobroker-daemon.install
index 7936661..31e94c0 100644
--- a/debian/x2gobroker-daemon.install
+++ b/debian/x2gobroker-daemon.install
@@ -1,3 +1,5 @@
-logrotate/x2gobroker-daemon etc/logrotate.d/
-sbin/x2gobroker-daemon-debug usr/sbin/
+etc/logrotate.d/x2gobroker-daemon
+usr/sbin/x2gobroker-daemon-debug
 usr/share/tmpfiles.d/x2gobroker-daemon.conf
+usr/share/man/man1/x2gobroker-daemon.1*
+usr/share/man/man8/x2gobroker-daemon-debug.8*
diff --git a/debian/x2gobroker-daemon.manpages b/debian/x2gobroker-daemon.manpages
deleted file mode 100644
index 4053510..0000000
--- a/debian/x2gobroker-daemon.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-man/man1/x2gobroker-daemon.1
-man/man8/x2gobroker-daemon-debug.8
\ No newline at end of file
diff --git a/debian/x2gobroker-loadchecker.install b/debian/x2gobroker-loadchecker.install
index 1d336bf..481ea76 100644
--- a/debian/x2gobroker-loadchecker.install
+++ b/debian/x2gobroker-loadchecker.install
@@ -1,4 +1,5 @@
-sbin/x2gobroker-loadchecker usr/sbin/
-logrotate/x2gobroker-loadchecker etc/logrotate.d/
-etc/broker/x2gobroker-loadchecker-logger.conf etc/x2go/broker
+usr/sbin/x2gobroker-loadchecker
+etc/logrotate.d/x2gobroker-loadchecker
+etc/x2go/broker/x2gobroker-loadchecker-logger.conf
 usr/share/tmpfiles.d/x2gobroker-loadchecker.conf
+usr/share/man/man8/x2gobroker-loadchecker.8*
diff --git a/debian/x2gobroker-loadchecker.manpages b/debian/x2gobroker-loadchecker.manpages
deleted file mode 100644
index 1832989..0000000
--- a/debian/x2gobroker-loadchecker.manpages
+++ /dev/null
@@ -1 +0,0 @@
-man/man8/x2gobroker-loadchecker.8
\ No newline at end of file
diff --git a/debian/x2gobroker-ssh.install b/debian/x2gobroker-ssh.install
index 834efe0..b935b4a 100644
--- a/debian/x2gobroker-ssh.install
+++ b/debian/x2gobroker-ssh.install
@@ -1,2 +1,3 @@
-bin/x2gobroker-ssh usr/bin/
-x2gobroker-ssh etc/sudoers.d/
+usr/bin/x2gobroker-ssh
+etc/sudoers.d/x2gobroker-ssh
+usr/share/man/man1/x2gobroker-ssh*
diff --git a/debian/x2gobroker-ssh.manpages b/debian/x2gobroker-ssh.manpages
deleted file mode 100644
index 6affa42..0000000
--- a/debian/x2gobroker-ssh.manpages
+++ /dev/null
@@ -1 +0,0 @@
-man/man1/x2gobroker-ssh.1
diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install
index 9278f62..743a1cc 100644
--- a/debian/x2gobroker-wsgi.install
+++ b/debian/x2gobroker-wsgi.install
@@ -1,3 +1,3 @@
-etc/x2gobroker-wsgi.apache.conf /etc/x2go/
-etc/x2gobroker-wsgi.apache.vhost /etc/x2go/
-logrotate/x2gobroker-wsgi etc/logrotate.d/
+etc/x2go/x2gobroker-wsgi.apache.conf
+etc/x2go/x2gobroker-wsgi.apache.vhost
+etc/logrotate.d/x2gobroker-wsgi
diff --git a/debian/x2gobroker.install b/debian/x2gobroker.install
index 2ca9256..cee4dba 100644
--- a/debian/x2gobroker.install
+++ b/debian/x2gobroker.install
@@ -1,4 +1,8 @@
-bin/x2gobroker usr/bin/
-bin/x2gobroker-testauth usr/bin/
-sbin/x2gobroker-keygen usr/sbin/
-sbin/x2gobroker-testagent usr/sbin/
+usr/bin/x2gobroker
+usr/bin/x2gobroker-testauth
+usr/sbin/x2gobroker-keygen
+usr/sbin/x2gobroker-testagent
+usr/share/man/man1/x2gobroker.1*
+usr/share/man/man1/x2gobroker-testauth.1*
+usr/share/man/man8/x2gobroker-keygen.8*
+usr/share/man/man8/x2gobroker-testagent.8*
diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages
deleted file mode 100644
index 44c2255..0000000
--- a/debian/x2gobroker.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-man/man1/x2gobroker.1
-man/man1/x2gobroker-testauth.1
-man/man8/x2gobroker-keygen.8
-man/man8/x2gobroker-testagent.8

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

More information about the x2go-commits mailing list