[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-1-12-ga58845a

[Markus Frosch]

The following commit has been merged in the master branch:
commit c53e58bc64eb9272e3445cab0f2f92f204179ffa
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Jun 28 11:13:53 2012 +0200

    Revert "moved htaccess files to /etc/icinga-web with respective symlinks"
    
    This reverts commit 3fca3a41703a84f94064190be7184fdc3640db43.

diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 2cc5687..a7d16b8 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -15,6 +15,5 @@ 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/pub/soap/* usr/share/icinga-web/pub/soap
+usr/pub/* usr/share/icinga-web/pub
+usr/pub/.htaccess usr/share/icinga-web/pub
diff --git a/debian/icinga-web.links b/debian/icinga-web.links
deleted file mode 100644
index 886b375..0000000
--- a/debian/icinga-web.links
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/icinga-web/htaccess usr/share/icinga-web/pub/.htaccess
-etc/icinga-web/htaccess-soap usr/share/icinga-web/pub/soap/.htaccess
diff --git a/debian/rules b/debian/rules
index c3a2a5f..86e3415 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,9 +51,6 @@ override_dh_install:
 	# PGSQL schema for dbconfig-common
 	cp etc/schema/pgsql.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/install/pgsql
 	cp etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql ${b}/icinga-web/usr/share/dbconfig-common/data/icinga-web/upgrade/pgsql/1.7.1-1
-	# htaccess files to /etc
-	cp ${b}/tmp/usr/pub/.htaccess ${b}/icinga-web/etc/icinga-web/htaccess
-	cp ${b}/tmp/usr/pub/soap/.htaccess ${b}/icinga-web/etc/icinga-web/htaccess-soap
 	###
 	# PNP
 	###

-- 
Debian packaging of icinga-web