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

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch debmon-wheezy
in repository pkg-lconf-icinga-mod.

commit a3f9a1127352e710c199c099c41770817c796cce
Merge: 6872802 6c69b70
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Aug 5 18:54:25 2014 +0200

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

 .gitignore                                         |   5 +
 Makefile.in                                        |  18 +-
 aclocal.m4                                         |  28 ++
 configure                                          | 259 ++++++------
 configure.ac                                       |   2 +-
 debian/changelog                                   |  10 +-
 debian/control                                     |   2 +-
 debian/copyright                                   |   6 +-
 debian/patches/property-grid.patch                 |  43 --
 debian/patches/series                              |   1 -
 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 +-
 25 files changed, 503 insertions(+), 963 deletions(-)

diff --cc debian/changelog
index d462459,44878ba..a78d76a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,12 +1,19 @@@
+ lconf-icinga-mod (1.4.0-1) unstable; urgency=medium
+ 
+   * [69237ff] Imported Upstream version 1.4.0
+   * [7dcf5c2] Update copyright years and maintainer address
+   * [cdbf7f7] Remove property-grid patch - no longer needed
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Tue, 05 Aug 2014 18:50:54 +0200
+ 
 +lconf-icinga-mod (1.3.2-1~preview+1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy
 +  * [a4eb6ff] Updated gbp.conf for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Tue, 15 Apr 2014 18:38:58 +0200
 +
- lconf-icinga-mod (1.3.2-1~preview+1) UNRELEASED; urgency=medium
+ lconf-icinga-mod (1.3.2-1~preview+1) unstable; urgency=low
  
    * PREVIEW for first official Debian release (Closes: #721994)
    * [31aaf75] Imported Upstream version 1.3.2

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