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

[Alexander Wirt]

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

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

commit c3b2b571fb8ab98874f5a64fc33edac2658b729a
Merge: f3b8812 6f5186c
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu May 29 18:41:04 2014 +0200

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

 Changelog                                          |   19 +-
 Makefile.in                                        |    2 +-
 configure                                          |    6 +-
 configure.in                                       |    6 +-
 debian/changelog                                   |   10 +-
 debian/copyright                                   |   25 +
 debian/patches/00list                              |    1 -
 debian/patches/96_fix_postgres_11.3_upgrade.dpatch |   21 -
 html/js/jquery.dd.js                               | 1104 +++++++++++++++++++-
 html/js/jquery.dd.min.js                           |   11 +
 html/main.html                                     |    6 +-
 icinga.spec                                        |    6 +-
 include/cgiutils.h                                 |    2 +-
 include/common.h                                   |    4 +-
 module/idoutils/db/mysql/mysql.sql                 |    1 -
 .../db/mysql/upgrade/mysql-upgrade-1.12.0.sql      |   17 -
 module/idoutils/db/pgsql/pgsql.sql                 |    1 -
 .../db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql      |    5 +-
 .../db/pgsql/upgrade/pgsql-upgrade-1.12.0.sql      |   18 -
 module/idoutils/include/common.h                   |    4 +-
 update-version                                     |    4 +-
 xdata/xodtemplate.c                                |  102 +-
 22 files changed, 1269 insertions(+), 106 deletions(-)

diff --cc debian/changelog
index 6b4cd7c,c43c010..4b014dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
- icinga (1.11.3-3~ppa1~raring1) raring; urgency=medium
++icinga (1.11.4-1~ppa1~raring1) raring; urgency=medium
 +
 +  * Rebuild for my ubuntu ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 13 May 2014 15:09:37 +0200
 +
+ icinga (1.11.4-1) unstable; urgency=medium
+ 
+   * [4b8b43e] Update copyright file (Closes: #748015)
+   * [f87dd9b] Imported Upstream version 1.11.4
+   * [28a3f90] Remove obsolete patch 96_fix_postgres_11.3_upgrade.dpatch
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 29 May 2014 17:38:05 +0200
+ 
  icinga (1.11.3-3) unstable; urgency=medium
  
    * [9d1836b] Check if apache init script exists before invoking it.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/icinga.git