[Pkg-nagios-changes] [pkg-icinga-web] 01/02: Merge branch 'master' into debmon-wheezy

Markus Frosch lazyfrosch-guest at alioth.debian.org
Sat Oct 26 17:52:07 UTC 2013


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 9d431b00f86032cea8d377ff5750b58cf4455648
Merge: a608eeb e91b448
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sat Oct 26 19:27:13 2013 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 .gitignore                                         |   10 +-
 Makefile.in                                        |    6 +
 app/modules/Api/config/commands/host.xml           |   10 +
 app/modules/Api/config/commands/instance.xml       |   16 +-
 app/modules/Api/config/commands/service.xml        |   11 +
 app/modules/Api/config/icingaCommands.xml          |    4 +-
 app/modules/Api/config/{views.xml => views.xml.in} |    2 +-
 app/modules/Api/config/views/host.xml              |  113 +-
 app/modules/Api/config/views/misc.xml              |   10 +-
 app/modules/Api/config/views/service.xml           |   52 +-
 .../models/generated/BaseIcingaHoststatus.php      |   11 +
 .../models/generated/BaseIcingaServicestatus.php   |   11 +
 .../datastore/DataStoreFilterModifier.class.php    |    2 +-
 .../Api/lib/xml/xsd/parts/icingaCommands.xsd       |    3 +-
 .../LegacyLayer/TargetModifierModel.class.php      |  700 +-
 .../AppKit/actions/Admin/TasksAction.class.php     |   27 +-
 .../DataProvider/UserProviderAction.class.php      |    2 +
 app/modules/AppKit/config/auth.xml.in              |    4 -
 app/modules/AppKit/config/javascript.xml           |    4 +
 app/modules/AppKit/config/routing.xml              |    6 +-
 .../AppKit/lib/auth/AppKitSecurityUser.class.php   |    3 +
 .../lib/database/models/generated/BaseNsmUser.php  |    7 +
 app/modules/AppKit/lib/js/AppKit.js                |    6 +-
 app/modules/AppKit/lib/js/AppKitUtil.js            |    2 +-
 app/modules/AppKit/lib/js/admin/UserEditForm.js    |   16 +-
 app/modules/AppKit/lib/js/admin/UserManager.js     |  103 +-
 app/modules/AppKit/lib/js/utils/PieChart.js        |   93 +
 .../models/Auth/Provider/LDAPModel.class.php       |   60 +-
 .../AppKit/models/Tasks/ClearCacheModel.class.php  |    2 -
 .../models/Tasks/ClearUserDataModel.class.php      |   76 +
 .../AppKit/templates/Admin/TasksSuccess.php        |    4 +-
 .../AppKit/templates/Admin/Users/IndexSuccess.php  |    1 +
 app/modules/AppKit/validate/Admin/Tasks.xml        |   11 +-
 .../AppKit/validate/DataProvider/UserProvider.xml  |    8 +-
 app/modules/AppKit/validate/Login/AjaxLogin.xml    |    2 +-
 .../AppKit/views/Admin/TasksSuccessView.class.php  |   15 +
 app/modules/Cronks/config/cronks_categories.xml    |   49 +-
 app/modules/Cronks/config/cronks_grid.xml          |   75 +-
 app/modules/Cronks/config/cronks_misc.xml          |    2 +-
 ...t-problems.xml => icinga-all-host-problems.xml} |   46 +-
 ...mplate.xml => icinga-all-problems-template.xml} |    6 +-
 ...roblems.xml => icinga-all-service-problems.xml} |   48 +-
 .../data/xml/grid/icinga-host-history-template.xml |  175 +-
 .../Cronks/data/xml/grid/icinga-host-template.xml  |   42 +-
 .../data/xml/grid/icinga-instance-template.xml     |  274 +-
 .../xml/grid/icinga-open-problems-template.xml     |    2 +-
 .../xml/grid/icinga-service-history-template.xml   |  205 +-
 .../data/xml/grid/icinga-service-template.xml      |   40 +
 .../xml/grid/icinga-unhandled-host-problems.xml    |   36 +
 .../xml/grid/icinga-unhandled-service-problems.xml |   38 +-
 .../icinga-tactical-overview-template-charts.xml   |    4 +-
 .../Cronks/lib/js/Cronk/grid/CommandHandler.js     |  290 +-
 .../Cronks/lib/js/Cronk/grid/MetaGridPanel.js      |   11 +-
 .../Cronks/lib/js/Cronk/util/CronkTabhelper.js     |   28 +-
 .../js/Icinga/Cronks/System/CronkListingPanel.js   |  109 +-
 .../Cronks/Tackle/Command/BatchCommandWindow.js    |    4 +-
 .../js/Icinga/Cronks/Tackle/Information/Head.js    |    4 +-
 .../js/Icinga/Cronks/Tackle/Information/State.js   |    1 -
 .../lib/js/Icinga/Cronks/Tackle/Translation.js     |    5 +-
 .../js/Icinga/Cronks/util/FilterTypes/Status.js    |    4 +-
 .../DQLCronkTemplateWorker.class.php               |   13 +-
 .../Provider/CronkCategoryDataModel.class.php      |    8 +-
 app/modules/Cronks/validate/System/CronkPortal.xml |   26 +-
 .../views/System/CronkPortalSuccessView.class.php  |   23 +-
 app/modules/Reporting/config/cronks.xml            |   14 +-
 .../Icinga.Reporting.util.InputControlBuilder.js   |    4 +-
 app/modules/Web/config/routing.xml                 |    6 +-
 .../Web/lib/state/IcingaServiceStateInfo.class.php |    2 +-
 app/modules/Web/validate/Icinga/PortalView.xml     |   24 +-
 configure                                          |   26 +-
 configure.ac                                       |    4 +-
 .../templateExtensions/pnp-host-extension.xml      |    2 +-
 .../templateExtensions/pnp-service-extension.xml   |    2 +-
 .../BPAddon/actions/ConfigCreaterAction.class.php  |   42 -
 .../actions/ConfigParserInterfaceAction.class.php  |   42 -
 .../BPAddon/actions/OverviewAction.class.php       |   42 -
 .../actions/eventRequestDelegateAction.class.php   |  108 -
 .../BPAddon/actions/js/bpLoaderAction.class.php    |   23 -
 .../BPAddon/config/autoload.xml                    |   12 -
 .../BPAddon/config/bp.xml                          |   15 -
 .../BPAddon/config/config_handlers.xml             |    3 -
 .../BPAddon/config/cronks.xml                      |   54 -
 .../BPAddon/config/css.xml                         |    8 -
 .../BPAddon/config/javascript.xml                  |   19 -
 .../BPAddon/config/module.xml                      |   47 -
 .../BPAddon/config/routing.xml                     |   14 -
 .../BPAddon/config/validators.xml                  |   15 -
 .../BPAddon/lib/action/BPAddonBaseAction.class.php |   11 -
 .../BPAddon/lib/js/bpLoader.js                     |  273 -
 .../BPAddon/lib/js/eventGrid.js                    |  169 -
 .../BPAddon/lib/js/filterManager.js                |  507 --
 .../BPAddon/lib/js/infoPanel.js                    |  302 -
 .../BPAddon/lib/js/processVizPanel.js              |  150 -
 .../BPAddon/lib/model/BPAddonBaseModel.class.php   |   11 -
 .../BPAddon/lib/view/BPAddonBaseView.class.php     |   11 -
 .../BPAddon/models/bpCfgInterpreterModel.class.php |  183 -
 .../BPAddon/models/businessProcessModel.class.php  |  269 -
 .../BPAddon/models/configParserModel.class.php     |  181 -
 .../BPAddon/models/serviceModel.class.php          |   46 -
 .../BPAddon/pub/styles/bp.css                      |   38 -
 .../BPAddon/templates/ConfigCreaterSuccess.php     | 1311 ----
 .../BPAddon/templates/OverviewSuccess.php          |  832 --
 .../BPAddon/validate/ConfigCreater.xml             |   81 -
 .../BPAddon/validate/ConfigParserInterface.xml     |   43 -
 .../BPAddon/validate/Overview.xml                  |  106 -
 .../BPAddon/validate/eventRequestDelegate.xml      |  104 -
 .../BPAddon/validate/js/bpLoader.xml               |   13 -
 .../views/ConfigCreaterSuccessView.class.php       |   14 -
 .../ConfigParserInterfaceSuccessView.class.php     |   55 -
 .../BPAddon/views/OverviewSuccessView.class.php    |   18 -
 .../eventRequestDelegateSuccessView.class.php      |   22 -
 .../BPAddon/views/js/bpLoaderSuccessView.class.php |   13 -
 contrib/businessprocess-icinga-cronk/README        |   17 +
 .../bin/cronkMetaExtractorTask.php                 |   78 -
 .../bin/dependencyCheckerTask.php                  |  117 -
 .../bin/icingaManifest.php                         |  211 -
 .../bin/manifestMapper.php                         |   81 -
 .../bin/moduleMetaPrinterTask.php                  |   35 -
 .../businessprocess-icinga-cronk/build.properties  |    2 -
 contrib/businessprocess-icinga-cronk/build.xml     |   56 -
 contrib/businessprocess-icinga-cronk/doc/CHANGELOG |    3 -
 contrib/businessprocess-icinga-cronk/doc/GPL       |  340 -
 contrib/businessprocess-icinga-cronk/doc/INSTALL   |   24 -
 contrib/businessprocess-icinga-cronk/doc/LICENSE   |   29 -
 contrib/businessprocess-icinga-cronk/doc/VERSION   |    1 -
 contrib/businessprocess-icinga-cronk/install.sh    |    2 -
 contrib/businessprocess-icinga-cronk/manifest.xml  |   29 -
 contrib/businessprocess-icinga-cronk/phing.php     |    1 -
 .../phing/BuildEvent.php                           |  198 -
 .../phing/BuildException.php                       |  121 -
 .../phing/BuildListener.php                        |   91 -
 .../phing/BuildLogger.php                          |   70 -
 .../businessprocess-icinga-cronk/phing/CHANGELOG   |  456 --
 contrib/businessprocess-icinga-cronk/phing/CREDITS |   65 -
 .../phing/ConfigurationException.php               |   83 -
 .../phing/IntrospectionHelper.php                  |  538 --
 .../businessprocess-icinga-cronk/phing/Phing.php   | 1346 ----
 .../businessprocess-icinga-cronk/phing/Project.php |  982 ---
 .../phing/ProjectComponent.php                     |   70 -
 contrib/businessprocess-icinga-cronk/phing/README  |   78 -
 .../phing/RuntimeConfigurable.php                  |  118 -
 .../businessprocess-icinga-cronk/phing/Target.php  |  317 -
 .../businessprocess-icinga-cronk/phing/Task.php    |  265 -
 .../phing/TaskAdapter.php                          |   84 -
 .../phing/TaskContainer.php                        |   42 -
 contrib/businessprocess-icinga-cronk/phing/UPGRADE |   56 -
 .../phing/UnknownElement.php                       |  215 -
 .../phing/bin/pear-phing                           |   22 -
 .../phing/bin/pear-phing.bat                       |   44 -
 .../phing/bin/phing.php                            |   56 -
 .../phing/etc/VERSION.TXT                          |    1 -
 .../phing/etc/coverage-frames.xsl                  | 1026 ---
 .../businessprocess-icinga-cronk/phing/etc/log.xsl |  216 -
 .../phing/etc/phing-grammar.rng                    | 2760 -------
 .../phing/etc/phpunit-frames.xsl                   |  679 --
 .../phing/etc/phpunit-noframes.xsl                 |  438 --
 .../phing/etc/str.replace.function.xsl             |  105 -
 .../phing/filters/BaseFilterReader.php             |  157 -
 .../phing/filters/BaseParamFilterReader.php        |   69 -
 .../phing/filters/ChainableReader.php              |   43 -
 .../phing/filters/ExpandProperties.php             |   82 -
 .../phing/filters/HeadFilter.php                   |  161 -
 .../phing/filters/LineContains.php                 |  260 -
 .../phing/filters/LineContainsRegexp.php           |  179 -
 .../phing/filters/PrefixLines.php                  |  142 -
 .../phing/filters/ReplaceRegexp.php                |  129 -
 .../phing/filters/ReplaceTokens.php                |  435 --
 .../phing/filters/ReplaceTokensWithFile.php        |  325 -
 .../phing/filters/StripLineBreaks.php              |  148 -
 .../phing/filters/StripLineComments.php            |  207 -
 .../phing/filters/StripPhpComments.php             |  188 -
 .../phing/filters/StripWhitespace.php              |   95 -
 .../phing/filters/TabToSpaces.php                  |  144 -
 .../phing/filters/TailFilter.php                   |  157 -
 .../phing/filters/TidyFilter.php                   |  162 -
 .../phing/filters/TranslateGettext.php             |  285 -
 .../phing/filters/XincludeFilter.php               |  176 -
 .../phing/filters/XsltFilter.php                   |  408 -
 .../phing/filters/util/ChainReaderHelper.php       |  183 -
 .../phing/filters/util/IniFileTokenReader.php      |   97 -
 .../phing/input/DefaultInputHandler.php            |   81 -
 .../phing/input/InputHandler.php                   |   45 -
 .../phing/input/InputRequest.php                   |  107 -
 .../phing/input/MultipleChoiceInputRequest.php     |   58 -
 .../phing/input/YesNoInputRequest.php              |   47 -
 .../phing/lib/Capsule.php                          |  267 -
 .../phing/listener/AnsiColorLogger.php             |  234 -
 .../phing/listener/DefaultLogger.php               |  279 -
 .../phing/listener/NoBannerLogger.php              |   59 -
 .../phing/listener/PearLogListener.php             |  197 -
 .../phing/listener/StreamRequiredBuildLogger.php   |   39 -
 .../phing/listener/XmlLogger.php                   |  354 -
 .../phing/listener/defaults.properties             |   43 -
 .../phing/mappers/FileNameMapper.php               |   59 -
 .../phing/mappers/FlattenMapper.php                |   55 -
 .../phing/mappers/GlobMapper.php                   |  113 -
 .../phing/mappers/IdentityMapper.php               |   54 -
 .../phing/mappers/MergeMapper.php                  |   69 -
 .../phing/mappers/RegexpMapper.php                 |   97 -
 .../phing/parser/AbstractHandler.php               |   98 -
 .../phing/parser/AbstractSAXParser.php             |  116 -
 .../phing/parser/DataTypeHandler.php               |  144 -
 .../phing/parser/ExpatParseException.php           |   31 -
 .../phing/parser/ExpatParser.php                   |  140 -
 .../phing/parser/Location.php                      |   76 -
 .../phing/parser/NestedElementHandler.php          |  186 -
 .../phing/parser/PhingXMLContext.php               |   81 -
 .../phing/parser/ProjectConfigurator.php           |  373 -
 .../phing/parser/ProjectHandler.php                |  169 -
 .../phing/parser/RootHandler.php                   |   82 -
 .../phing/parser/TargetHandler.php                 |  180 -
 .../phing/parser/TaskHandler.php                   |  234 -
 .../phing/system/io/BufferedReader.php             |  168 -
 .../phing/system/io/BufferedWriter.php             |   71 -
 .../phing/system/io/ConsoleReader.php              |   84 -
 .../phing/system/io/FileInputStream.php            |   76 -
 .../phing/system/io/FileOutputStream.php           |   71 -
 .../phing/system/io/FileReader.php                 |   41 -
 .../phing/system/io/FileSystem.php                 |  741 --
 .../phing/system/io/FileWriter.php                 |   42 -
 .../phing/system/io/FilterReader.php               |   68 -
 .../phing/system/io/IOException.php                |   27 -
 .../phing/system/io/InputStream.php                |  178 -
 .../phing/system/io/InputStreamReader.php          |  127 -
 .../phing/system/io/OutputStream.php               |  108 -
 .../phing/system/io/OutputStreamWriter.php         |   84 -
 .../phing/system/io/PhingFile.php                  |  934 ---
 .../phing/system/io/Reader.php                     |   91 -
 .../phing/system/io/StringReader.php               |   84 -
 .../phing/system/io/UnixFileSystem.php             |  306 -
 .../phing/system/io/Win32FileSystem.php            |  477 --
 .../phing/system/io/WinNTFileSystem.php            |   35 -
 .../phing/system/io/Writer.php                     |   53 -
 .../phing/system/lang/Character.php                |   49 -
 .../phing/system/lang/EventObject.php              |   52 -
 .../phing/system/lang/FileNotFoundException.php    |   26 -
 .../phing/system/lang/NullPointerException.php     |   26 -
 .../phing/system/lang/SecurityException.php        |   26 -
 .../phing/system/util/Properties.php               |  289 -
 .../phing/system/util/Register.php                 |  115 -
 .../phing/system/util/Timer.php                    |   96 -
 .../phing/tasks/defaults.properties                |  105 -
 .../phing/tasks/ext/CapsuleTask.php                |  480 --
 .../phing/tasks/ext/ExportPropertiesTask.php       |  151 -
 .../phing/tasks/ext/ExtractBaseTask.php            |  183 -
 .../phing/tasks/ext/FileHashTask.php               |  147 -
 .../phing/tasks/ext/FileSizeTask.php               |  120 -
 .../phing/tasks/ext/FtpDeployTask.php              |  216 -
 .../phing/tasks/ext/HttpRequestTask.php            |  283 -
 .../phing/tasks/ext/JslLintTask.php                |  232 -
 .../phing/tasks/ext/MailTask.php                   |   77 -
 .../phing/tasks/ext/ManifestTask.php               |  343 -
 .../phing/tasks/ext/PackageAsPathTask.php          |   65 -
 .../phing/tasks/ext/PatchTask.php                  |  254 -
 .../phing/tasks/ext/PearPackage2Task.php           |  270 -
 .../phing/tasks/ext/PearPackageTask.php            |  427 --
 .../phing/tasks/ext/PhpCodeSnifferTask.php         |  597 --
 .../phing/tasks/ext/PhpLintTask.php                |  255 -
 .../phing/tasks/ext/ReplaceRegexpTask.php          |  204 -
 .../phing/tasks/ext/ScpTask.php                    |  354 -
 .../phing/tasks/ext/SmartyTask.php                 |  610 --
 .../phing/tasks/ext/SshTask.php                    |  178 -
 .../phing/tasks/ext/TarTask.php                    |  444 --
 .../phing/tasks/ext/UntarTask.php                  |   89 -
 .../phing/tasks/ext/UnzipTask.php                  |   77 -
 .../phing/tasks/ext/VersionTask.php                |  217 -
 .../phing/tasks/ext/XmlLintTask.php                |  136 -
 .../phing/tasks/ext/XmlPropertyTask.php            |  247 -
 .../phing/tasks/ext/ZendCodeAnalyzerTask.php       |  207 -
 .../phing/tasks/ext/ZipTask.php                    |  296 -
 .../phing/tasks/ext/coverage/CoverageMerger.php    |  124 -
 .../tasks/ext/coverage/CoverageMergerTask.php      |   92 -
 .../tasks/ext/coverage/CoverageReportTask.php      |  556 --
 .../ext/coverage/CoverageReportTransformer.php     |  122 -
 .../phing/tasks/ext/coverage/CoverageSetupTask.php |  139 -
 .../tasks/ext/coverage/CoverageThresholdTask.php   |  327 -
 .../phing/tasks/ext/creole/CreoleSQLExecTask.php   |  592 --
 .../phing/tasks/ext/creole/CreoleTask.php          |  242 -
 .../phing/tasks/ext/dbdeploy/DbDeployTask.php      |  196 -
 .../phing/tasks/ext/dbdeploy/DbmsSyntax.php        |   34 -
 .../phing/tasks/ext/dbdeploy/DbmsSyntaxFactory.php |   59 -
 .../phing/tasks/ext/dbdeploy/DbmsSyntaxMsSql.php   |   37 -
 .../phing/tasks/ext/dbdeploy/DbmsSyntaxMysql.php   |   37 -
 .../phing/tasks/ext/dbdeploy/DbmsSyntaxSQLite.php  |   37 -
 .../phing/tasks/ext/ioncube/IoncubeComment.php     |   43 -
 .../phing/tasks/ext/ioncube/IoncubeEncoderTask.php |  535 --
 .../phing/tasks/ext/ioncube/IoncubeLicenseTask.php |  208 -
 .../tasks/ext/pdepend/PhpDependAnalyzerElement.php |  108 -
 .../tasks/ext/pdepend/PhpDependLoggerElement.php   |  104 -
 .../phing/tasks/ext/pdepend/PhpDependTask.php      |  529 --
 .../phing/tasks/ext/pdo/PDOResultFormatter.php     |   84 -
 .../tasks/ext/pdo/PDOSQLExecFormatterElement.php   |  312 -
 .../phing/tasks/ext/pdo/PDOSQLExecTask.php         |  646 --
 .../phing/tasks/ext/pdo/PDOTask.php                |  217 -
 .../tasks/ext/pdo/PlainPDOResultFormatter.php      |  130 -
 .../phing/tasks/ext/pdo/XMLPDOResultFormatter.php  |  141 -
 .../phing/tasks/ext/pearpackage/Fileset.php        |  224 -
 .../phing/tasks/ext/phar/IterableFileSet.php       |   56 -
 .../phing/tasks/ext/phar/PharMetadata.php          |   55 -
 .../phing/tasks/ext/phar/PharMetadataElement.php   |   80 -
 .../phing/tasks/ext/phar/PharPackageTask.php       |  302 -
 .../phing/tasks/ext/phk/PhkPackageTask.php         |  248 -
 .../phing/tasks/ext/phk/PhkPackageWebAccess.php    |   57 -
 .../tasks/ext/phk/PhkPackageWebAccessPath.php      |   46 -
 .../tasks/ext/phpcpd/PHPCPDFormatterElement.php    |  177 -
 .../phing/tasks/ext/phpcpd/PHPCPDTask.php          |  322 -
 .../formatter/DefaultPHPCPDResultFormatter.php     |   56 -
 .../ext/phpcpd/formatter/PHPCPDResultFormatter.php |   37 -
 .../phpcpd/formatter/PMDPHPCPDResultFormatter.php  |   44 -
 .../tasks/ext/phpdoc/PhingPhpDocumentorSetup.php   |  220 -
 .../tasks/ext/phpdoc/PhpDocumentorExternalTask.php |  265 -
 .../phing/tasks/ext/phpdoc/PhpDocumentorTask.php   |  485 --
 .../tasks/ext/phpmd/PHPMDFormatterElement.php      |  179 -
 .../phing/tasks/ext/phpmd/PHPMDTask.php            |  296 -
 .../phing/tasks/ext/phpunit/BatchTest.php          |  207 -
 .../phing/tasks/ext/phpunit/FormatterElement.php   |  132 -
 .../phing/tasks/ext/phpunit/PHPUnitReportTask.php  |  203 -
 .../phing/tasks/ext/phpunit/PHPUnitTask.php        |  347 -
 .../phing/tasks/ext/phpunit/PHPUnitTestRunner.php  |  291 -
 .../phing/tasks/ext/phpunit/PHPUnitUtil.php        |  141 -
 .../formatter/CloverPHPUnitResultFormatter.php     |   81 -
 .../phpunit/formatter/PHPUnitResultFormatter.php   |  204 -
 .../formatter/PlainPHPUnitResultFormatter.php      |  131 -
 .../formatter/SummaryPHPUnitResultFormatter.php    |   62 -
 .../formatter/XMLPHPUnitResultFormatter.php        |  116 -
 .../simpletest/SimpleTestCountResultFormatter.php  |   51 -
 .../simpletest/SimpleTestDebugResultFormatter.php  |  120 -
 .../ext/simpletest/SimpleTestFormatterElement.php  |   68 -
 .../simpletest/SimpleTestPlainResultFormatter.php  |   95 -
 .../ext/simpletest/SimpleTestResultFormatter.php   |  161 -
 .../SimpleTestSummaryResultFormatter.php           |   53 -
 .../phing/tasks/ext/simpletest/SimpleTestTask.php  |  264 -
 .../simpletest/SimpleTestXmlResultFormatter.php    |  178 -
 .../phing/tasks/ext/svn/SvnBaseTask.php            |  323 -
 .../phing/tasks/ext/svn/SvnCheckoutTask.php        |   67 -
 .../phing/tasks/ext/svn/SvnCommitTask.php          |  113 -
 .../phing/tasks/ext/svn/SvnCopyTask.php            |   64 -
 .../phing/tasks/ext/svn/SvnExportTask.php          |   69 -
 .../phing/tasks/ext/svn/SvnLastRevisionTask.php    |  100 -
 .../phing/tasks/ext/svn/SvnUpdateTask.php          |   67 -
 .../phing/tasks/system/AdhocTask.php               |   88 -
 .../phing/tasks/system/AdhocTaskdefTask.php        |  103 -
 .../phing/tasks/system/AdhocTypedefTask.php        |   71 -
 .../phing/tasks/system/AppendTask.php              |  240 -
 .../phing/tasks/system/AvailableTask.php           |  135 -
 .../phing/tasks/system/ChmodTask.php               |  203 -
 .../phing/tasks/system/ChownTask.php               |  195 -
 .../phing/tasks/system/ConditionTask.php           |   74 -
 .../phing/tasks/system/CopyTask.php                |  457 --
 .../phing/tasks/system/CvsPassTask.php             |  173 -
 .../phing/tasks/system/CvsTask.php                 |  540 --
 .../phing/tasks/system/DeleteTask.php              |  277 -
 .../phing/tasks/system/EchoTask.php                |  107 -
 .../phing/tasks/system/ExecTask.php                |  307 -
 .../phing/tasks/system/ExitTask.php                |  118 -
 .../phing/tasks/system/ForeachTask.php             |  214 -
 .../phing/tasks/system/IfTask.php                  |  225 -
 .../phing/tasks/system/ImportTask.php              |  135 -
 .../phing/tasks/system/IncludePathTask.php         |  115 -
 .../phing/tasks/system/InputTask.php               |  146 -
 .../phing/tasks/system/MatchingTask.php            |  361 -
 .../phing/tasks/system/MkdirTask.php               |   64 -
 .../phing/tasks/system/MoveTask.php                |  203 -
 .../phing/tasks/system/PhingCallTask.php           |  161 -
 .../phing/tasks/system/PhingTask.php               |  625 --
 .../phing/tasks/system/PhpEvalTask.php             |  174 -
 .../phing/tasks/system/PropertyPromptTask.php      |  234 -
 .../phing/tasks/system/PropertyTask.php            |  438 --
 .../phing/tasks/system/ReflexiveTask.php           |  155 -
 .../phing/tasks/system/ResolvePathTask.php         |  122 -
 .../phing/tasks/system/SequentialTask.php          |   58 -
 .../phing/tasks/system/TaskdefTask.php             |  163 -
 .../phing/tasks/system/TouchTask.php               |  170 -
 .../phing/tasks/system/TstampTask.php              |  171 -
 .../phing/tasks/system/TypedefTask.php             |  125 -
 .../phing/tasks/system/UpToDateTask.php            |  228 -
 .../phing/tasks/system/WarnTask.php                |   35 -
 .../phing/tasks/system/XsltTask.php                |  103 -
 .../phing/tasks/system/condition/AndCondition.php  |   46 -
 .../phing/tasks/system/condition/Condition.php     |   38 -
 .../phing/tasks/system/condition/ConditionBase.php |  197 -
 .../tasks/system/condition/ContainsCondition.php   |   76 -
 .../tasks/system/condition/EqualsCondition.php     |   78 -
 .../tasks/system/condition/IsFalseCondition.php    |   60 -
 .../tasks/system/condition/IsSetCondition.php      |   53 -
 .../tasks/system/condition/IsTrueCondition.php     |   59 -
 .../phing/tasks/system/condition/NotCondition.php  |   48 -
 .../phing/tasks/system/condition/OrCondition.php   |   46 -
 .../phing/tasks/system/condition/OsCondition.php   |   63 -
 .../system/condition/ReferenceExistsCondition.php  |   52 -
 .../phing/types/AbstractFileSet.php                |  587 --
 .../phing/types/Commandline.php                    |  468 --
 .../phing/types/DataType.php                       |  182 -
 .../phing/types/Description.php                    |   53 -
 .../phing/types/DirSet.php                         |   49 -
 .../phing/types/FileList.php                       |  224 -
 .../phing/types/FileSet.php                        |   56 -
 .../phing/types/FilterChain.php                    |  180 -
 .../phing/types/Mapper.php                         |  207 -
 .../phing/types/Parameter.php                      |   99 -
 .../phing/types/Parameterizable.php                |   32 -
 .../phing/types/Path.php                           |  452 --
 .../phing/types/PatternSet.php                     |  493 --
 .../phing/types/PhingFilterReader.php              |  136 -
 .../phing/types/Reference.php                      |   56 -
 .../phing/types/RegularExpression.php              |  105 -
 .../phing/types/TokenReader.php                    |   66 -
 .../phing/types/TokenSource.php                    |  157 -
 .../phing/types/defaults.properties                |   13 -
 .../phing/types/selectors/AndSelector.php          |   67 -
 .../phing/types/selectors/BaseExtendSelector.php   |   62 -
 .../phing/types/selectors/BaseSelector.php         |   84 -
 .../types/selectors/BaseSelectorContainer.php      |  270 -
 .../types/selectors/ContainsRegexpSelector.php     |  164 -
 .../phing/types/selectors/ContainsSelector.php     |  151 -
 .../phing/types/selectors/DateSelector.php         |  214 -
 .../phing/types/selectors/DependSelector.php       |  151 -
 .../phing/types/selectors/DepthSelector.php        |  158 -
 .../phing/types/selectors/ExtendFileSelector.php   |   43 -
 .../phing/types/selectors/ExtendSelector.php       |  124 -
 .../phing/types/selectors/FileSelector.php         |   47 -
 .../phing/types/selectors/FilenameSelector.php     |  157 -
 .../phing/types/selectors/MajoritySelector.php     |   92 -
 .../phing/types/selectors/NoneSelector.php         |   71 -
 .../phing/types/selectors/NotSelector.php          |   59 -
 .../phing/types/selectors/OrSelector.php           |   72 -
 .../phing/types/selectors/PresentSelector.php      |  154 -
 .../phing/types/selectors/SelectSelector.php       |  124 -
 .../phing/types/selectors/SelectorContainer.php    |  141 -
 .../phing/types/selectors/SelectorScanner.php      |   55 -
 .../phing/types/selectors/SelectorUtils.php        |  198 -
 .../phing/types/selectors/SizeSelector.php         |  228 -
 .../phing/types/selectors/TypeSelector.php         |  113 -
 .../phing/util/DataStore.php                       |  151 -
 .../phing/util/DirectoryScanner.php                |  748 --
 .../phing/util/ExtendedFileStream.php              |  137 -
 .../phing/util/FileUtils.php                       |  295 -
 .../phing/util/LogWriter.php                       |   95 -
 .../phing/util/PathTokenizer.php                   |  245 -
 .../phing/util/SourceFileScanner.php               |  159 -
 .../phing/util/StringHelper.php                    |  208 -
 .../phing/util/regexp/PregEngine.php               |  105 -
 .../phing/util/regexp/Regexp.php                   |  167 -
 .../phing/util/regexp/RegexpEngine.php             |   73 -
 debian/TODO                                        |    4 +-
 debian/changelog                                   |   12 +
 debian/control                                     |    5 +-
 debian/icinga-web.NEWS                             |   12 +
 debian/icinga-web.install                          |    1 +
 debian/icinga-web.links                            |    2 +-
 debian/icinga-web.lintian-overrides                |    5 +
 debian/icinga-web.postinst                         |   16 +-
 debian/patches/21_yui_chartsswf                    |   35 -
 debian/patches/series                              |    1 -
 debian/rules                                       |   13 +-
 doc/CHANGELOG-1.10                                 |  107 +
 doc/README.RHEL                                    |   64 +-
 doc/README.SUSE                                    |  110 +
 doc/VENDOR                                         |   16 +-
 doc/VERSION                                        |    2 +-
 etc/conf.d/auth.xml                                |    1 -
 etc/conf.d/module_appkit.xml                       |    2 -
 etc/conf.d/views.xml                               |   19 +
 etc/make/version.m4                                |    4 +-
 etc/schema/mysql.sql                               |   12 +-
 etc/schema/oracle.sql                              |    5 +-
 etc/schema/pgsql.sql                               |    5 +-
 etc/schema/sqlite.sql                              |    5 +-
 .../updates/mysql/mysql_v1-9-1_to_1-10-0.sql       |    7 +
 .../updates/oracle/oracle_v1-9-1_to_v1-10-0.sql    |   12 +
 .../updates/pgsql/pgsql_v1-9-1_to_v1-10-0.sql      |    9 +
 icinga-web.spec                                    |  118 +-
 lib/Makefile.in                                    |    1 +
 lib/raphael/Makefile.in                            |   22 +
 lib/raphael/g.pie-min.js                           |   13 +
 lib/raphael/g.raphael-min.js                       |   28 +
 lib/raphael/g.raphael.js                           |  861 +++
 lib/raphael/raphael-min.js                         |   11 +
 lib/raphael/raphael.js                             | 8111 ++++++++++++++++++++
 pub/styles/icinga.css                              |    7 +
 tests/phpunit/tests/module/CronkCategoriesTest.php |    5 +-
 481 files changed, 11838 insertions(+), 67707 deletions(-)

diff --cc debian/changelog
index 8bc3e5b,203d857..390d5a0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ icinga-web (1.10.0-1) unstable; urgency=low
+ 
+   * [7dae107] Imported Upstream version 1.10.0 (Closes: #719859)
+               DFSG tarball no longer required
+   * [31e2756] Removed patch 21_yui_chartsswf - upstream doesn't use SWF anymore
+   * [d370ed9] Updated packaging for 1.10.0
+   * [ee59fb7] lintian: ignoring apache2 warnings
+   * [d3240e5] Made icinga-idoutils a recommendation,
+               while requiring at least 1.10.0 (Closes: #678350)
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Fri, 25 Oct 2013 20:31:59 +0200
+ 
 +icinga-web (1.9.2+dfsg1-1~debmon7+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Mon, 07 Oct 2013 16:27:23 +0200
 +
  icinga-web (1.9.2+dfsg1-1) unstable; urgency=low
  
    * [d02e61f] Imported Upstream version 1.9.2

-- 
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