[Pkg-nagios-changes] [pkg-icinga-web] 01/02: Merge branch 'master' into debmon-wheezy
Markus Frosch
lazyfrosch-guest at moszumanska.debian.org
Tue Aug 5 15:45:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch debmon-wheezy
in repository pkg-icinga-web.
commit b48ab76f69ed509cdd02602cf7a94ddc9c18f83d
Merge: 50720fc 89db653
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Tue Aug 5 17:36:32 2014 +0200
Merge branch 'master' into debmon-wheezy
Conflicts:
debian/changelog
app/modules/Api/actions/ApiCommandAction.class.php | 10 +-
app/modules/Api/config/commands/host.xml | 1 +
.../Commands/CommandDispatcherModel.class.php | 33 +-
.../DataProvider/UserProviderAction.class.php | 2 +-
app/modules/AppKit/config/javascript.xml | 11 +-
.../lib/js/ext-overrides/TreeNodeDontLeak.js | 11 +
.../lib/js/utils/String.js} | 23 +-
.../lib/js/Cronk/grid/renderer/ColumnRenderer.js | 11 +
.../Cronks/Tackle/Information/LongPluginOutput.js | 1 +
.../Cronks/Tackle/Information/OutputPanel.js | 12 +
.../models/Provider/StatusSummaryModel.class.php | 7 +
configure | 20 +-
debian/TODO | 6 +-
debian/changelog | 19 +
debian/control | 6 +-
debian/copyright | 4 +-
debian/cronks.xml | 2 +-
debian/icinga-web.NEWS | 2 +-
debian/icinga-web.lintian-overrides | 3 +-
debian/missing-sources/ext-all-debug.js | 47684 +++++++++++++++++++
debian/missing-sources/ext-base-debug.js | 2760 ++
debian/missing-sources/g.pie.js | 296 +
.../prettify/js-modules/combinePrefixPatterns.js | 240 +
.../missing-sources/prettify/js-modules/externs.js | 37 +
.../prettify/js-modules/extractSourceSpans.js | 90 +
.../js-modules/extractSourceSpans_test.html | 129 +
.../prettify/js-modules/js_include.pl | 76 +
.../prettify/js-modules/numberLines.js | 133 +
.../prettify/js-modules/numberLines_test.html | 119 +
.../prettify/js-modules/prettify.js | 1047 +
.../js-modules/recombineTagsAndDecorations.js | 123 +
.../recombineTagsAndDecorations_test.html | 98 +
.../prettify/js-modules/regexpPrecederPatterns.pl | 68 +
.../prettify/js-modules/run_prettify.js | 250 +
debian/missing-sources/prettify/src/lang-apollo.js | 51 +
debian/missing-sources/prettify/src/lang-basic.js | 32 +
debian/missing-sources/prettify/src/lang-clj.js | 64 +
debian/missing-sources/prettify/src/lang-css.js | 159 +
debian/missing-sources/prettify/src/lang-dart.js | 88 +
debian/missing-sources/prettify/src/lang-erlang.js | 92 +
debian/missing-sources/prettify/src/lang-go.js | 58 +
debian/missing-sources/prettify/src/lang-hs.js | 101 +
debian/missing-sources/prettify/src/lang-lisp.js | 94 +
debian/missing-sources/prettify/src/lang-llvm.js | 61 +
debian/missing-sources/prettify/src/lang-lua.js | 59 +
debian/missing-sources/prettify/src/lang-matlab.js | 180 +
debian/missing-sources/prettify/src/lang-ml.js | 56 +
debian/missing-sources/prettify/src/lang-mumps.js | 139 +
debian/missing-sources/prettify/src/lang-n.js | 65 +
debian/missing-sources/prettify/src/lang-pascal.js | 32 +
debian/missing-sources/prettify/src/lang-proto.js | 35 +
debian/missing-sources/prettify/src/lang-r.js | 57 +
debian/missing-sources/prettify/src/lang-rd.js | 47 +
debian/missing-sources/prettify/src/lang-scala.js | 54 +
debian/missing-sources/prettify/src/lang-sql.js | 58 +
debian/missing-sources/prettify/src/lang-tcl.js | 62 +
debian/missing-sources/prettify/src/lang-tex.js | 46 +
debian/missing-sources/prettify/src/lang-vb.js | 66 +
debian/missing-sources/prettify/src/lang-vhdl.js | 34 +
debian/missing-sources/prettify/src/lang-wiki.js | 53 +
debian/missing-sources/prettify/src/lang-xq.js | 67 +
debian/missing-sources/prettify/src/lang-yaml.js | 27 +
debian/missing-sources/prettify/src/prettify.css | 52 +
debian/missing-sources/prettify/src/prettify.js | 1655 +
.../missing-sources/prettify/src/run_prettify.js | 1905 +
debian/missing-sources/prettify/styles/demo.html | 61 +
debian/missing-sources/prettify/styles/desert.css | 34 +
debian/missing-sources/prettify/styles/doxy.css | 64 +
debian/missing-sources/prettify/styles/index.html | 89 +
.../prettify/styles/sons-of-obsidian.css | 118 +
.../missing-sources/prettify/styles/sunburst.css | 51 +
debian/rules | 4 +-
debian/source.lintian-overrides | 45 +
doc/CHANGELOG-1.11 | 22 +
doc/README.RHEL | 24 +
doc/README.SUSE | 24 +
doc/VERSION | 2 +-
etc/conf.d/cronks.xml | 2 +-
etc/make/version.m4 | 4 +-
etc/schema/mysql.sql | 2 +-
etc/schema/oracle.sql | 2 +-
etc/schema/pgsql.sql | 2 +-
etc/schema/sqlite.sql | 2 +-
icinga-web.spec | 5 +-
84 files changed, 59382 insertions(+), 58 deletions(-)
diff --cc debian/changelog
index 63de3b1,6de6597..03ee4c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,22 +1,28 @@@
+ icinga-web (1.11.1-1) unstable; urgency=medium
+
+ * [9682a38] Imported Upstream version 1.11.1
+ * [182412b] Update lintian-overrides of icinga-web binary
+ * [d1a9c5f] Add, override and clarify missing source files
+ * [6985ff8] Clarify source-is-missing for some prettify.js source files
+ * [49e920b] Update copyright years and maintainer mail address
+ * [dc3a26e] Clean old fix from rules
+ * [f87b670] Remove pub/api/ from binary package - no longer needed
+
+ -- Markus Frosch <lazyfrosch at debian.org> Tue, 05 Aug 2014 17:31:54 +0200
+
+ icinga-web (1.11.0-2) unstable; urgency=medium
+
+ * [f15ab5b] Fix disabled Reporting Cronk's category (Closes: #744053)
+ * [9377932] Only recommend/suggest pnp4nagios
+
+ -- Markus Frosch <markus at lazyfrosch.de> Wed, 23 Apr 2014 18:35:05 +0200
+
+icinga-web (1.11.0-1~debmon70+1) debmon-wheezy; urgency=medium
+
+ * Rebuild for debmon-wheezy.
+
+ -- Markus Frosch <markus at lazyfrosch.de> Wed, 19 Mar 2014 20:21:17 +0100
+
icinga-web (1.11.0-1) unstable; urgency=medium
* [ccfbae3] Imported Upstream version 1.11.0
--
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