[Pkg-nagios-changes] [pkg-icinga2] 01/02: Wrap and sort
Alexander Wirt
formorer at debian.org
Mon Jun 16 13:38:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch master
in repository pkg-icinga2.
commit 1fc2d37e0e293a84fac5c22372b2a96d04a607ae
Author: Alexander Wirt <formorer at debian.org>
Date: Mon Jun 16 15:37:07 2014 +0200
Wrap and sort
---
debian/control | 61 ++++++++++++++++++++--------------------
debian/copyright | 13 ++++-----
debian/icinga2-bin.install | 2 +-
debian/icinga2-common.install | 2 +-
debian/icinga2-ido-mysql.install | 2 +-
debian/icinga2-ido-pgsql.install | 4 +--
6 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/debian/control b/debian/control
index 4d9c9c7..4e334fe 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,24 @@ Source: icinga2
Section: admin
Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders:
- Markus Frosch <markus at lazyfrosch.de>,
- Alexander Wirt <formorer at debian.org>
-Build-Depends:
- cmake (>= 2.8.7),
- make (>= 3.81),
- bison,
- debhelper (>= 9),
- flex,
- g++ (>= 1.96),
- libboost-dev,
- libboost-program-options-dev,
- libboost-system-dev,
- libboost-test-dev,
- libboost-thread-dev,
- libboost-regex-dev,
- libmysqlclient-dev,
- libpq-dev,
- libssl-dev,
- po-debconf,
+Uploaders: Markus Frosch <markus at lazyfrosch.de>,
+ Alexander Wirt <formorer at debian.org>
+Build-Depends: bison,
+ cmake (>= 2.8.7),
+ debhelper (>= 9),
+ flex,
+ g++ (>= 1.96),
+ libboost-dev,
+ libboost-program-options-dev,
+ libboost-regex-dev,
+ libboost-system-dev,
+ libboost-test-dev,
+ libboost-thread-dev,
+ libmysqlclient-dev,
+ libpq-dev,
+ libssl-dev,
+ make (>= 3.81),
+ po-debconf
Standards-Version: 3.9.5
Homepage: http://www.icinga.org
@@ -78,7 +76,8 @@ Package: icinga2-bin
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: icinga2-common (= ${source:Version}),
- ${misc:Depends}, ${shlibs:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: host and network monitoring system - daemon
Icinga 2 is a general-purpose monitoring application and the next generation
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
@@ -125,8 +124,8 @@ Description: host and network monitoring system - documentation
Package: icinga2-classicui
Architecture: all
-Depends: icinga2-common (= ${source:Version}),
- icinga-cgi-bin | icinga-cgi (>= 1.9.0~),
+Depends: icinga-cgi-bin | icinga-cgi (>= 1.9.0~),
+ icinga2-common (= ${source:Version}),
${misc:Depends}
Recommends: apache2 | httpd
Description: host and network monitoring system - classic ui integration
@@ -154,9 +153,10 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Conflicts: icinga2-ido-pgsql
Depends: dbconfig-common,
- icinga2-common (= ${source:Version}),
icinga2-bin (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+ icinga2-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: mysql-client
Suggests: mysql-server
Description: host and network monitoring system - IDO for MySQL
@@ -183,9 +183,10 @@ Package: icinga2-ido-pgsql
Architecture: any
Conflicts: icinga2-ido-mysql
Pre-Depends: ${misc:Pre-Depends}
-Depends: icinga2-common (= ${source:Version}),
- icinga2-bin (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: icinga2-bin (= ${binary:Version}),
+ icinga2-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: postgresql-client
Suggests: postgresql
Description: host and network monitoring system - IDO for PostgreSQL
@@ -212,8 +213,7 @@ Package: icinga2-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: icinga2-bin (= ${binary:Version}),
- ${misc:Depends}
+Depends: icinga2-bin (= ${binary:Version}), ${misc:Depends}
Description: host and network monitoring system - debug symbols
Icinga 2 is a general-purpose monitoring application and the next generation
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
@@ -233,4 +233,3 @@ Description: host and network monitoring system - debug symbols
* Native support for Livestatus and Graphite
.
This package provides debug symbols for Icinga 2.
-
diff --git a/debian/copyright b/debian/copyright
index ec8990b..5911269 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -104,11 +104,11 @@ License: GPL-1+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-1".
-Files: third-party/cmake/BoostTestTargets.*
- third-party/cmake/CopyResourcesToBuildTree.cmake
+Files: third-party/cmake/BoostTestTargets.*
+ third-party/cmake/CopyResourcesToBuildTree.cmake
third-party/cmake/GetForceIncludeDefinitions.cmake
third-party/cmake/GetGitRevisionDescription.cmake.in
-
+
Copyright: 2009-2010 Ryan Pavlik <rpavlik at iastate.edu> <abiryan at ryand.net>
2009-2010 Iowa State University
License: Boost Software License 1.0
@@ -169,7 +169,7 @@ License: BSD-3-clause
.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
+ See the License for more information.
Files: third-party/cmake/FindGit.cmake
Copyright: 2010 Kitware, Inc.
@@ -205,7 +205,7 @@ License: BSD-3-clause
.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
+ See the License for more information.
Files: third-party/cmake/FindPostgreSQL.cmake
Copyright: 2004-2009 Kitware, Inc.
@@ -240,5 +240,4 @@ License: BSD-3-clause
.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-
+ See the License for more information.
diff --git a/debian/icinga2-bin.install b/debian/icinga2-bin.install
index a4c3401..da8e7bd 100644
--- a/debian/icinga2-bin.install
+++ b/debian/icinga2-bin.install
@@ -1,3 +1,3 @@
-usr/sbin/icinga2
usr/lib/*/icinga2
+usr/sbin/icinga2
usr/share/man/man8/icinga2.8
diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
index 64f26ec..a97e0a8 100644
--- a/debian/icinga2-common.install
+++ b/debian/icinga2-common.install
@@ -1,6 +1,6 @@
+debian/config/apt.conf etc/icinga2/conf.d/hosts/localhost
debian/tmp/etc/icinga2
debian/tmp/etc/logrotate.d
-debian/config/apt.conf etc/icinga2/conf.d/hosts/localhost
tools/syntax/* usr/share/icinga2-common/syntax
usr/bin/icinga2-build*
usr/bin/icinga2-sign-key
diff --git a/debian/icinga2-ido-mysql.install b/debian/icinga2-ido-mysql.install
index 1a42d3f..9fb84f5 100644
--- a/debian/icinga2-ido-mysql.install
+++ b/debian/icinga2-ido-mysql.install
@@ -1,3 +1,3 @@
-usr/lib/*/icinga2/libdb_ido_mysql*
components/db_ido_mysql/schema/*.sql usr/share/icinga2-ido-mysql/schema
debian/ido-mysql.conf-sample usr/share/icinga2/tmpl
+usr/lib/*/icinga2/libdb_ido_mysql*
diff --git a/debian/icinga2-ido-pgsql.install b/debian/icinga2-ido-pgsql.install
index 44512c0..570da3c 100644
--- a/debian/icinga2-ido-pgsql.install
+++ b/debian/icinga2-ido-pgsql.install
@@ -1,4 +1,4 @@
-usr/lib/*/icinga2/libdb_ido_pgsql*
+
components/db_ido_pgsql/schema/*.sql usr/share/icinga2-ido-pgsql/schema
debian/ido-pgsql.conf-sample usr/share/icinga2/tmpl
-
+usr/lib/*/icinga2/libdb_ido_pgsql*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list