[Pkg-nagios-changes] [icinga] 01/01: Merge branch 'master' into debmon-wheezy

Alexander Wirt formorer at debian.org
Wed Jul 15 15:50:05 UTC 2015


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

formorer pushed a commit to branch debmon-wheezy
in repository icinga.

commit 2a7c8b7af6d3047506bc409cfb49cbf52040f1c6
Merge: fba80ca 443fb9e
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Jul 15 17:35:55 2015 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 .mailmap                                           |   1 +
 AUTHORS                                            |   3 +
 Changelog                                          | 136 +++--
 INSTALLING                                         |  40 --
 Makefile.in                                        |  28 +-
 README                                             |  60 +-
 README => README.md                                |  39 +-
 RELEASE.md                                         | 143 +++++
 base/Makefile.in                                   |   4 +-
 base/checks.c                                      |   6 +
 base/commands.c                                    |  16 +
 base/config.c                                      |   2 +
 base/flapping.c                                    |   6 +
 base/icinga.c                                      |   3 +
 base/logging.c                                     |   8 +-
 base/sretention.c                                  |  12 +
 base/utils.c                                       |  99 ++++
 cgi/avail.c                                        |  66 ++-
 cgi/cmd.c                                          |  41 +-
 cgi/config.c                                       |   8 +-
 cgi/tac.c                                          |   2 +-
 common/objects.c                                   |  10 +-
 configure                                          |  28 +-
 configure.in                                       |  17 +-
 debian/changelog                                   |  17 +-
 debian/patches/52_icinga.cfg-debianize.dpatch      |  44 +-
 debian/rules                                       |   2 +
 html/docs/de/about.html                            |  18 +-
 html/docs/de/activechecks.html                     |   6 +-
 html/docs/de/adaptive.html                         |   6 +-
 html/docs/de/addons.html                           |  52 +-
 html/docs/de/beginners.html                        |  14 +-
 html/docs/de/cachedchecks.html                     |   6 +-
 html/docs/de/cgiauth.html                          |  18 +-
 html/docs/de/cgicmd.html                           |   4 +-
 html/docs/de/cgiincludes.html                      |   4 +-
 html/docs/de/cgiparams.html                        | 232 ++++----
 html/docs/de/cgis.html                             |  32 +-
 html/docs/de/cgisecurity.html                      |  12 +-
 html/docs/de/ch01.html                             |  10 +-
 html/docs/de/ch02.html                             |  21 +-
 html/docs/de/ch03.html                             |   4 +-
 html/docs/de/ch04.html                             |   4 +-
 html/docs/de/ch05.html                             |   4 +-
 html/docs/de/ch06.html                             |  10 +-
 html/docs/de/ch07.html                             |  13 +-
 html/docs/de/ch08.html                             |   6 +-
 html/docs/de/ch09.html                             |   4 +-
 html/docs/de/ch10.html                             |   4 +-
 html/docs/de/ch11.html                             |  10 +-
 html/docs/de/ch12.html                             |   4 +-
 html/docs/de/ch13.html                             |   4 +-
 html/docs/de/checkscheduling.html                  |  30 +-
 html/docs/de/clusters.html                         |   4 +-
 html/docs/de/components.html                       |  14 +-
 html/docs/de/config.html                           |   6 +-
 html/docs/de/configcgi.html                        | 154 ++---
 html/docs/de/configido.html                        | 209 ++++---
 html/docs/de/configmain.html                       | 310 +++++-----
 html/docs/de/configobject.html                     |  12 +-
 html/docs/de/customobjectvars.html                 |   6 +-
 html/docs/de/db_changes.html                       |   4 +-
 html/docs/de/db_intro.html                         |  10 +-
 html/docs/de/db_model.html                         | 138 ++---
 html/docs/de/dependencies.html                     |   6 +-
 html/docs/de/dependencychecks.html                 |   8 +-
 html/docs/de/distributed.html                      |   4 +-
 html/docs/de/downtime.html                         |  11 +-
 html/docs/de/embeddedperl.html                     |  13 +-
 html/docs/de/epnplugins.html                       |   4 +-
 html/docs/de/escalation_condition.html             |   4 +-
 html/docs/de/escalations.html                      |   4 +-
 html/docs/de/eventhandlers.html                    |  10 +-
 html/docs/de/example-configs.html                  |   8 +-
 html/docs/de/extcommands.html                      |   4 +-
 html/docs/de/extcommands2.html                     | 322 +++++------
 html/docs/de/faststartup.html                      |  18 +-
 html/docs/de/flapping.html                         |   4 +-
 html/docs/de/freshness.html                        |   8 +-
 html/docs/de/hostchecks.html                       |   4 +-
 html/docs/de/howtos.html                           |  34 +-
 html/docs/de/icinga-api.html                       |  18 +-
 html/docs/de/icinga-web-api.html                   |   4 +-
 html/docs/de/icinga-web-config.html                |  18 +-
 html/docs/de/icinga-web-introduction.html          |  90 +--
 html/docs/de/icinga-web-pnp.html                   |  18 +-
 html/docs/de/icinga-web-scratch.html               |  10 +-
 html/docs/de/icinga_packages.html                  |   4 +-
 html/docs/de/icingastats.html                      |   6 +-
 html/docs/de/index.html                            | 220 ++++---
 html/docs/de/int-mklivestatus.html                 |   6 +-
 html/docs/de/int-snmptrap.html                     |   4 +-
 html/docs/de/int-tcpwrappers.html                  |   4 +-
 html/docs/de/integration.html                      |   4 +-
 html/docs/de/ix01.html                             |  16 +-
 html/docs/de/largeinstalltweaks.html               |   4 +-
 html/docs/de/macrolist.html                        | 634 ++++++++++-----------
 html/docs/de/macros.html                           |   8 +-
 html/docs/de/modified_attr.html                    |   6 +-
 html/docs/de/monitoring-linux.html                 |   6 +-
 html/docs/de/monitoring-netware.html               |   6 +-
 html/docs/de/monitoring-overview.html              |   4 +-
 html/docs/de/monitoring-printers.html              |   6 +-
 html/docs/de/monitoring-publicservices.html        |   6 +-
 html/docs/de/monitoring-routers.html               |   6 +-
 html/docs/de/monitoring-windows.html               |   8 +-
 html/docs/de/networkreachability.html              |   6 +-
 html/docs/de/newbie.html                           |  12 +-
 html/docs/de/notifications.html                    |  10 +-
 html/docs/de/notifications2.html                   |   6 +-
 html/docs/de/nrpe.html                             |  10 +-
 html/docs/de/nsca.html                             |  10 +-
 html/docs/de/objectdefinitions.html                |  64 +--
 html/docs/de/objectinheritance.html                |  14 +-
 html/docs/de/objecttricks.html                     |  24 +-
 html/docs/de/oncallrotation.html                   |   4 +-
 html/docs/de/passivechecks.html                    |   4 +-
 html/docs/de/passivestatetranslation.html          |   4 +-
 html/docs/de/perfdata.html                         |   6 +-
 html/docs/de/perfgraphs.html                       |  24 +-
 html/docs/de/pluginapi.html                        |   4 +-
 html/docs/de/plugins.html                          |  14 +-
 html/docs/de/quickstart-icinga-freebsd.html        |   8 +-
 html/docs/de/quickstart-icinga.html                |  10 +-
 html/docs/de/quickstart-idoutils-freebsd.html      |  10 +-
 html/docs/de/quickstart-idoutils.html              |  10 +-
 html/docs/de/quickstart.html                       |   8 +-
 html/docs/de/recurring_downtimes.html              |  20 +-
 html/docs/de/redundancy.html                       |  10 +-
 html/docs/de/reporting.html                        |  10 +-
 html/docs/de/sample-cgi.html                       |   2 +-
 html/docs/de/sample-commands.html                  |   2 +-
 html/docs/de/sample-config.html                    |   2 +-
 html/docs/de/sample-contacts.html                  |   2 +-
 html/docs/de/sample-httpd.html                     |   2 +-
 html/docs/de/sample-icinga.html                    |  43 +-
 html/docs/de/sample-localhost.html                 |   2 +-
 html/docs/de/sample-notifications.html             |   2 +-
 html/docs/de/sample-printer.html                   |   2 +-
 html/docs/de/sample-resource.html                  |   2 +-
 html/docs/de/sample-switch.html                    |   2 +-
 html/docs/de/sample-templates.html                 |   2 +-
 html/docs/de/sample-timeperiods.html               |   2 +-
 html/docs/de/sample-windows.html                   |   2 +-
 html/docs/de/security.html                         |   4 +-
 html/docs/de/servicechecks.html                    |   4 +-
 html/docs/de/stalking.html                         |   4 +-
 html/docs/de/startstop.html                        |   8 +-
 html/docs/de/statetypes.html                       |   4 +-
 html/docs/de/temp_data.html                        |  10 +-
 html/docs/de/timeperiods.html                      |   4 +-
 html/docs/de/tuning.html                           |   4 +-
 html/docs/de/upgrading.html                        |  28 +-
 html/docs/de/upgrading_icingaweb.html              |  14 +-
 html/docs/de/upgrading_idoutils.html               | 394 +------------
 html/docs/de/verifyconfig.html                     |  12 +-
 html/docs/de/volatileservices.html                 |   4 +-
 html/docs/de/whatsnew.html                         |  12 +-
 html/docs/en/about.html                            |  18 +-
 html/docs/en/activechecks.html                     |   6 +-
 html/docs/en/adaptive.html                         |   6 +-
 html/docs/en/addons.html                           |  52 +-
 html/docs/en/beginners.html                        |  22 +-
 html/docs/en/cachedchecks.html                     |   6 +-
 html/docs/en/cgiauth.html                          |  18 +-
 html/docs/en/cgicmd.html                           |   4 +-
 html/docs/en/cgiincludes.html                      |   4 +-
 html/docs/en/cgiparams.html                        | 232 ++++----
 html/docs/en/cgis.html                             |  32 +-
 html/docs/en/cgisecurity.html                      |  12 +-
 html/docs/en/ch01.html                             |  10 +-
 html/docs/en/ch02.html                             |  21 +-
 html/docs/en/ch03.html                             |   4 +-
 html/docs/en/ch04.html                             |   4 +-
 html/docs/en/ch05.html                             |   4 +-
 html/docs/en/ch06.html                             |   8 +-
 html/docs/en/ch07.html                             |   9 +-
 html/docs/en/ch08.html                             |   6 +-
 html/docs/en/ch09.html                             |   4 +-
 html/docs/en/ch10.html                             |   4 +-
 html/docs/en/ch11.html                             |   6 +-
 html/docs/en/ch12.html                             |   4 +-
 html/docs/en/ch13.html                             |   4 +-
 html/docs/en/checkscheduling.html                  |  30 +-
 html/docs/en/clusters.html                         |   4 +-
 html/docs/en/config.html                           |   6 +-
 html/docs/en/configcgi.html                        | 156 ++---
 html/docs/en/configido.html                        | 209 ++++---
 html/docs/en/configmain.html                       | 315 +++++-----
 html/docs/en/configobject.html                     |  12 +-
 html/docs/en/customobjectvars.html                 |   6 +-
 html/docs/en/db_changes.html                       |   4 +-
 html/docs/en/db_components.html                    |  14 +-
 html/docs/en/db_example-configs.html               |   8 +-
 html/docs/en/db_intro.html                         |  10 +-
 html/docs/en/db_model.html                         | 138 ++---
 html/docs/en/dependencies.html                     |  10 +-
 html/docs/en/dependencychecks.html                 |   4 +-
 html/docs/en/distributed.html                      |   4 +-
 html/docs/en/downtime.html                         |   9 +-
 html/docs/en/embeddedperl.html                     |   9 +-
 html/docs/en/epnplugins.html                       |   4 +-
 html/docs/en/escalation_condition.html             |   4 +-
 html/docs/en/escalations.html                      |   4 +-
 html/docs/en/eventhandlers.html                    |   6 +-
 html/docs/en/extcommands.html                      |   2 +-
 html/docs/en/extcommands2.html                     | 324 +++++------
 html/docs/en/faststartup.html                      |  16 +-
 html/docs/en/flapping.html                         |   4 +-
 html/docs/en/freshness.html                        |   8 +-
 html/docs/en/hostchecks.html                       |   4 +-
 html/docs/en/howtos.html                           |  30 +-
 html/docs/en/icinga-api.html                       |  10 +-
 html/docs/en/icinga-web-api.html                   |   4 +-
 html/docs/en/icinga-web-config.html                |  18 +-
 html/docs/en/icinga-web-introduction.html          |  88 +--
 html/docs/en/icinga-web-pnp.html                   |  14 +-
 html/docs/en/icinga-web-scratch.html               |  12 +-
 html/docs/en/icinga_packages.html                  |   4 +-
 html/docs/en/icingastats.html                      |   6 +-
 html/docs/en/index.html                            | 210 ++++---
 html/docs/en/int-mklivestatus.html                 |  11 +-
 html/docs/en/int-snmptrap.html                     |   4 +-
 html/docs/en/int-tcpwrappers.html                  |   4 +-
 html/docs/en/integration.html                      |   4 +-
 html/docs/en/ix01.html                             |  13 +-
 html/docs/en/largeinstalltweaks.html               |   4 +-
 html/docs/en/macrolist.html                        | 634 ++++++++++-----------
 html/docs/en/macros.html                           |   8 +-
 html/docs/en/modified_attr.html                    |   6 +-
 html/docs/en/monitoring-linux.html                 |   4 +-
 html/docs/en/monitoring-netware.html               |   4 +-
 html/docs/en/monitoring-overview.html              |   4 +-
 html/docs/en/monitoring-printers.html              |   4 +-
 html/docs/en/monitoring-publicservices.html        |   4 +-
 html/docs/en/monitoring-routers.html               |   6 +-
 html/docs/en/monitoring-windows.html               |   6 +-
 html/docs/en/networkreachability.html              |   6 +-
 html/docs/en/newbie.html                           |  14 +-
 html/docs/en/notifications.html                    |  10 +-
 html/docs/en/notifications2.html                   |   6 +-
 html/docs/en/nrpe.html                             |  10 +-
 html/docs/en/nsca.html                             |  10 +-
 html/docs/en/objectdefinitions.html                |  67 ++-
 html/docs/en/objectinheritance.html                |  16 +-
 html/docs/en/objecttricks.html                     |  24 +-
 html/docs/en/oncallrotation.html                   |   4 +-
 html/docs/en/passivechecks.html                    |   4 +-
 html/docs/en/passivestatetranslation.html          |   4 +-
 html/docs/en/perfdata.html                         |   6 +-
 html/docs/en/perfgraphs.html                       |  24 +-
 html/docs/en/pluginapi.html                        |   4 +-
 html/docs/en/plugins.html                          |  22 +-
 html/docs/en/quickstart-icinga-freebsd.html        |   8 +-
 html/docs/en/quickstart-icinga.html                |   8 +-
 html/docs/en/quickstart-idoutils-freebsd.html      |  12 +-
 html/docs/en/quickstart-idoutils.html              |  12 +-
 html/docs/en/quickstart.html                       |   6 +-
 html/docs/en/recurring_downtimes.html              |  18 +-
 html/docs/en/redundancy.html                       |   8 +-
 html/docs/en/reporting.html                        |  10 +-
 html/docs/en/sample-cgi.html                       |   2 +-
 html/docs/en/sample-commands.html                  |   2 +-
 html/docs/en/sample-config.html                    |   2 +-
 html/docs/en/sample-contacts.html                  |   2 +-
 html/docs/en/sample-httpd.html                     |   2 +-
 html/docs/en/sample-icinga.html                    |  42 +-
 html/docs/en/sample-localhost.html                 |   2 +-
 html/docs/en/sample-notifications.html             |   2 +-
 html/docs/en/sample-printer.html                   |   2 +-
 html/docs/en/sample-resource.html                  |   2 +-
 html/docs/en/sample-switch.html                    |   2 +-
 html/docs/en/sample-templates.html                 |   2 +-
 html/docs/en/sample-timeperiods.html               |   2 +-
 html/docs/en/sample-windows.html                   |   2 +-
 html/docs/en/security.html                         |   4 +-
 html/docs/en/servicechecks.html                    |   4 +-
 html/docs/en/stalking.html                         |   4 +-
 html/docs/en/startstop.html                        |   8 +-
 html/docs/en/statetypes.html                       |   4 +-
 html/docs/en/temp_data.html                        |  10 +-
 html/docs/en/timeperiods.html                      |   4 +-
 html/docs/en/tuning.html                           |   4 +-
 html/docs/en/upgrading.html                        |  32 +-
 html/docs/en/upgrading_icingaweb.html              |  14 +-
 html/docs/en/upgrading_idoutils.html               | 381 +------------
 html/docs/en/verifyconfig.html                     |  12 +-
 html/docs/en/volatileservices.html                 |   4 +-
 html/docs/en/whatsnew.html                         |  12 +-
 html/main.html                                     |   6 +-
 icinga.spec                                        |  20 +-
 include/common.h                                   |   7 +-
 include/icinga.h                                   |   4 +
 include/logging.h                                  |   2 +
 module/idoutils/config/ido2db.cfg-sample.in        |   7 +-
 module/idoutils/config/idoutils.cfg-sample.in      |  22 +-
 .../updates/ido2db.cfg_added_1.12_to_1.13.cfg      |  13 +
 module/idoutils/db/mysql/mysql.sql                 |  10 +-
 .../db/mysql/upgrade/mysql-upgrade-1.13.0.sql      |  26 +
 module/idoutils/db/oracle/oracle.sql               |   2 +-
 .../db/oracle/upgrade/oracle-upgrade-1.13.0.sql    |  57 ++
 module/idoutils/db/pgsql/pgsql.sql                 |  14 +-
 .../db/pgsql/upgrade/pgsql-upgrade-1.13.0.sql      |  26 +
 module/idoutils/db/scripts/installdb.in            |   2 +-
 module/idoutils/include/common.h                   |   6 +-
 module/idoutils/include/idomod.h                   |   2 +-
 module/idoutils/src/db.c                           |  14 +-
 module/idoutils/src/ido2db.c                       |   9 +
 module/idoutils/src/idomod.c                       |  36 +-
 rc.ido2db.in                                       |   3 +-
 sample-config/icinga.cfg.in                        |  45 +-
 sample-config/modules/flapjack.cfg.in              |  17 +
 sample-config/modules/livestatus.cfg.in            |  16 +
 sample-config/modules/mod_gearman.cfg.in           |  15 +
 sample-config/modules/pnp4nagios.cfg.in            |  16 +
 solaris/ido2db.xml.tpl                             |  28 +
 solaris/postinstall                                |   1 +
 solaris/preinstall                                 |   8 +-
 solaris/preremove                                  |  32 +-
 {contrib => tools}/downtimes/sched_conv.pl         |   2 +-
 {contrib => tools}/downtimes/sched_down.pl         | 368 +++++++-----
 update-version                                     |   4 +-
 update-version-schema                              |   4 +-
 323 files changed, 4574 insertions(+), 4787 deletions(-)

diff --cc debian/changelog
index 49391d4,6e8411e..017e221
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,24 @@@
- icinga (1.12.2-2~debmon70+1) debmon-wheezy; urgency=medium
++icinga (1.13.3-1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 18 Feb 2014 16:58:58 +0100
 +
+ icinga (1.13.3-1) unstable; urgency=medium
+ 
+   * [8197b77] Imported Upstream version 1.13.3
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 15 Jul 2015 15:27:22 +0200
+ 
+ icinga (1.13.2-1) unstable; urgency=medium
+ 
+   * [d7ee3a5] Imported Upstream version 1.13.2
+   * [af0ed78] Install new database schema
+   * [7349514] Add turkish debconf translation. (Closes: #760330)
+   * [500332d] Update 52_icinga.cfg-debianize
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sat, 13 Jun 2015 08:15:35 +0200
+ 
  icinga (1.12.2-2) experimental; urgency=medium
  
    * [17f0a2c] Fix plugin package name
diff --cc debian/rules
index c566047,5e17062..4c4de9a
--- a/debian/rules
+++ b/debian/rules
@@@ -139,21 -139,22 +139,22 @@@ install-stamp: build-stamp fix-configs-
  	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/
  	mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-2
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-1
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-2
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.3-1
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.2.99-1
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.3
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.2.99
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.4.0
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.5.0-1
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.6.0-1
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.7.0-1
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.8.0-1
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.9.0-1
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.10.1-1
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.5.0
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.6.0
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.7.0
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.8.0
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.9.0
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.10.1
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.11.0
 -	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.11.3-2
 +	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.11.3-2~debmon70+1
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.6.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.11.6
  	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.12.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.12.0
+ 	cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.13.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.13.0
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.1-1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3-1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.2.99-1
@@@ -164,9 -165,10 +165,10 @@@
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.9.0-1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.10.1-1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.11.0
 -	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.11.3-2
 +	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.11.3-2~debmon70+1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.6.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.11.6
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.12.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.12.0
+ 	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.13.0
  	# set up /var/cache/icinga for access by www-data
  	chgrp www-data ${b}/icinga-common/var/cache/icinga
  	chmod g+s ${b}/icinga-common/var/cache/icinga

-- 
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