[Pkg-nagios-changes] [pkg-icinga-web] 01/02: Merge branch 'master' into debmon-squeeze
Markus Frosch
lazyfrosch-guest at alioth.debian.org
Sun Sep 8 17:36:08 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch debmon-squeeze
in repository pkg-icinga-web.
commit 1904311a44cb7cc6e1509baa67564cdb4085da2e
Merge: 96362cf 3227c57
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Sun Sep 8 19:26:18 2013 +0200
Merge branch 'master' into debmon-squeeze
Conflicts:
debian/changelog
debian/gbp.conf
app/modules/Api/config/views/host.xml | 32 +++----
app/modules/Api/config/views/misc.xml | 89 ++++++++++----------
app/modules/Api/config/views/notifications.xml | 23 +++--
app/modules/Api/config/views/service.xml | 8 +-
.../models/Console/ConsoleCommandModel.class.php | 2 +-
.../Api/models/Relation/DataModelModel.class.php | 6 +-
.../Extender/CustomVariableExtenderModel.class.php | 9 +-
app/modules/AppKit/lib/database/models/NsmUser.php | 26 +++---
.../AppKit/templates/User/PreferencesSuccess.php | 2 +-
app/modules/Cronks/config/javascript.xml | 1 +
.../Cronks/lib/js/Cronk/grid/MetaGridPanel.js | 23 +++--
.../lib/js/Cronk/grid/ObjectSelectionModel.js | 75 +++++++++++++++++
.../lib/js/Cronk/grid/renderer/ColumnRenderer.js | 4 +-
.../js/Icinga/Cronks/System/CronkListingPanel.js | 6 +-
.../js/Icinga/Cronks/util/FilterTypes/Status.js | 17 ++++
...DataHostCustomVariablePrincipalTarget.class.php | 1 +
.../IcingaDataHostPrincipalTarget.class.php | 5 +-
.../IcingaDataHostgroupPrincipalTarget.class.php | 5 +-
.../principal/IcingaDataPrincipalTarget.class.php | 10 +++
...aServiceCustomVariablePrincipalTarget.class.php | 1 +
.../IcingaDataServicePrincipalTarget.class.php | 2 +
...IcingaDataServicegroupPrincipalTarget.class.php | 5 +-
configure | 20 ++---
debian/changelog | 28 ++++++
debian/control | 3 +-
debian/gbp.conf | 6 --
debian/icinga-web-pnp.install | 1 -
debian/icinga-web.README.Debian | 17 +++-
debian/icinga-web.config | 39 ---------
debian/icinga-web.docs | 4 +
debian/icinga-web.install | 1 -
debian/icinga-web.links | 1 +
debian/icinga-web.postinst | 50 ++++++-----
debian/icinga-web.postrm | 8 ++
debian/icinga-web.templates | 10 ---
debian/po/cs.po | 59 ++++++-------
debian/po/da.po | 61 ++++++--------
debian/po/de.po | 63 ++++++--------
debian/po/es.po | 62 ++++++--------
debian/po/fr.po | 60 ++++++-------
debian/po/it.po | 61 ++++++--------
debian/po/ja.po | 56 +++++-------
debian/po/pl.po | 62 ++++++--------
debian/po/pt.po | 63 ++++++--------
debian/po/ru.po | 56 +++++-------
debian/po/sk.po | 64 ++++++--------
debian/po/sv.po | 60 ++++++-------
debian/po/templates.pot | 42 ++-------
debian/rules | 11 ---
doc/CHANGELOG-1.9 | 46 +++++++++-
doc/VERSION | 2 +-
etc/make/version.m4 | 4 +-
etc/schema/mysql.sql | 2 +-
etc/schema/oracle.sql | 4 +-
etc/schema/pgsql.sql | 2 +-
etc/schema/updates/mysql/mysql_v1-9-0_to_1-9-1.sql | 3 +
.../updates/oracle/oracle_v1-8-3_to_v1-9.sql | 10 +--
.../updates/oracle/oracle_v1-9-0_to_v1-9-1.sql | 10 +++
.../updates/pgsql/pgsql_v1-9-0_to_v1-9-1.sql | 2 +
icinga-web.spec | 7 +-
lib/phpseclib/Crypt/RSA.php | 15 ----
lib/phpseclib/Net/SSH2.php | 1 +
62 files changed, 709 insertions(+), 719 deletions(-)
diff --cc debian/changelog
index 321d4c4,ad0e152..4a06a27
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,37 @@@
+ icinga-web (1.9.1+dfsg1-1) unstable; urgency=low
+
+ * [08222f1] Imported Upstream version 1.9.1
+ * [e1e2b92] DFSG cleaned upstream version 1.9.1+dfsg1
+ * [2dca23c] Cleaned up installation of docs
+
+ -- Markus Frosch <markus at lazyfrosch.de> Sun, 08 Sep 2013 19:04:20 +0200
+
+ icinga-web (1.9.0+dfsg1-3) unstable; urgency=low
+
+ * [e45ba7d] Make debconf stop explicitly at the end of post*
+ to avoid breaking when restarting Apache2
+ see #713967
+
+ -- Markus Frosch <markus at lazyfrosch.de> Wed, 03 Jul 2013 14:30:41 +0200
+
+ icinga-web (1.9.0+dfsg1-2) unstable; urgency=low
+
+ * [74c7e99] Added php5-json as a Dependency (Closes: #713220)
+ * [4e59689] Fix usage of wrong dbc_dbserver variable in postinst
+ * [adf9c48] Removed debconf integration for httpd selection
+ * [263996a] Removed debconf templates for httpd selection
+ * [d3bd710] Added support for Apache 2.4 config integration
+ (Closes: #714537)
+ * [4d8b05d] Updated README.Debian with Apache2 changes
+
+ -- Markus Frosch <markus at lazyfrosch.de> Sun, 30 Jun 2013 20:17:04 +0200
+
+icinga-web (1.9.0+dfsg1-1~debmon60+1) debmon-squeeze; urgency=low
+
+ * Rebuild for debmon-squeeze
+
+ -- Markus Frosch <markus at lazyfrosch.de> Wed, 08 May 2013 18:45:27 +0200
+
icinga-web (1.9.0+dfsg1-1) unstable; urgency=low
* [e8ce6b5] Imported Upstream version 1.9.0
diff --cc debian/gbp.conf
index 2831d49,ba58e9b..aec6798
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,8 -1,2 +1,2 @@@
[DEFAULT]
-;debian-branch = master
+debian-branch = debmon-squeeze
- ;upstream-branch = upstream
- upstream-branch = upstream_dfsg
-
- [git-import-orig]
- pristine-tar = True
- upstream-branch = upstream
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git
More information about the Pkg-nagios-changes
mailing list