[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. debian/3.2.3-3-21-gfe991e2

Alexander Wirt formorer at grml.org
Fri Jun 15 08:45:34 UTC 2012 

The following commit has been merged in the master branch:
commit fe991e26b5c6c9cf74cdd0111a0ec2e39d5510e6
Author: Alexander Wirt <formorer at grml.org>
Date:   Fri Jun 15 10:45:20 2012 +0200

    wrap-and-sort

diff --git a/debian/control b/debian/control
index 22aae77..2c230eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,33 @@ Source: nagios3
 Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: sean finney <seanius at debian.org>, Alexander Wirt <formorer at debian.org>, Jan Wagner <waja at cyconet.org>
+Uploaders: sean finney <seanius at debian.org>,
+           Alexander Wirt <formorer at debian.org>,
+           Jan Wagner <waja at cyconet.org>
 Homepage: http://www.nagios.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios3.git
 Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios3.git
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev,
- libpng-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
- autotools-dev, dpkg-dev (>= 1.13.19), hardening-wrapper 
+Build-Depends: autotools-dev,
+               debhelper (>= 7),
+               dpatch (>= 2.0.10),
+               dpkg-dev (>= 1.13.19),
+               hardening-wrapper,
+               libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
+               libperl-dev,
+               libpng-dev,
+               po-debconf
 
 Package: nagios3-common
 Architecture: all
-Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
+Depends: adduser,
+         bsd-mailx | mailx,
+         coreutils (>= 4.5.3),
+         lsb-base (>= 3.0-6),
+         nagios-plugins-basic,
+         ucf (>= 0.28),
+         ${misc:Depends},
+         ${perl:Depends}
 Recommends: nagios-plugins
 Description: support files for nagios3
  Nagios is a monitoring and management system for hosts, services and
@@ -32,7 +47,7 @@ Description: support files for nagios3
  .
  Nagios is designed to be easy to understand and modify to fit your own needs.
  .
- This package is the new version 3.x series of nagios, which replaced 
+ This package is the new version 3.x series of nagios, which replaced
  the 2.x versions.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the
@@ -42,9 +57,17 @@ Description: support files for nagios3
 
 Package: nagios3-cgi
 Architecture: any
-Replaces: nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0), nagios3 (<< 3.2.0)
-Breaks: nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0), nagios3 (<< 3.2.0)
-Depends: nagios3-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libapache2-mod-php5 | php5 | php5-cgi
+Replaces: nagios3 (<< 3.2.0), nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0)
+Breaks: nagios3 (<< 3.2.0), nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0)
+Depends: adduser,
+         apache2-utils,
+         coreutils (>= 4.5.3),
+         libapache2-mod-php5 | php5 | php5-cgi,
+         nagios3-common (= ${source:Version}),
+         ucf (>= 0.28),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
 Recommends: apache2 | httpd, nagios-images (>> 0.1)
 Description: cgi files for nagios3
  Nagios is a monitoring and management system for hosts, services and
@@ -63,7 +86,7 @@ Description: cgi files for nagios3
  .
  Nagios is designed to be easy to understand and modify to fit your own needs.
  .
- This package is the new version 3.x series of nagios, which replaced 
+ This package is the new version 3.x series of nagios, which replaced
  the 2.x versions.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the
@@ -71,10 +94,11 @@ Description: cgi files for nagios3
  .
  Upstream URL: http://www.nagios.org/
 
-
 Package: nagios3
 Architecture: any
-Depends: nagios3-core (= ${binary:Version}), nagios3-cgi (= ${binary:Version}), ${misc:Depends}
+Depends: nagios3-cgi (= ${binary:Version}),
+         nagios3-core (= ${binary:Version}),
+         ${misc:Depends}
 Suggests: nagios-nrpe-plugin
 Description: A host/service/network monitoring and management system
  Nagios is a monitoring and management system for hosts, services and
@@ -93,10 +117,10 @@ Description: A host/service/network monitoring and management system
  .
  Nagios was written in C and is designed to be easy to understand and modify
  to fit your own needs.
- . 
+ .
  This is a metapackage which depends on the nagios core and the webfrontend
  .
- This package is the new version 3.x series of nagios, which replaced 
+ This package is the new version 3.x series of nagios, which replaced
  the 2.x versions.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the
@@ -106,7 +130,10 @@ Description: A host/service/network monitoring and management system
 
 Package: nagios3-core
 Architecture: any
-Depends: ${shlibs:Depends}, nagios3-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends}
+Depends: nagios3-common (= ${source:Version}),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
 Suggests: nagios-nrpe-plugin
 Replaces: nagios3
 Description: A host/service/network monitoring and management system core files
@@ -125,11 +152,11 @@ Description: A host/service/network monitoring and management system core files
   *  Web output (current status, notifications, problem history, log file, etc.)
  .
  This package included the nagios core without the webfrontend
- . 
+ .
  Nagios was written in C and is designed to be easy to understand and modify
  to fit your own needs.
  .
- This package is the new version 3.x series of nagios, which replaced 
+ This package is the new version 3.x series of nagios, which replaced
  the 2.x versions.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the
@@ -140,7 +167,7 @@ Description: A host/service/network monitoring and management system core files
 Package: nagios3-doc
 Section: doc
 Architecture: all
-Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Description: documentation for nagios3
  Nagios is a monitoring and management system for hosts, services and
  networks.
@@ -159,7 +186,7 @@ Description: documentation for nagios3
  Nagios was written in C and is designed to be easy to understand and modify
  to fit your own needs.
  .
- This package is the new version 3.x series of nagios, which replaced 
+ This package is the new version 3.x series of nagios, which replaced
  the 2.x versions.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the
@@ -171,8 +198,11 @@ Package: nagios3-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: nagios3-core (= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: icinga-dbg (<= 1.0.1-2) 
+Depends: nagios3-core (= ${binary:Version}),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
+Conflicts: icinga-dbg (<= 1.0.1-2)
 Description: debugging symbols and debug stuff for nagios3
  Nagios is a monitoring and management system for hosts, services and
  networks.
@@ -192,7 +222,7 @@ Description: debugging symbols and debug stuff for nagios3
  to fit your own needs.
  .
  This package contains gdb debugging symbols for the nagios3 binaries and the
- mini_epn tool which can help in debugging Nagios problems. 
+ mini_epn tool which can help in debugging Nagios problems.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the
  previous Netsaint modules transparently.
diff --git a/debian/copyright b/debian/copyright
index d4de65d..43377e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 This package was debianized by Alexander Wirt <formorer at debian.org> based on
-the work of sean finney <seanius at debian.org> for Nagios 2. 
+the work of sean finney <seanius at debian.org> for Nagios 2.
 
 It was downloaded from http://www.nagios.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
@@ -13,7 +13,7 @@ Upstream Author: Ethan Galstad <nagios at nagios.org>
 Copyright (c) 1999-2008 Ethan Galstad (nagios at nagios.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.
@@ -21,12 +21,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
@@ -34,5 +34,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/nagios3-cgi.install b/debian/nagios3-cgi.install
index 837aaec..d4e28fd 100644
--- a/debian/nagios3-cgi.install
+++ b/debian/nagios3-cgi.install
@@ -1,10 +1,10 @@
-debian/httpd.webapps-common /usr/share/nagios3/debian
 debian-configs/cgi.cfg /etc/nagios3
+debian/httpd.webapps-common /usr/share/nagios3/debian
+usr/lib/cgi-bin/*
 usr/share/nagios3/htdocs/*.php
-usr/share/nagios3/htdocs/media
 usr/share/nagios3/htdocs/contexthelp
-usr/share/nagios3/htdocs/robots.txt
 usr/share/nagios3/htdocs/images
 usr/share/nagios3/htdocs/includes
-usr/lib/cgi-bin/*
+usr/share/nagios3/htdocs/media
+usr/share/nagios3/htdocs/robots.txt
 usr/share/nagios3/htdocs/stylesheets/* /etc/nagios3/stylesheets/
diff --git a/debian/nagios3-common.install b/debian/nagios3-common.install
index 3a42c3f..bfe66c5 100644
--- a/debian/nagios3-common.install
+++ b/debian/nagios3-common.install
@@ -1,8 +1,8 @@
+contrib/eventhandlers/* usr/share/nagios3/plugins/eventhandlers
 debian-configs/* /etc/nagios3
-debian/resource.cfg /etc/nagios3
 debian/conf.d/* /etc/nagios3/conf.d
-sample-config/README /usr/share/doc/nagios3-common/examples
+debian/resource.cfg /etc/nagios3
 sample-config/*.cfg /usr/share/doc/nagios3-common/examples
-sample-config/template-object/README /usr/share/doc/nagios3-common/examples/template-object
+sample-config/README /usr/share/doc/nagios3-common/examples
 sample-config/template-object/*.cfg /usr/share/doc/nagios3-common/examples/template-object
-contrib/eventhandlers/* usr/share/nagios3/plugins/eventhandlers
+sample-config/template-object/README /usr/share/doc/nagios3-common/examples/template-object

-- 
Debian packaging for Nagios3

More information about the Pkg-nagios-changes mailing list