[Pkg-nagios-changes] [pkg-lconf] 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.

commit fd120e88fe622665aeb2fbce1d899beb6637a01c
Merge: d852fac 863ba5b
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Aug 5 18:54:43 2014 +0200

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

 .gitignore                                         |    7 +
 LConf.spec                                         |   55 +-
 Makefile.in                                        |  328 +++--
 configure                                          |  103 +-
 configure.ac                                       |   32 +-
 contrib/LConfDeploy.sh.in                          |    4 +
 ...{LConfDeploy.sh.in => LConfDeployIcinga2.sh.in} |   67 +-
 debian/README.Debian                               |   13 +-
 debian/changelog                                   |   12 +
 debian/control                                     |    2 +-
 debian/copyright                                   |   22 +-
 debian/patches/01_avoid_install_with_owners        |    2 +-
 debian/patches/11_hostgroup_aliases                |   58 -
 debian/patches/series                              |    1 -
 debian/source.lintian-overrides                    |    2 +
 doc/CHANGELOG                                      |   66 +
 doc/INSTALL                                        |   52 +
 doc/UPGRADING                                      |   35 +
 m4/version.m4                                      |    4 +-
 make-tarball                                       |  196 ---
 maketar.sh                                         |   18 -
 src/LConfExport.pl.in                              |   46 +-
 src/LConfImport.pl.in                              |    4 +-
 src/LConfSlaveExport.pl.in                         |   44 +-
 src/LConfSlaveExportRules.pl.in                    |  120 +-
 src/LConfSlaveSync.pl.in                           |    2 +-
 src/config.pm.in                                   |  135 +-
 src/default-templates.cfg.in                       |   17 +-
 src/default-templates.conf.in                      |  100 ++
 src/generate.pm.in                                 | 1369 ++++++++++++++++++--
 src/ldap.pm.in                                     |  342 +++--
 src/misc.pm.in                                     |  374 +++++-
 tools/createdb                                     |   18 +
 tools/createdb.ldif                                |   20 +
 34 files changed, 2871 insertions(+), 799 deletions(-)

diff --cc debian/changelog
index 6a48ec0,aff785f..ea95c45
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ lconf (1.4.2-1) unstable; urgency=medium
+ 
+   * [28d66bd] Fix ldapadd for base.ldif in README.Debian
+   * [341a17b] Imported Upstream version 1.4.2
+   * [dd6082d] Update copyright and maintainer address
+   * [e9841c1] Add source lintian-override for misdetected RFC license
+   * [1483458] Remove patch for 1.3 branch of LConf - no longer needed
+   * [31c4dfe] Update patch 01_avoid_install_with_owners
+   * [10e59c9] Update README.Debian with better instructions
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Tue, 05 Aug 2014 18:49:38 +0200
+ 
 +lconf (1.3.0-1~preview+1~debmon70+1) debmon-wheezy; urgency=medium
 +
 +  * Rebuild for debmon-wheezy.
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Wed, 26 Feb 2014 12:31:43 +0100
 +
  lconf (1.3.0-1~preview+1) unstable; urgency=medium
  
    * [dc8973b] Fixed Vcs-Browser

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