[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-3-9-g2ebdf35

[Alexander Wirt]

The following commit has been merged in the master branch:
commit ab9a6aa6bf26f0030b9367d70c0c8662dee91f4f
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat May 12 06:45:11 2012 +0200

    Update rules file for 1.7

diff --git a/debian/rules b/debian/rules
index b129226..2a9dfeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ CONFIGURE	= CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr \
 				--infodir=/usr/share/info \
 				--libexecdir=/usr/lib/nagios/plugins \
 				--localstatedir=/var/lib/icinga \
+				--with-state-dir=/var/cache/icinga \
 				--enable-event-broker \
 				--enable-embedded-perl \
 				--with-icinga-user=nagios \
@@ -37,7 +38,10 @@ CONFIGURE	= CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr \
 				--with-htmurl=/icinga \
 				--with-cgiurl=/cgi-bin/icinga \
 				--with-p1-file-dir=/usr/lib/icinga/ \
-				--enable-idoutils
+				--enable-idoutils \
+				--with-ido2db-lockfile=/var/run/icinga/ido2db.pid \
+				--with-log-dir=/var/log/icinga/ \
+				--libdir=/usr/lib/icinga/
 
 clean: clean-patched unpatch
 clean-patched:
@@ -124,9 +128,8 @@ install-stamp: build-stamp fix-configs-stamp
 	#We have to rename the sample files 
 	#mv $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample $b/icinga-idoutils/etc/icinga/ido2db.cfg
 	mv $b/icinga-idoutils/etc/icinga/idomod.cfg-sample $b/icinga-idoutils/etc/icinga/idomod.cfg
-	mv $b/icinga-idoutils/usr/sbin/idomod.o $b/icinga-idoutils/usr/lib/icinga/
-	mkdir -p $b/icinga-idoutils/usr/share/doc/idoutils/examples
-	mv $b/icinga-idoutils/etc/icinga/modules/idoutils.cfg-sample $b/icinga-idoutils/usr/share/doc/idoutils/examples
+	mkdir -p $b/icinga-idoutils/usr/share/doc/icinga-idoutils/examples
+	mv $b/icinga-idoutils/etc/icinga/modules/idoutils.cfg-sample $b/icinga-idoutils/usr/share/doc/icinga-idoutils/examples
 	cp module/idoutils/db/mysql/mysql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/mysql
 	cp module/idoutils/db/pgsql/pgsql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/pgsql
 	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/
@@ -139,11 +142,13 @@ install-stamp: build-stamp fix-configs-stamp
 	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.4.0.sql
 	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.5.0-1.sql
 	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.6.0-1.sql
+	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.7.0-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.1-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.2.99-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.5.0-1.sql
 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.6.0-1.sql
+	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.7.0-1.sql
 	# set up /var/cache/icinga for access by www-data
 	chgrp www-data ${b}/icinga-common/var/cache/icinga
 	chmod g+s ${b}/icinga-common/var/cache/icinga

-- 
debian packaging of icinga(-core)