[Pkg-nagios-changes] [pkg-lconf-icinga-mod] 02/05: Merge tag 'upstream/1.4.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-lconf-icinga-mod.

commit b83247032c3b4141e48f6803ffec40cd826e29ea
Merge: 1941082 69237ff
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Aug 5 18:27:11 2014 +0200

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0

 .gitignore                                         |   5 +
 Makefile.in                                        |  18 +-
 aclocal.m4                                         |  28 ++
 configure                                          | 259 ++++++------
 configure.ac                                       |   2 +-
 doc/CHANGELOG                                      | 227 +++++++++++
 doc/VERSION                                        |   2 +-
 etc/sql/credentials.sql                            |  11 -
 lconf-icinga-web.spec                              |  64 ++-
 src/LConf/config/access.xml                        |  72 ----
 src/LConf/config/module.xml                        | 453 ---------------------
 src/LConf/config/module.xml.in                     |   2 +-
 src/LConf/lib/js/Components/Configuration.js       |   6 -
 .../lib/js/Components/View/LDAPPropertyStore.js    |   4 +-
 src/LConf/lib/js/GridTreeEditorField.js            |  11 +-
 .../lib/ldapConfig/objectDefaultAttributes.ini     |  62 ---
 src/LConf/lib/ldapConfig/staticObjects.ini         | 159 --------
 src/LConf/manifest.xml                             |   2 +-
 src/LConf/templates/Interface/AboutSuccess.php     |   6 +-
 .../Interface/Admin/PrincipalsSuccess.php          |  11 +-
 20 files changed, 490 insertions(+), 914 deletions(-)

diff --cc .gitignore
index 3cd6771,d6b01d0..3b11694
--- a/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,5 +1,16 @@@
 +#-- git-buildpackage part --
 +debian/*.log
 +debian/*.substvars
 +debian/*.debhelper
 +debian/files
 +debian/lconf-icinga-mod/
 +debian/icinga-web-lconf/
 +debian/tmp/
 +.pc/
 +
 +#-- original gitignore from upstream git
  etc/sql/credentials.sql
+ src/LConf/lib/js/Components/Configuration.js
  src/LConf/lib/ldapConfig/staticObjects.ini
  src/LConf/lib/ldapConfig/objectDefaultAttributes.ini
  src/LConf/config/module.xml

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