[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.0-1_netways-23-gffa914d

Thu Jun 14 21:39:10 UTC 2012

The following commit has been merged in the master branch:
commit ffa914d159abb55ef6afcbb1494e7e4895041a3f
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Jun 14 23:38:45 2012 +0200

    wrap-and-sort

diff --git a/debian/control b/debian/control
index 19b41ad..da42131 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: icinga-web
 Section: php
 Priority: extra
 Maintainer: Markus Frosch <markus at lazyfrosch.de>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, po-debconf
+Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf
 Standards-Version: 3.9.3
 Homepage: http://www.icinga.org
 Vcs-Git: git://git.debian.org/git/pkg-nagios/pkg-icinga-web.git
@@ -10,8 +10,17 @@ Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-icinga-web.git;a=summary
 
 Package: icinga-web
 Architecture: all
-Depends: icinga-core (>= 1.7.0), icinga-idoutils (>= 1.7.0), ucf, dbconfig-common, php5-cli, php5, php5-gd, php5-xsl, php5-mysql | php5-pgsql, ${misc:Depends}
-Recommends: mysql-client | postgresql-client, apache2 | httpd
+Depends: dbconfig-common,
+         icinga-core (>= 1.7.0),
+         icinga-idoutils (>= 1.7.0),
+         php5,
+         php5-cli,
+         php5-gd,
+         php5-mysql | php5-pgsql,
+         php5-xsl,
+         ucf,
+         ${misc:Depends}
+Recommends: apache2 | httpd, mysql-client | postgresql-client
 Description: host and network monitoring system - modern web interface
  Icinga is a modular monitoring framework for hosts, services, and
  networks, based on the Nagios project. It is designed to be easy to
@@ -35,7 +44,7 @@ Description: host and network monitoring system - modern web interface
 
 Package: icinga-web-pnp
 Architecture: all
-Depends: pnp4nagios, icinga-web (= ${source:Version}), ${misc:Depends}
+Depends: icinga-web (= ${source:Version}), pnp4nagios, ${misc:Depends}
 Description: host and network monitoring system - modern web interface plugin for pnp4nagios
  Icinga is a modular monitoring framework for hosts, services, and
  networks, based on the Nagios project. It is designed to be easy to
@@ -54,4 +63,3 @@ Description: host and network monitoring system - modern web interface plugin fo
  .
  This package provides a plugin for Icinga new webinterface integrating
  pnp4nagios into the interface for accessing the pnp4nagio data directly.
-
diff --git a/debian/copyright b/debian/copyright
index 9b87920..9450b62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ License: GPL-3
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program; if not, write to the 
+ along with this program; if not, write to the
  .
  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  A 02110-1301, USA.
@@ -39,7 +39,7 @@ License: GPL-3
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program; if not, write to the 
+ along with this program; if not, write to the
  .
  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  A 02110-1301, USA.
@@ -73,20 +73,20 @@ License: LGPL-2.1+
 Files: lib/agavi/src/config/schematron/*
 Copyright: Copyright (c) 2000-2010 Rick Jelliffe and Academia Sinica Computing Center, Taiwan
 License: BSD
- This software is provided 'as-is', without any express or implied warranty. 
- In no event will the authors be held liable for any damages arising from 
+ This software is provided 'as-is', without any express or implied warranty.
+ In no event will the authors be held liable for any damages arising from
  the use of this software.
  .
- Permission is granted to anyone to use this software for any purpose, 
+ Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it freely,
  subject to the following restrictions:
  .
  1. The origin of this software must not be misrepresented; you must not claim
- that you wrote the original software. If you use this software in a product, 
- an acknowledgment in the product documentation would be appreciated but is 
+ that you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
  not required.
  .
- 2. Altered source versions must be plainly marked as such, and must not be 
+ 2. Altered source versions must be plainly marked as such, and must not be
  misrepresented as being the original software.
  .
  3. This notice may not be removed or altered from any source distribution.
@@ -143,7 +143,7 @@ License: BSD
  Unicode and the Unicode logo are trademarks of Unicode, Inc., and may be registered in some
  jurisdictions. All other trademarks and registered trademarks mentioned herein are the property
  of their respective owners.
- 
+
 Files: lib/doctrine/*
 Copyright: 2006-2009 Jonathan H. Wage <jonwage at gmail.com>
            2005-2007 Konsta Vesterinen <kvesteri at cc.hut.fi>
@@ -159,7 +159,7 @@ License: LGPL-2.1
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software 
+ License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  MA 02110-1301, USA.
  .
@@ -221,15 +221,15 @@ License: BSD
  .
      * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
- . 
+ .
      * Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the documentation
        and/or other materials provided with the distribution.
- . 
+ .
      * Neither the name of Zend Technologies USA, Inc. nor the names of its
        contributors may be used to endorse or promote products derived from this
        software without specific prior written permission.
- . 
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -255,7 +255,7 @@ License: GPL-3
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program; if not, write to the 
+ along with this program; if not, write to the
  .
  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  A 02110-1301, USA.
@@ -358,7 +358,7 @@ License: GPL-3
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program; if not, write to the 
+ along with this program; if not, write to the
  .
  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  A 02110-1301, USA.
@@ -366,4 +366,3 @@ License: GPL-3
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
-
diff --git a/debian/icinga-web-pnp.install b/debian/icinga-web-pnp.install
index 8087ca4..65f6a66 100644
--- a/debian/icinga-web-pnp.install
+++ b/debian/icinga-web-pnp.install
@@ -1,3 +1,3 @@
-contrib/PNP_Integration/templateExtensions/* /usr/share/icinga-web/app/modules/Cronks/data/xml/extensions
-contrib/PNP_Integration/doc/* usr/share/doc/icinga-web-pnp
 contrib/PNP_Integration/README usr/share/doc/icinga-web-pnp
+contrib/PNP_Integration/doc/* usr/share/doc/icinga-web-pnp
+contrib/PNP_Integration/templateExtensions/* /usr/share/icinga-web/app/modules/Cronks/data/xml/extensions
diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 5be4fff..9170282 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -1,29 +1,29 @@
-debian/apache2.conf /etc/icinga-web
 
-etc/icinga-web/conf.d/* 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/pub/* usr/share/icinga-web/pub
-usr/pub/.htaccess usr/share/icinga-web/pub
 
+
+
+
+
+
+debian/apache2.conf /etc/icinga-web
+debian/cronks.xml etc/icinga-web/conf.d
+debian/database-ido.xml.tmpl usr/share/icinga-web/tmpl
+debian/database-web.xml.tmpl usr/share/icinga-web/tmpl
+debian/databases.xml etc/icinga-web/conf.d
+debian/module_reporting.xml etc/icinga-web/conf.d
+etc/icinga-web/conf.d/* 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/etc/schema/* usr/share/icinga-web/database
 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/bin/clearcache.sh usr/lib/icinga-web/bin
-
-usr/etc/schema/* usr/share/icinga-web/database
-
-usr/doc/* usr/share/doc/icinga-web
-
-debian/databases.xml etc/icinga-web/conf.d
-debian/database-web.xml.tmpl usr/share/icinga-web/tmpl
-debian/database-ido.xml.tmpl usr/share/icinga-web/tmpl
-
+usr/pub/* usr/share/icinga-web/pub
+usr/pub/.htaccess usr/share/icinga-web/pub

-- 
Debian packaging of icinga-web

