[Pkg-nagios-changes] [pkg-interfacetable-v3t] 13/14: 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-interfacetable-v3t.

commit e4a3738350ce172d0b8a850b47d042be67caf29c
Merge: afe1588 017ef8f
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sun Dec 29 18:00:10 2013 +0100

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

 .gitignore                                         |   1 +
 CHANGELOG                                          |  11 +++
 TODO                                               |   2 +-
 configure                                          |  22 ++---
 configure.ac                                       |   6 +-
 contrib/pnp4nagios/check_interface_table_port.php  | 109 +++++++++++++++++----
 .../check_interface_table_port_bigip.php           | 108 ++++++++++++++++----
 debian/TODO                                        |   4 +
 debian/changelog                                   |  17 ++++
 debian/checkinterfacetable.cfg                     |   2 +-
 debian/control                                     |  24 ++++-
 ...{dirs => nagios-plugin-interfacetable-v3t.dirs} |   5 +-
 ...{docs => nagios-plugin-interfacetable-v3t.docs} |   0
 ...ll => nagios-plugin-interfacetable-v3t.install} |   2 -
 ...inks => nagios-plugin-interfacetable-v3t.links} |   2 -
 ...ios-plugin-interfacetable-v3t.lintian-overrides |   4 +
 ...t => nagios-plugin-interfacetable-v3t.postinst} |  32 +++++-
 debian/nagios-plugin-interfacetable-v3t.postrm     |  61 ++++++++++++
 debian/nagios-plugin-interfacetable-v3t.preinst    |  49 +++++++++
 debian/postrm                                      |  39 --------
 debian/rules                                       |  22 +++--
 lib/GeneralUtils.pm.in                             |   4 +
 lib/SnmpUtils.pm.in                                |   8 +-
 libexec/check_interface_table_v3t.pl.in            |  38 ++++---
 share/img/error.png                                | Bin 666 -> 0 bytes
 share/img/icon_reload.png                          | Bin 476 -> 0 bytes
 share/img/info.png                                 | Bin 946 -> 0 bytes
 share/img/recovery.png                             | Bin 945 -> 0 bytes
 share/img/unknown.png                              | Bin 935 -> 0 bytes
 29 files changed, 443 insertions(+), 129 deletions(-)

diff --cc debian/changelog
index cfd8ab0,a0f4339..b37f343
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,20 +1,27 @@@
+ interfacetable-v3t (0.05.1+dfsg1-1~preview+0) unstable; urgency=low
+ 
+   * [06c57f1] Moved Git repository to Debian
+   * [0d8eac4] Renamed binary package to nagios-plugin-interfacetable-v3t
+   * [3fa6815] Moved configurations to /etc/nagios-config/{,config/}
+               and /etc/apache2/conf-available/
+   * [f10f36f] Changed plugin filename to remove extension
+   * [c9db2d9] Update ignores
+   * [6af9817] Imported Upstream version 0.05.1
+   * [5550dce] DFSG cleaned upstream version 0.05.1+dfsg1
+   * [1cf0d0e] Update description and bump standards
+   * [5c927b0] Use config filename nagios-plugin-interfacetable-v3t.conf
+               for Apache2
+   * [0b68347] Add lintian overrides for Apache2 handling
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Sun, 29 Dec 2013 17:49:12 +0100
+ 
 +interfacetable-v3t (0.05+dfsg1-1~debmon7+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +  * [d4fa8ea] debmon-wheezy: set debian branch per config
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Fri, 06 Sep 2013 13:33:07 +0200
 +
  interfacetable-v3t (0.05+dfsg1-1) unstable; urgency=low
  
    * [e04bc70] Imported Upstream version 0.05

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