[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.7.2-1-2-g3e31fec

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 3e31fec27cf8d5f9afd8f8b20137c842a3a5a67f
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Oct 1 08:19:46 2012 +0200

    Even more wrap-and-sort
    
    Git-Dch-Ignore

diff --git a/debian/copyright b/debian/copyright
index 0a88637..71072be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
-This package was debianized by Alexander Wirt <formorer at debian.org>.  
+This package was debianized by Alexander Wirt <formorer at debian.org>.
 
 It was downloaded from http://www.icinga.org/
 
-Current Debian Maintainers: The nagios packaging packaging team 
+Current Debian Maintainers: The nagios packaging packaging team
 			    http://alioth.debian.org/projects/pkg-nagios/
 
 Mailing-List: 	pkg-nagios-devel at lists.alioth.debian.org
@@ -14,7 +14,7 @@ Copyright (c) 1999-2009 Ethan Galstad (nagios at nagios.org)
 Copyright (c) 2009-2010 Icinga Development Team (info at icinga.org)
 
 License:
- 
+
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
 published by the Free Software Foundation.
@@ -22,12 +22,12 @@ published by the Free Software Foundation.
 On Debian systems, the complete text of the GNU General Public
 License, version 2, can be found in /usr/share/common-licenses/GPL-2.
 
-p1.pl is Copyright 2007 by Stanley Hopcroft 
+p1.pl is Copyright 2007 by Stanley Hopcroft
 
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
-On Debian systems, the complete text of the Artistic 
+On Debian systems, the complete text of the Artistic
 License, can be found in /usr/share/common-licenses/Artistic.
 
 The file common/snprintf.c is Copyright 1995 by Patrick Powell
@@ -35,5 +35,3 @@ The file common/snprintf.c is Copyright 1995 by Patrick Powell
 This code is based on code written by Patrick Powell (papowell at astart.com)
 It may be used for any purpose as long as this notice remains intact
 on all source code distributions
-
-
diff --git a/debian/icinga-cgi.install b/debian/icinga-cgi.install
index 87a0931..9c33554 100644
--- a/debian/icinga-cgi.install
+++ b/debian/icinga-cgi.install
@@ -1,10 +1,10 @@
-debian/httpd.webapps-common /usr/share/icinga/debian
 debian-configs/cgi.cfg /etc/icinga
+debian/httpd.webapps-common /usr/share/icinga/debian
+usr/lib/cgi-bin/*
 usr/share/icinga/htdocs/*.html
-usr/share/icinga/htdocs/media
 usr/share/icinga/htdocs/contexthelp
-usr/share/icinga/htdocs/robots.txt
 usr/share/icinga/htdocs/images
-usr/lib/cgi-bin/*
+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/js/* 
diff --git a/debian/icinga-common.install b/debian/icinga-common.install
index c48d5bd..7e13dd8 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/resource.cfg /etc/icinga
 debian/conf.d/* /etc/icinga/objects
-sample-config/README /usr/share/doc/icinga-common/examples
+debian/resource.cfg /etc/icinga
 sample-config/*.cfg /usr/share/doc/icinga-common/examples
-sample-config/template-object/README /usr/share/doc/icinga-common/examples/template-object
+sample-config/README /usr/share/doc/icinga-common/examples
 sample-config/template-object/*.cfg /usr/share/doc/icinga-common/examples/template-object
-contrib/eventhandlers/* usr/share/icinga/plugins/eventhandlers
+sample-config/template-object/README /usr/share/doc/icinga-common/examples/template-object
diff --git a/debian/icinga-core.install b/debian/icinga-core.install
index d47e092..3cb4bbc 100644
--- a/debian/icinga-core.install
+++ b/debian/icinga-core.install
@@ -1,3 +1,3 @@
+usr/lib/icinga/p1.pl
 usr/sbin/icinga
 usr/sbin/icingastats
-usr/lib/icinga/p1.pl
diff --git a/debian/icinga-doc.install b/debian/icinga-doc.install
index 9b5d22b..52f4e37 100644
--- a/debian/icinga-doc.install
+++ b/debian/icinga-doc.install
@@ -1 +1 @@
-usr/share/icinga/htdocs/docs 
+usr/share/icinga/htdocs/docs
diff --git a/debian/icinga-idoutils.install b/debian/icinga-idoutils.install
index 346ec5f..bf2c94b 100644
--- a/debian/icinga-idoutils.install
+++ b/debian/icinga-idoutils.install
@@ -1,2 +1,2 @@
-module/idoutils/config/ido2db.cfg-sample usr/share/icinga/tmpl 
 debian/db/admin/pgsql usr/share/dbconfig-common/data/icinga-idoutils/install-dbadmin/
+module/idoutils/config/ido2db.cfg-sample usr/share/icinga/tmpl

-- 
debian packaging of icinga(-core)