[Pkg-nagios-changes] [pkg-icinga-web] 03/04: Package updates for 1.11.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 8bebe6f0b81340fea68a4ce314c06f13fb7148d3
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Mar 13 14:49:10 2014 +0100

    Package updates for 1.11.0
---
 debian/control             |  6 +++---
 debian/icinga-web.NEWS     | 10 ++++++++++
 debian/icinga-web.dirs     |  1 +
 debian/icinga-web.links    |  3 ++-
 debian/icinga-web.postinst |  1 +
 debian/icinga-web.preinst  | 39 +++++++++++++++++++++++++++++++++++++++
 debian/rules               |  1 +
 7 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 678efcf..e607c3e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,9 +20,9 @@ Depends: dbconfig-common,
          php5-json,
          ucf,
          ${misc:Depends}
-# Notice: this will prevent users from using icinga-web 1.10 with a
-# Icinga IDO lower than 1.10 - also see the appropriate NEWS entry
-Breaks: icinga-idoutils (<< 1.10)
+# Notice: this will prevent users from using icinga-web 1.11 with a
+# Icinga IDO lower than 1.11 - also see the appropriate NEWS entry
+Breaks: icinga-idoutils (<< 1.11)
 Recommends: icinga-idoutils,
             apache2 | httpd,
             mysql-client | postgresql-client
diff --git a/debian/icinga-web.NEWS b/debian/icinga-web.NEWS
index 2d9afda..77cc809 100644
--- a/debian/icinga-web.NEWS
+++ b/debian/icinga-web.NEWS
@@ -1,3 +1,13 @@
+icinga-web (1.11.0) unstable; urgency=low
+
+  Please make sure to check your version of Icinga IDOutils, Icinga Web 1.11.0
+  requires the IDO schema to be at least version 1.11.0.
+
+  Please see also the upstream changelog:
+   /usr/share/doc/icinga-web/CHANGELOG-1.11.gz
+
+ -- Markus Frosch <markus at lazyfrosch.de>  Thu, 13 Mar 2014 14:48:48 +0100
+
 icinga-web (1.10.0-1) unstable; urgency=low
 
   Please make sure to check your version of Icinga IDOutils, Icinga Web 1.10.0
diff --git a/debian/icinga-web.dirs b/debian/icinga-web.dirs
index 3a39020..22f31b4 100644
--- a/debian/icinga-web.dirs
+++ b/debian/icinga-web.dirs
@@ -14,6 +14,7 @@ usr/lib/icinga-web/bin
 
 var/cache/icinga-web
 var/cache/icinga-web/reporting
+var/cache/icinga-web/tmp
 
 var/log/icinga-web
 
diff --git a/debian/icinga-web.links b/debian/icinga-web.links
index 13d1225..1524597 100644
--- a/debian/icinga-web.links
+++ b/debian/icinga-web.links
@@ -1,2 +1,3 @@
-usr/share/doc/icinga-web/CHANGELOG-1.10.gz usr/share/doc/icinga-web/changelog.gz
+usr/share/doc/icinga-web/CHANGELOG-1.11.gz usr/share/doc/icinga-web/changelog.gz
 etc/icinga-web/apache2.conf etc/apache2/conf-available/icinga-web.conf
+var/cache/icinga-web/tmp usr/share/icinga-web/app/data/tmp
diff --git a/debian/icinga-web.postinst b/debian/icinga-web.postinst
index d8897c4..ff03522 100644
--- a/debian/icinga-web.postinst
+++ b/debian/icinga-web.postinst
@@ -225,6 +225,7 @@ setperm www-data adm 0770 /var/log/icinga-web
 
 setperm www-data www-data 0770 /var/cache/icinga-web
 setperm www-data www-data 0770 /var/cache/icinga-web/reporting
+setperm www-data www-data 0770 /var/cache/icinga-web/tmp
 
 #DEBHELPER#
 
diff --git a/debian/icinga-web.preinst b/debian/icinga-web.preinst
new file mode 100644
index 0000000..f4b3518
--- /dev/null
+++ b/debian/icinga-web.preinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+# preinst script for icinga-web
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        # this is now a symlink to cache
+        if [ -d /usr/share/icinga-web/app/data/tmp ]; then
+            rm -rf /usr/share/icinga-web/app/data/tmp
+        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 36bf3b7..b1ddd71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ override_dh_install:
 	rm -rf ${b}/tmp/usr/share/icinga-web/lib/agavi/src/build/
 	rm -rf ${b}/tmp/usr/share/icinga-web/app/modules/Reporting/data/
 	rm -rf ${b}/tmp/usr/share/icinga-web/app/data/i18n/po/
+	rm -rf ${b}/tmp/usr/share/icinga-web/app/data/tmp/
 	# Install the rest
 	dh_install
 	# MySQL schema for dbconfig-common

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