[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.0-2-11-g9526dea

[Markus Frosch]

The following commit has been merged in the master branch:
commit ac6187cc3d27f69d1f1797630d324d2633d8965a
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Jun 19 07:58:38 2012 +0200

    added patch 10_db_version_fix for fixing database version string in updates

diff --git a/debian/control b/debian/control
index fbd3580..ed1687f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: php
 Priority: extra
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Markus Frosch <markus at lazyfrosch.de>, Alexander Wirt <formorer at debian.org>, Jan Wagner <waja at cyconet.org>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf
+Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf, quilt
 Standards-Version: 3.9.3
 Homepage: http://www.icinga.org
 Vcs-Git: git://git.debian.org/git/pkg-nagios/pkg-icinga-web.git
diff --git a/debian/patches/10_db_version_fix b/debian/patches/10_db_version_fix
new file mode 100644
index 0000000..1d8fdae
--- /dev/null
+++ b/debian/patches/10_db_version_fix
@@ -0,0 +1,29 @@
+Description: Fixed database version string
+ version string is 1.7.0 instead of 1.7.1
+ .
+Author: Markus Frosch <markus at lazyfrosch.de>
+Origin: other
+Forwarded: https://dev.icinga.org/issues/2694
+Last-Update: 2012-06-19
+
+--- icinga-web-1.7.1.orig/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
++++ icinga-web-1.7.1/etc/schema/updates/oracle_v1-7-0_to_v1-7-1.sql
+@@ -1,2 +1,2 @@
+ DELETE FROM nsm_db_version;
+-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
++INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+--- icinga-web-1.7.1.orig/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
++++ icinga-web-1.7.1/etc/schema/updates/pgsql_v1-7-0_to_v1-7-1.sql
+@@ -1,4 +1,4 @@
+ DELETE FROM nsm_db_version;
+-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
++INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', NOW(), NOW());
+ 
+ SELECT setval('nsm_target_target_id_seq','21');
+\ No newline at end of file
+--- icinga-web-1.7.1.orig/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
++++ icinga-web-1.7.1/etc/schema/updates/mysql_v1-7-0_to_v1-7-1.sql
+@@ -1,2 +1,2 @@
+ DELETE FROM nsm_db_version;
+-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.0', NOW(), NOW());
++INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.7.1', NOW(), NOW());
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c12865f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_db_version_fix
diff --git a/debian/rules b/debian/rules
index e505a41..f4f4a9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 b := $(shell pwd)/debian
 
 %:
-	dh --buildsystem=autoconf $@
+	dh --with quilt --buildsystem=autoconf $@
 
 override_dh_auto_configure:
 	./configure --prefix=/usr \

-- 
Debian packaging of icinga-web