[Pkg-nagios-changes] [icinga] 04/04: Merge branch 'master' into ubuntu-lucid

Alexander Wirt formorer at debian.org
Mon Dec 16 15:09:00 UTC 2013 

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

formorer pushed a commit to branch ubuntu-lucid
in repository icinga.

commit c3e59f97fef4a828f460f3c06e06b9d2d3745389
Merge: 701acd8 8254987
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Nov 6 21:48:52 2013 +0100

    Merge branch 'master' into ubuntu-lucid
    
    Conflicts:
    	debian/changelog
    	debian/rules

 Changelog                                          |   18 +
 Makefile.in                                        |    2 +-
 THANKS                                             |    1 +
 base/broker.c                                      |    4 +-
 base/checks.c                                      |   40 +-
 base/config.c                                      |  139 +-
 base/utils.c                                       |    3 -
 cgi/cmd.c                                          |    2 +-
 cgi/status.c                                       |    4 +-
 common/objects.c                                   |    4 -
 config.guess                                       | 1510 ++++++++++++++++++
 config.sub                                         | 1619 ++++++++++++++++++++
 configure                                          |    4 +-
 configure.in                                       |    4 +-
 debian/changelog                                   |   22 +-
 debian/control                                     |    4 +-
 debian/patches/50_cgi.cfg-debianize.dpatch         |    0
 debian/patches/51_commands.cfg-debianize.dpatch    |    0
 debian/patches/52_icinga.cfg-debianize.dpatch      |    0
 debian/patches/70_fix_eventhandler_paths.dpatch    |    0
 .../90_disable_standard_conforming_strings.dpatch  |    0
 debian/patches/95_fix_db_upgrade.dpatch            |    0
 debian/rules                                       |    2 +
 html/main.html                                     |    6 +-
 icinga.spec                                        |    7 +-
 include/broker.h                                   |    4 +-
 include/common.h                                   |    4 +-
 include/icinga.h                                   |    4 -
 include/objects.h                                  |    2 -
 .../db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql      |   34 +-
 module/idoutils/include/common.h                   |    4 +-
 module/idoutils/include/protoapi.h                 |    3 +-
 module/idoutils/src/db.c                           |   12 +-
 module/idoutils/src/dbhandlers.c                   |   36 +-
 module/idoutils/src/dbqueries.c                    |   58 +-
 module/idoutils/src/ido2db.c                       |    2 -
 module/idoutils/src/idomod.c                       |   10 +-
 tests/etc/4967.cfg.disabled                        |  101 ++
 update-version                                     |    4 +-
 xdata/xodtemplate.c                                |  100 ++
 xdata/xodtemplate.h                                |   15 +-
 xdata/xsddefault.c                                 |    2 -
 42 files changed, 3553 insertions(+), 237 deletions(-)

diff --cc debian/changelog
index 45d65d8,7d5581e..0a20a3d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
- icinga (1.9.3-2~ppa1~lucid1) lucid; urgency=low
++icinga (1.10.1-1~ppa1~lucid1) lucid; urgency=low
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 14 Jan 2013 22:10:43 +0100
 +
+ icinga (1.10.1-1) unstable; urgency=low
+ 
+   * [2b8968a] Install sql upgrade files for 1.10
+   * [4ef9215] Add versioned dep to jquery-ui to reenable calendar
+   * [9fbc042] Imported Upstream version 1.10.1
+     - fix problems in postinst (Closes: #728245)
+   * [27e8455] Update sql file installation
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 06 Nov 2013 09:07:00 +0100
+ 
+ icinga (1.10.0-1) unstable; urgency=low
+ 
+   * [3c852fa] Fix typo
+   * [1e3b0a9] Don't set -e in icingas initscript (Closes: #722261)
+   * [b2e5497]  Enable cgi module for apache 2.4
+   * [f9e8662] Imported Upstream version 1.10.0
+   * [604c4f6] Bump standards version
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 24 Oct 2013 17:26:19 +0200
+ 
  icinga (1.9.3-2) unstable; urgency=low
  
    * [7e2d81e] Update README.Debian
diff --cc debian/rules
index 41f477f,ed8dee5..eff58fd
--- a/debian/rules
+++ b/debian/rules
@@@ -147,16 -147,18 +147,18 @@@ install-stamp: build-stamp fix-configs-
  	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.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.8.0~schema0
 +	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~schema0
++	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~schema0
  	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
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.5.0-1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.6.0-1
  	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.7.0-1
 -	cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.8.0-1
 -	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.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.8.0~schema0
 +	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~schema0
++	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~schema0
  	# 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