[Pkg-nagios-changes] [icinga] 27/36: Align paths in install & links files.

Bas Couwenberg sebastic at debian.org
Sun Dec 18 16:10:36 UTC 2016


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

sebastic pushed a commit to branch modern-packaging
in repository icinga.

commit a44770c36f4b61aecaa9dd62d2b61ea4a7bc3abb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 18 12:56:51 2016 +0100

    Align paths in install & links files.
---
 debian/icinga-cgi-bin.install  |  2 +-
 debian/icinga-cgi-bin.links    |  2 +-
 debian/icinga-cgi.install      |  4 ++--
 debian/icinga-cgi.links        |  2 +-
 debian/icinga-common.install   | 16 ++++++++--------
 debian/icinga-idoutils.install |  2 +-
 debian/icinga-idoutils.links   |  5 -----
 7 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/debian/icinga-cgi-bin.install b/debian/icinga-cgi-bin.install
index 69f2cef..e0c1381 100644
--- a/debian/icinga-cgi-bin.install
+++ b/debian/icinga-cgi-bin.install
@@ -5,4 +5,4 @@ usr/share/icinga/htdocs/images
 usr/share/icinga/htdocs/js/*
 usr/share/icinga/htdocs/media
 usr/share/icinga/htdocs/robots.txt
-usr/share/icinga/htdocs/stylesheets/* /etc/icinga/stylesheets/
+usr/share/icinga/htdocs/stylesheets/* etc/icinga/stylesheets/
diff --git a/debian/icinga-cgi-bin.links b/debian/icinga-cgi-bin.links
index a08c078..a750064 100644
--- a/debian/icinga-cgi-bin.links
+++ b/debian/icinga-cgi-bin.links
@@ -1,2 +1,2 @@
 usr/share/javascript/jquery/jquery.min.js usr/share/icinga/htdocs/js/jquery-1.8.0.min.js
-usr/share/javascript/jquery-ui usr/share/icinga/htdocs/jquery-ui
+usr/share/javascript/jquery-ui            usr/share/icinga/htdocs/jquery-ui
diff --git a/debian/icinga-cgi.install b/debian/icinga-cgi.install
index 1b4e180..7afe6a7 100644
--- a/debian/icinga-cgi.install
+++ b/debian/icinga-cgi.install
@@ -1,2 +1,2 @@
-debian-configs/cgi.cfg /etc/icinga
-debian/apache2.conf /usr/share/icinga
+debian-configs/cgi.cfg etc/icinga
+debian/apache2.conf    usr/share/icinga
diff --git a/debian/icinga-cgi.links b/debian/icinga-cgi.links
index 262c6e2..febd5fb 100644
--- a/debian/icinga-cgi.links
+++ b/debian/icinga-cgi.links
@@ -1,2 +1,2 @@
-etc/icinga/stylesheets usr/share/icinga/stylesheets
+etc/icinga/stylesheets  usr/share/icinga/stylesheets
 etc/icinga/apache2.conf etc/apache2/conf-available/icinga.conf
diff --git a/debian/icinga-common.install b/debian/icinga-common.install
index 7e13dd8..1992f2f 100644
--- a/debian/icinga-common.install
+++ b/debian/icinga-common.install
@@ -1,8 +1,8 @@
-contrib/eventhandlers/* usr/share/icinga/plugins/eventhandlers
-debian-configs/* /etc/icinga
-debian/conf.d/* /etc/icinga/objects
-debian/resource.cfg /etc/icinga
-sample-config/*.cfg /usr/share/doc/icinga-common/examples
-sample-config/README /usr/share/doc/icinga-common/examples
-sample-config/template-object/*.cfg /usr/share/doc/icinga-common/examples/template-object
-sample-config/template-object/README /usr/share/doc/icinga-common/examples/template-object
+contrib/eventhandlers/*              usr/share/icinga/plugins/eventhandlers
+debian-configs/*                     etc/icinga
+debian/conf.d/*                      etc/icinga/objects
+debian/resource.cfg                  etc/icinga
+sample-config/*.cfg                  usr/share/doc/icinga-common/examples
+sample-config/README                 usr/share/doc/icinga-common/examples
+sample-config/template-object/*.cfg  usr/share/doc/icinga-common/examples/template-object
+sample-config/template-object/README usr/share/doc/icinga-common/examples/template-object
diff --git a/debian/icinga-idoutils.install b/debian/icinga-idoutils.install
index bf2c94b..285e97a 100644
--- a/debian/icinga-idoutils.install
+++ b/debian/icinga-idoutils.install
@@ -1,2 +1,2 @@
-debian/db/admin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/
+debian/db/admin/pgsql                    usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/
 module/idoutils/config/ido2db.cfg-sample usr/share/icinga/tmpl
diff --git a/debian/icinga-idoutils.links b/debian/icinga-idoutils.links
index 930d365..c583e1d 100644
--- a/debian/icinga-idoutils.links
+++ b/debian/icinga-idoutils.links
@@ -1,12 +1,7 @@
 usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/pgsql/1.6.0-1
-
 usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/pgsql/1.5.0-1
-
 usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/pgsql/1.4.0-1
-
 usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/pgsql/1.2.99-1
-
 usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/pgsql/1.0.3-1
-
 usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/upgrade-dbadmin/pgsql/1.0.2-2
 

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



More information about the Pkg-nagios-changes mailing list