[Pkg-nagios-changes] [pkg-icinga2] 03/03: Fix another conflicht

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu-noma
in repository pkg-icinga2.

commit dd60a4d8801ea07733890b8b8f90b930e38a3c92
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Feb 25 11:38:21 2016 +0100

    Fix another conflicht
---
 debian/rules | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7a2fc64..4846b6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-<<<<<<< HEAD
 	dh $@
-=======
-	dh $@ --with systemd --with bash_completion
->>>>>>> master
 
 override_dh_auto_build:
 	dh_auto_build --parallel
@@ -37,22 +33,11 @@ override_dh_auto_install:
 	# remove features-enabled - these will be activated by postinst later
 	rm -r debian/tmp/etc/icinga2/features-enabled/*
 
-<<<<<<< HEAD
 override_dh_install:
 	dh_install -Xprepare-dirs
 	# remove ido files from other packages
 	if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi
 	rm debian/libicinga2/usr/lib/icinga2/libdb_ido_*
-=======
-override_dh_install-indep:
-	dh_install -i
-	chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs
-	rm debian/icinga2-common/etc/icinga2/features-available/ido-*
-
-override_dh_install-arch:
-	dh_install -a
-	rm debian/libicinga2/usr/lib/*/icinga2/libdb_ido_*
->>>>>>> master
 	for dbms in mysql pgsql; do \
 		mkdir -p debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/install ; \
 		mkdir -p debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/upgrade/$$dbms; \

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