[Pkg-nagios-changes] [pkg-check-mk] 01/01: change how the -common stuff gets setup

[Matt Taggart]

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

taggart pushed a commit to branch master
in repository pkg-check-mk.

commit 07219d905cf68171034c2706337a77e1fa0a2f8e
Author: Matt Taggart <taggart at debian.org>
Date:   Fri Aug 4 11:08:18 2017 -0700

    change how the -common stuff gets setup
---
 debian/rules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index db31555..82af324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ install: build
 	dh_installdirs
 	dh_installdebconf
 	mkdir -p debian/tmp
-	DESTDIR=debian/tmp python_lib_dir=/usr/share/check-mk ./setup.sh --yes
+	DESTDIR=debian/tmp python_lib_dir=/python ./setup.sh --yes
 	## clean up binaries shipped by upstream
 	# upstream agent deb and rpm
 	rm -rf debian/tmp/usr/share/check_mk/agent/check-mk-agent*.deb
@@ -87,20 +87,20 @@ install: build
 	## cleanup shipped byte-compiled python and regenerate it
 	#rm -rf debian/tmp/usr/lib/python2.7/dist-packages/cmk_base/*.pyc
 	#rm -rf debian/tmp/usr/lib/python2.7/dist-packages/cmk/*.pyc
-	# create a directory for the common package
-	mkdir -p debian/check-mk-common/usr/share/check-mk/
-	mv debian/tmp/usr/share/check_mk/cmk debian/check-mk-common/usr/share/check_mk/
-	mv debian/tmp/usr/share/check_mk/cmk_base debian/check-mk-common/usr/share/check_mk/
 	## config files
 	# We need a "paths.py" file with edited paths for FHS and monitoring
 	#  system changes
 	# remove the provided one
-	rm debian/check-mk-common/usr/share/check_mk/cmk/paths.py
+	rm debian/tmp/python/cmk/paths.py
 	# copy an icinga specific one into the icinga config package
 	cp debian/paths.py.icinga debian/check-mk-config-icinga/usr/share/check_mk/cmk/paths.py
 	# provide a safe apache config that references icinga
 	mkdir -p debian/check-mk-config-icinga/etc/apache2/conf-available/
 	cp debian/apache.icinga debian/check-mk-config-icinga/etc/apache2/conf-available/check-mk-multisite.conf
+	# create a directory for the common package
+	mkdir -p debian/check-mk-common/usr/share/check-mk/python/
+	# move the python stuff to it
+	mv debian/tmp/python/* debian/check-mk-common/usr/share/check_mk/python/
 	# Adjust path names
 	# sed -i 's#/nagios/cgi-bin/#/cgi-bin/icinga/#' debian/tmp/check-mk-config-icinga/etc/icinga/objects/check_mk_templates.cfg
 	# Prepare agent files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-check-mk.git