[Pkg-nagios-changes] [pkg-icinga-web] 08/09: Made icinga-idoutils a recommendation, while requiring at least 1.10.0

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.

commit d3240e51b414a5cb045f2b057eefe0c261c460ad
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Oct 25 20:00:38 2013 +0200

    Made icinga-idoutils a recommendation, while requiring at least 1.10.0
    
    Closes: #678350
---
 debian/control             |    5 +++--
 debian/icinga-web.NEWS     |   12 ++++++++++++
 debian/icinga-web.postinst |   16 ++++++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index d03bab3..663ce13 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: icinga-web
 Architecture: all
 Depends: dbconfig-common,
          icinga-core (>= 1.7.0),
-         icinga-idoutils (>= 1.7.0),
          php5,
          php5-cli,
          php5-gd,
@@ -22,7 +21,9 @@ Depends: dbconfig-common,
          php5-json,
          ucf,
          ${misc:Depends}
-Recommends: apache2 | httpd, mysql-client | postgresql-client
+Recommends: icinga-idoutils,
+            apache2 | httpd,
+            mysql-client | postgresql-client
 Suggests: icinga-doc, nagios-images
 Description: host and network monitoring system - modern web interface
  Icinga is a modular monitoring framework for hosts, services, and
diff --git a/debian/icinga-web.NEWS b/debian/icinga-web.NEWS
new file mode 100644
index 0000000..2d9afda
--- /dev/null
+++ b/debian/icinga-web.NEWS
@@ -0,0 +1,12 @@
+icinga-web (1.10.0-1) unstable; urgency=low
+
+  Please make sure to check your version of Icinga IDOutils, Icinga Web 1.10.0
+  requires the IDO schema to be at least version 1.10.0.
+
+  The reason is a column change that cannot be handled backwards compatible in
+  the database backend of icinga-web.
+
+  Please see also the upstream changelog:
+   /usr/share/doc/icinga-web/CHANGELOG-1.10.gz
+
+ -- Markus Frosch <markus at lazyfrosch.de>  Fri, 25 Oct 2013 20:22:02 +0200
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index cc6a007..d8897c4 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -25,7 +25,15 @@ generate_dbxml() {
     if [ -f "$dbconfig" ]; then
         source $dbconfig
     else
-        echo "database config failed: file $dbconfig does not exist" >&2
+        (
+        echo
+        echo "[ WARNING ]"
+        echo "cannot configure database: $file"
+        echo "the database might not been configured with dbconfig-common"
+        echo "or there was another problem, the config file is missing:"
+        echo " $dbconfig"
+        echo
+        ) >&2
         return
     fi
 
@@ -43,7 +51,7 @@ generate_dbxml() {
     dbc_edbuser=$(uriescape $dbc_dbuser)
     dbc_edbpass=$(uriescape $dbc_dbpass)
     dbc_edbname=$(uriescape $dbc_dbname)
-    
+
     # allow pgsql socket
     [ "$dbc_dbserver" = "" ] && [ "$dbc_authmethod_user" = "ident" ] && dbc_dbserver="%2Fvar%2Frun%2Fpostgresql"
 
@@ -56,9 +64,9 @@ generate_dbxml() {
 
     # replace the file with ucf
     ucf --debconf-ok $tempfile $file
-    
+
     echo "database config successful: $file"
-    rm -f $tempfile 
+    rm -f $tempfile
 }
 
 generate_dbxml /etc/icinga-web/conf.d/database-web.xml \

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