[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.8.3-1-32-g1d1a585

[Markus Frosch]

The following commit has been merged in the master branch:
commit 020f7f48e3e136d67e29bd8f74d7b89180be5922
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed May 8 15:47:31 2013 +0200

    Switched to new build prefix and updated paths in install
    
    This helps us to use the upstream Apache configuration
    without touching it.

diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index cb49e58..2787681 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -6,13 +6,13 @@ debian/databases.xml etc/icinga-web/conf.d
 debian/cronks.xml etc/icinga-web/conf.d
 debian/module_reporting.xml etc/icinga-web/conf.d
 
-usr/app/* usr/share/icinga-web/app
-usr/bin/clearcache.sh usr/lib/icinga-web/bin
-usr/doc/* usr/share/doc/icinga-web
-usr/lib/agavi usr/share/icinga-web/lib
-usr/lib/doctrine usr/share/icinga-web/lib
-usr/lib/ext3 usr/share/icinga-web/lib
-usr/lib/jit usr/share/icinga-web/lib
-usr/lib/jsgettext usr/share/icinga-web/lib
-usr/lib/phpseclib usr/share/icinga-web/lib
-usr/pub/index.php usr/pub/api/ usr/pub/images/ usr/pub/styles/ usr/share/icinga-web/pub
+usr/share/icinga-web/app/* usr/share/icinga-web/app
+usr/share/icinga-web/bin/clearcache.sh usr/lib/icinga-web/bin
+usr/share/icinga-web/doc/* usr/share/doc/icinga-web
+usr/share/icinga-web/lib/agavi usr/share/icinga-web/lib
+usr/share/icinga-web/lib/doctrine usr/share/icinga-web/lib
+usr/share/icinga-web/lib/ext3 usr/share/icinga-web/lib
+usr/share/icinga-web/lib/jit usr/share/icinga-web/lib
+usr/share/icinga-web/lib/jsgettext usr/share/icinga-web/lib
+usr/share/icinga-web/lib/phpseclib usr/share/icinga-web/lib
+usr/share/icinga-web/pub/* usr/share/icinga-web/pub
diff --git a/debian/rules b/debian/rules
index 2df2890..20338ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ b := $(shell pwd)/debian
 	dh --buildsystem=autoconf $@
 
 override_dh_auto_configure:
-	./configure --prefix=/usr \
+	./configure --prefix=/usr/share/icinga-web \
 	--bindir=/usr/lib/icinga-web/bin \
 	--sysconfdir=/etc/icinga-web \
 	--datarootdir=/usr/share/icinga-web \
@@ -41,13 +41,13 @@ override_dh_auto_test:
 
 override_dh_install:
 	# removed INSTALL for policy
-	rm ${b}/tmp/usr/doc/INSTALL
+	rm ${b}/tmp/usr/share/icinga-web/doc/INSTALL
 	# remove LICENSE files for packages - see debian/copyright
-	rm ${b}/tmp/usr/doc/LICENSE
+	rm ${b}/tmp/usr/share/icinga-web/doc/LICENSE
 	# Remove empty paths
-	rm -rf ${b}/tmp/usr/lib/agavi/src/build/
-	rmdir ${b}/tmp/usr/app/modules/Reporting/data/
-	rmdir ${b}/tmp/usr/app/data/i18n/po/
+	rm -rf ${b}/tmp/usr/share/icinga-web/lib/agavi/src/build/
+	rmdir ${b}/tmp/usr/share/icinga-web/app/modules/Reporting/data/
+	rmdir ${b}/tmp/usr/share/icinga-web/app/data/i18n/po/
 	# Install the rest
 	dh_install
 	# MySQL schema for dbconfig-common

-- 
Debian packaging of icinga-web