Bump

debian/apache2.conf

@@ -1,33 +1,40 @@
-# apache configuration for nagios 3.x
+# apache configuration for nagios 4.x
-# note to users of nagios 1.x and 2.x:
+# note to users of nagios 1.x and 2.x and 3.x:
 #	throughout this file are commented out sections which preserve
 #	backwards compatibility with bookmarks/config for older nagios versios.
-#	simply look for lines following "nagios 1.x:" and "nagios 2.x" comments.
+#	simply look for lines following "nagios 1.x:" and "nagios 2.x" and "nagios 3.x" comments.
 
-ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios3
+ScriptAlias /cgi-bin/nagios4 /usr/lib/cgi-bin/nagios4
-ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios3
+ScriptAlias /nagios4/cgi-bin /usr/lib/cgi-bin/nagios4
 # nagios 1.x:
-#ScriptAlias /cgi-bin/nagios /usr/lib/cgi-bin/nagios3
+#ScriptAlias /cgi-bin/nagios /usr/lib/cgi-bin/nagios4
-#ScriptAlias /nagios/cgi-bin /usr/lib/cgi-bin/nagios3
+#ScriptAlias /nagios/cgi-bin /usr/lib/cgi-bin/nagios4
 # nagios 2.x: 
-#ScriptAlias /cgi-bin/nagios2 /usr/lib/cgi-bin/nagios3
+#ScriptAlias /cgi-bin/nagios2 /usr/lib/cgi-bin/nagios4
-#ScriptAlias /nagios2/cgi-bin /usr/lib/cgi-bin/nagios3
+#ScriptAlias /nagios2/cgi-bin /usr/lib/cgi-bin/nagios4
+# nagios 3.x: 
+#ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios4
+#ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios4
 
 # Where the stylesheets (config files) reside
-Alias /nagios3/stylesheets /etc/nagios3/stylesheets
+Alias /nagios4/stylesheets /etc/nagios4/stylesheets
 # nagios 1.x:
-#Alias /nagios/stylesheets /etc/nagios3/stylesheets
+#Alias /nagios/stylesheets /etc/nagios4/stylesheets
 # nagios 2.x:
-#Alias /nagios2/stylesheets /etc/nagios3/stylesheets
+#Alias /nagios2/stylesheets /etc/nagios4/stylesheets
+# nagios 3.x:
+#Alias /nagios3/stylesheets /etc/nagios4/stylesheets
 
 # Where the HTML pages live
-Alias /nagios3 /usr/share/nagios3/htdocs
+Alias /nagios4 /usr/share/nagios4/htdocs
+# nagios 3.x: 
+#Alias /nagios3 /usr/share/nagios4/htdocs
 # nagios 2.x: 
-#Alias /nagios2 /usr/share/nagios3/htdocs
+#Alias /nagios2 /usr/share/nagios4/htdocs
 # nagios 1.x:
-#Alias /nagios /usr/share/nagios3/htdocs
+#Alias /nagios /usr/share/nagios4/htdocs
 
-<DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)>
+<DirectoryMatch (/usr/share/nagios4/htdocs|/usr/lib/cgi-bin/nagios4|/etc/nagios4/stylesheets)>
 	Options FollowSymLinks
 
 	DirectoryIndex index.php index.html
@@ -46,13 +53,13 @@ Alias /nagios3 /usr/share/nagios3/htdocs
 
 	AuthName "Nagios Access"
 	AuthType Basic
-	AuthUserFile /etc/nagios3/htpasswd.users
+	AuthUserFile /etc/nagios4/htpasswd.users
 	# nagios 1.x:
 	#AuthUserFile /etc/nagios/htpasswd.users
 	require valid-user
 </DirectoryMatch>
 
-<Directory /usr/share/nagios3/htdocs>
+<Directory /usr/share/nagios4/htdocs>
 	Options	+ExecCGI	
 </Directory>
 
@@ -61,7 +68,7 @@ Alias /nagios3 /usr/share/nagios3/htdocs
 # It allows you to see a clickable list of all hostgroups in the
 # left pane of the Nagios web interface
 # XXX This is not tested for nagios 2.x use at your own peril
-#ScriptAlias /nagios3/side.html /usr/lib/cgi-bin/nagios3/grouplist.cgi
+#ScriptAlias /nagios4/side.html /usr/lib/cgi-bin/nagios4/grouplist.cgi
 # nagios 1.x:
-#ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios3/grouplist.cgi
+#ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios4/grouplist.cgi
 

debian/changelog

@@ -1,3 +1,12 @@
+nagios4 (4.3.2) UNRELEASED; urgency=medium
+
+  * add nagios 3 compat paths in apache config
+  * forward port 3.5.1 patches to 4.3.2
+  * forward port of package losely based on
+    https://launchpad.net/~grey-box/+archive/ubuntu/ppa/+files/nagios4_4.1.1-5ubuntu~precise1.tar.gz
+
+ -- Mario Fetka <mario.fetka@gmail.com>  Fri, 19 May 2017 23:48:51 +0200
+
 nagios3 (3.5.1.dfsg-2) unstable; urgency=medium
 
   * [a72437b] Make apache.conf compatible with apache 2.4.10 (Closes: #762096)

debian/control

@@ -1,4 +1,4 @@
-Source: nagios3
+Source: nagios4
 Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
@@ -6,8 +6,8 @@ Uploaders: sean finney <seanius@debian.org>,
            Alexander Wirt <formorer@debian.org>,
            Jan Wagner <waja@cyconet.org>
 Homepage: http://www.nagios.org/
-Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios3.git
+Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-nagios4.git
-Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios3.git
+Vcs-Git: git://git.debian.org/pkg-nagios/pkg-nagios4.git
 Standards-Version: 3.9.5
 Build-Depends: autotools-dev,
                debhelper (>= 7),
@@ -18,7 +18,7 @@ Build-Depends: autotools-dev,
                libpng-dev,
                po-debconf
 
-Package: nagios3-common
+Package: nagios4-common
 Architecture: all
 Depends: adduser,
          bsd-mailx | mailx,
@@ -26,13 +26,12 @@ Depends: adduser,
          lsb-base (>= 3.0-6),
          nagios-plugins-basic,
          ucf (>= 0.28),
-         libjs-jquery,
          ${misc:Depends},
          ${perl:Depends}
 Recommends: nagios-plugins
-Description: support files for nagios3
+Description: support files for nagios4
  Nagios is a monitoring and management system for hosts, services and
- networks. nagios3-common contains the common files for the nagios3 package.
+ networks. nagios4-common contains the common files for the nagios4 package.
  .
  Nagios' features include:
  .
@@ -55,24 +54,24 @@ Description: support files for nagios3
  .
  Upstream URL: http://www.nagios.org/
 
-Package: nagios3-cgi
+Package: nagios4-cgi
 Architecture: any
-Replaces: nagios3 (<< 3.2.0), nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0)
+Replaces: nagios4 (<< 4.1.0), nagios4-common (<< 4.1.0), nagios4-doc (<< 4.1.0)
-Breaks: nagios3 (<< 3.2.0), nagios3-common (<< 3.2.0), nagios3-doc (<< 3.2.0)
+Breaks: nagios4 (<< 4.1.0), nagios4-common (<< 4.1.0), nagios4-doc (<< 4.1.0)
 Depends: adduser,
          apache2-utils,
          coreutils (>= 4.5.3),
          libapache2-mod-php5 | php5 | php5-cgi,
          libjs-jquery,
-         nagios3-common (= ${source:Version}),
+         nagios4-common (= ${source:Version}),
          ucf (>= 0.28),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
 Recommends: apache2 | httpd, nagios-images (>> 0.1)
-Description: cgi files for nagios3
+Description: cgi files for nagios4
  Nagios is a monitoring and management system for hosts, services and
- networks. nagios3-common contains the common files for the nagios3 package.
+ networks. nagios4-common contains the common files for the nagios4 package.
  .
  Nagios' features include:
  .
@@ -95,10 +94,10 @@ Description: cgi files for nagios3
  .
  Upstream URL: http://www.nagios.org/
 
-Package: nagios3
+Package: nagios4
 Architecture: any
-Depends: nagios3-cgi (= ${binary:Version}),
+Depends: nagios4-cgi (= ${binary:Version}),
-         nagios3-core (= ${binary:Version}),
+         nagios4-core (= ${binary:Version}),
          ${misc:Depends}
 Suggests: nagios-nrpe-plugin
 Description: host/service/network monitoring and management system
@@ -129,14 +128,14 @@ Description: host/service/network monitoring and management system
  .
  Upstream URL: http://www.nagios.org/
 
-Package: nagios3-core
+Package: nagios4-core
 Architecture: any
-Depends: nagios3-common (= ${source:Version}),
+Depends: nagios4-common (= ${source:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
 Suggests: nagios-nrpe-plugin
-Replaces: nagios3
+Replaces: nagios4
 Description: host/service/network monitoring and management system core files
  Nagios is a monitoring and management system for hosts, services and
  networks.
@@ -165,11 +164,11 @@ Description: host/service/network monitoring and management system core files
  .
  Upstream URL: http://www.nagios.org/
 
-Package: nagios3-doc
+Package: nagios4-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
-Description: documentation for nagios3
+Description: documentation for nagios4
  Nagios is a monitoring and management system for hosts, services and
  networks.
  .
@@ -195,16 +194,16 @@ Description: documentation for nagios3
  .
  Upstream URL: http://www.nagios.org/
 
-Package: nagios3-dbg
+Package: nagios4-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: nagios3-core (= ${binary:Version}),
+Depends: nagios4-core (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
 Conflicts: icinga-dbg (<= 1.0.1-2)
-Description: debugging symbols and debug stuff for nagios3
+Description: debugging symbols and debug stuff for nagios4
  Nagios is a monitoring and management system for hosts, services and
  networks.
  .
@@ -222,7 +221,7 @@ Description: debugging symbols and debug stuff for nagios3
  Nagios was written in C and is designed to be easy to understand and modify
  to fit your own needs.
  .
- This package contains gdb debugging symbols for the nagios3 binaries and the
+ This package contains gdb debugging symbols for the nagios4 binaries and the
  mini_epn tool which can help in debugging Nagios problems.
  .
  Nagios is a replacement of the Netsaint project. It accepts and uses the

debian/mini_epn_nagio3.8.txt

@@ -1,31 +0,0 @@
-:man source:   Nagios
-:man version:  {revnumber}
-:man manual:   mini_epn
-
-mini_epn(8)
-==========
-
-NAME
-----
-mini_epn - too to nagiosplugins inside of an embedded perl interpreter
-
-SYNOPSIS
---------
-*mini_epn*
-
-DESCRIPTION
------------
-After calling *mini_epn* an embedded perl interpreter gets started and asks for you a script to execute under the interpreter. To exit the interpreter loop press ^d at the prompt. 
-
-EXAMPLES
---------
-
-  # mini_epn
-  Enter file name: /usr/lib/nagios/plugins/check_linux_raid
-  embedded perl plugin return code and output was: 0 & 'OK md0 status=[UU]. md1 status=[UU].
-
-AUTHOR
-------
-This manpage was written by Alexander Wirt <formorer@debian.org> for the Debian Distribution.
-
-

debian/mini_epn_nagios3.8

@@ -1,44 +0,0 @@
-'\" t
-.\"     Title: mini_epn
-.\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/19/2009
-.\"    Manual: mini_epn
-.\"    Source: Nagios
-.\"  Language: English
-.\"
-.TH "MINI_EPN" "8" "09/19/2009" "Nagios" "mini_epn"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-mini_epn \- too to nagiosplugins inside of an embedded perl interpreter
-.SH "SYNOPSIS"
-.sp
-\fBmini_epn\fR
-.SH "DESCRIPTION"
-.sp
-After calling \fBmini_epn\fR an embedded perl interpreter gets started and asks for you a script to execute under the interpreter\&. To exit the interpreter loop press ^d at the prompt\&.
-.SH "EXAMPLES"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-# mini_epn
-Enter file name: /usr/lib/nagios/plugins/check_linux_raid
-embedded perl plugin return code and output was: 0 & \'OK md0 status=[UU]\&. md1 status=[UU]\&.
-.fi
-.if n \{\
-.RE
-.\}
-.SH "AUTHOR"
-.sp
-This manpage was written by Alexander Wirt <formorer@debian\&.org> for the Debian Distribution\&.

debian/nagios3-cgi.config

@@ -1,31 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-db_fget nagios3/adminpassword seen || true
-password_seen="$RET"
-
-if [ "$1" = "reconfigure" ]; then
-        password_seen=false
-fi
-
-if [ "$rootpassword_seen" != "true" ]; then
-    while [ ! "$passwordsmatch" ]; do
-        db_input high nagios3/adminpassword || true
-        db_input high nagios3/adminpassword-repeat || true
-        db_go || true
-        db_get nagios3/adminpassword
-        p1="$RET"
-        db_get nagios3/adminpassword-repeat
-        p2="$RET"
-        if [ "$p1" = "$p2" ]; then
-            passwordsmatch="yes"
-        else
-            db_fset nagios3/adminpassword seen false
-            db_fset nagios3/adminpassword-repeat seen false
-            db_fset nagios3/adminpassword-mismatch seen false
-            db_input critical nagios3/adminpassword-mismatch || true
-        fi
-    done
-fi
-db_go || true

debian/nagios3-cgi.dirs

@@ -1,3 +0,0 @@
-etc/nagios3/stylesheets
-usr/share/nagios3/htdocs/ssi 
-usr/lib/cgi-bin

debian/nagios3-cgi.install

@@ -1,11 +0,0 @@
-debian-configs/cgi.cfg /etc/nagios3
-debian/httpd.webapps-common /usr/share/nagios3/debian
-usr/lib/cgi-bin/*
-usr/share/nagios3/htdocs/*.php
-usr/share/nagios3/htdocs/contexthelp
-usr/share/nagios3/htdocs/images
-usr/share/nagios3/htdocs/includes
-usr/share/nagios3/htdocs/media
-usr/share/nagios3/htdocs/robots.txt
-usr/share/nagios3/htdocs/stylesheets/* /etc/nagios3/stylesheets/
-debian/apache2.conf usr/share/nagios3-cgi/

debian/nagios3-cgi.links

@@ -1,4 +0,0 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/js/jquery-1.7.1.min.js
-etc/nagios3/apache2.conf etc/apache2/conf-available/nagios3.conf
-usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/includes/jquery-1.7.1.min.js
-usr/share/javascript/jquery/jquery.min.js usr/share/nagios3/htdocs/js/jquery-1.7.1.min.js

debian/nagios3-cgi.postinst

@@ -1,101 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# some shorthands for sanity
-en="/etc/nagios3"
-enc="/etc/nagios3/conf.d"
-usn="/usr/share/nagios3"
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$NAG3DEBUG" ]; then
-  echo "now debugging $0 $@"
-  set -x
-fi
-
-# location of the default apache configuration for nagios.
-apacheconf=$en/apache2.conf
-# location of the default htpasswd authentication file.
-htpw=$en/htpasswd.users
-
-setperm() {
-    local user="$1"
-    local group="$2"
-    local mode="$3"
-    local file="$4"
-    shift 4
-    # only do something when no setting exists
-    if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
-      if [ -e "$file" ]; then
-        chown "$user":"$group" "$file"
-        chmod "$mode" "$file"
-      fi
-    fi
-}
-
-case "$1" in
-  configure)
-    if ! getent passwd nagios > /dev/null ; then
-      echo 'Adding system-user for nagios' 1>&2
-      adduser --system --group --home /var/lib/nagios \
-              --disabled-login --force-badname nagios > /dev/null
-    fi
-
-	db_get nagios3/adminpassword
-	admpass="$RET"
-
-	# register apache2.conf via ucf:
-	ucf --debconf-ok /usr/share/nagios3-cgi/apache2.conf $apacheconf
-
-   echo "enabling Apache2 config..."
-
-   COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-
-   # NEW method for Apache >= 2.4
-   if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
-       . /usr/share/apache2/apache2-maintscript-helper
-
-       apache2_invoke enmod cgi
-       apache2_invoke enconf nagios3
-
-       # remove OLD Apache 2.2 link
-       [ -L /etc/apache2/conf.d/nagios3.conf ] && rm /etc/apache2/conf.d/nagios3.conf
-
-       # OLD methods for Apache < 2.4
-   elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
-
-       # create symlink if not existing
-       [ -f /etc/apache2/conf.d/nagios3.conf ] || ln -vs $apacheconf /etc/apache2/conf.d/nagios3.conf
-        if [ -f /etc/init.d/apache2 ] ; then
-            if [ -x /usr/sbin/invoke-rc.d ]; then
-                invoke-rc.d apache2 reload 3>/dev/null || true
-            else
-                /etc/init.d/apache2 reload 3>/dev/null || true
-            fi
-        fi
-   fi
-
-	# we reset the password every run, so if it exists we're running
-	# after being specifically given a password and can unconditionally set it.
-	# XXX there's no way of setting the pw w/out giving it on the cmdline? wtf?
-	if [ -n "$admpass" ]; then
-		touch "$htpw"
-		htpasswd -b "$htpw" nagiosadmin "$admpass"
-	fi
-
-	# everything went well, so now let's reset the password
-	db_set nagios3/adminpassword ""
-	db_set nagios3/adminpassword-repeat ""
-	# ... done with debconf here
-	db_stop
-    ;;
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-  *)
-    echo "postinst called with unknown argument \$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#

debian/nagios3-cgi.postrm

@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# some shorthands for sanity
-en="/etc/nagios3"
-enc="/etc/nagios3/conf.d"
-usn="/usr/share/nagios3"
-
-case "$1" in
-  remove)
-  	;;
-  purge)
-	rm -f /etc/nagios3/htpasswd.users
-	rm -f /etc/nagios3/apache2.conf
-	if which ucf >/dev/null 2>&1; then
-		ucf --purge /etc/nagios3/apache2.conf
-	fi
-    ;;
-esac
-
-#DEBHELPER#

debian/nagios3-cgi.templates

@@ -1,16 +0,0 @@
-Template: nagios3/adminpassword
-Type: password
-_Description: Nagios web administration password:
- Please provide the password to be created with the "nagiosadmin" user.
- .
- This is the username and password you will use to log in to your nagios
- installation after configuration is complete.  If you do not provide
- a password, you will have to configure access to nagios yourself.
-
-Template: nagios3/adminpassword-repeat
-Type: password
-_Description: Password confirmation:
-
-Template: nagios3/adminpassword-mismatch
-Type: note
-_Description: The passwords do not match

debian/nagios3-common.dirs

@@ -1,10 +0,0 @@
-etc/init.d
-etc/nagios3
-etc/nagios3/conf.d
-usr/share/nagios3/plugins/eventhandlers
-var/lib/nagios3/rw
-var/lib/nagios3/spool
-var/lib/nagios3/spool/checkresults
-var/log/nagios3/archives
-var/cache/nagios3
-usr/share/nagios3/debian

debian/nagios3-common.install

@@ -1,8 +0,0 @@
-contrib/eventhandlers/* usr/share/nagios3/plugins/eventhandlers
-debian-configs/* /etc/nagios3
-debian/conf.d/* /etc/nagios3/conf.d
-debian/resource.cfg /etc/nagios3
-sample-config/*.cfg /usr/share/doc/nagios3-common/examples
-sample-config/README /usr/share/doc/nagios3-common/examples
-sample-config/template-object/*.cfg /usr/share/doc/nagios3-common/examples/template-object
-sample-config/template-object/README /usr/share/doc/nagios3-common/examples/template-object

debian/nagios3-common.links

@@ -1 +0,0 @@
-usr/share/nagios3/htdocs/docs usr/share/doc/nagios3-common/html

debian/nagios3-common.lintian-overrides

@@ -1,2 +0,0 @@
-non-standard-file-perm etc/nagios3/resource.cfg 0600 != 0644
-dir-or-file-in-var-run var/run/nagios3/

debian/nagios3-common.postrm

@@ -1,29 +0,0 @@
-#!/bin/sh -e
-
-# some shorthands for sanity
-en="/etc/nagios3"
-enc="/etc/nagios3/conf.d"
-usn="/usr/share/nagios3"
-
-case "$1" in
-  remove)
-  	;;
-  purge)
-        for file in $en/resource.cfg /var/log/nagios3 /var/run/nagios3 \
-	            /var/lib/nagios3 /var/lib/nagios3/spool \
-		    /var/lib/nagios3/spool/checkresults \
-		    /var/cache/nagios3 /var/lib/nagios3/rw; do
-	    dpkg-statoverride --force --remove $file 2>/dev/null || true
-	done
-        rm -rf /var/run/nagios3 /var/log/nagios3 /var/lib/nagios3 \
-	       /var/cache/nagios3
-	rm -f /etc/nagios3/conf.d/host-gateway_nagios3.cfg
-	#rm -f /etc/nagios3/conf.d/extcommands_nagios3.cfg
-	if which ucf >/dev/null 2>&1; then
-		ucf --purge /etc/nagios3/conf.d/host-gateway_nagios3.cfg
-		#ucf --purge /etc/nagios3/conf.d/extcommands_nagios3.cfg
-	fi
-    ;;
-esac
-
-#DEBHELPER#

debian/nagios3-core.dirs

@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/nagios3

debian/nagios3-core.install

@@ -1 +0,0 @@
-usr/sbin/p1.pl usr/lib/nagios3/

debian/nagios3-core.links

@@ -1 +0,0 @@
-usr/share/doc/nagios3-common usr/share/doc/nagios3-core

debian/nagios3-core.manpages

@@ -1,2 +0,0 @@
-debian/nagios3.8
-debian/nagios3stats.8

debian/nagios3-core.postinst

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-#if we stop nagios3 in nagios3.prerm we should also start it here..
-#(#481334)
-if [ -x "/etc/init.d/nagios3" ]; then
-	if ! /etc/init.d/nagios3 status >/dev/null; then
-
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-			invoke-rc.d nagios3 start || true
-		else
-			/etc/init.d/nagios3 start || true
-		fi
-	fi
-fi
-
-#DEBHELPER#

debian/nagios3-core.prerm

@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-# we attempt to stop nagios3 twice, once in nagios3-common's prerm
-# and once here.  otherwise, if nagios3+nagios3-common are being purged,
-# the /usr/sbin/nagios3 binary could disappear before nagios3-common's
-# prerm script runs, which would prevent it from being able to stop
-# the binary.
-if [ -x "/etc/init.d/nagios3" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d nagios3 stop || true
-	else
-		/etc/init.d/nagios3 stop || true
-	fi
-fi
-
-#DEBHELPER#

debian/nagios3-dbg.manpages

@@ -1 +0,0 @@
-debian/mini_epn_nagios3.8

debian/nagios3-dbg.postinst

@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-update-alternatives --quiet --install /usr/bin/mini_epn mini_epn /usr/bin/mini_epn_nagios3 10 \
-        --slave /usr/share/man/man8/mini_epn.8.gz mini_epn.8.gz /usr/share/man/man8/mini_epn_nagios3.8.gz
-
-#DEBHELPER#

debian/nagios3-dbg.prerm

@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" != "upgrade" ]; then
-  update-alternatives --remove mini_epn /usr/bin/mini_epn_nagios3
-fi
-
-#DEBHELPER#

debian/nagios3-doc.dirs

@@ -1,2 +0,0 @@
-usr/share/nagios3/htdocs
-etc/nagios3/stylesheets

debian/nagios3-doc.install

@@ -1 +0,0 @@
-usr/share/nagios3/htdocs/docs

debian/nagios3-doc.links

@@ -1,2 +0,0 @@
-usr/share/nagios3/htdocs/docs usr/share/doc/nagios3-doc/html
-etc/nagios3/stylesheets usr/share/nagios3/stylesheets

debian/nagios3-doc.lintian-overrides

@@ -1 +0,0 @@
-package-contains-empty-directory usr/share/nagios3/htdocs/ssi/

debian/nagios3.links

@@ -1 +0,0 @@
-usr/share/doc/nagios3-common usr/share/doc/nagios3

debian/nagios3.lintian-overrides

@@ -1 +0,0 @@
-usr-share-doc-symlink-without-dependency nagios3-common

debian/nagios4-cgi.config

@@ -0,0 +1,68 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+# (taken from the webapps-common httpd functions)
+# wc_httpd_installed: test for installed httpds
+# usage:
+#       wc_httpd_installed [ httpd1 httpd2 ... ]
+#
+# no arguments implies to test for all servers
+wc_httpd_installed(){
+        local httpds
+        if [ "$*" ]; then
+                httpds=$*
+        else
+                httpds=$wc_httpd_supported
+        fi
+        for f in $httpds; do
+                if test -x /usr/sbin/$f; then
+                        echo $f
+                fi
+        done
+}
+
+
+# list of installed servers to check for
+default_servers=`wc_httpd_installed apache2 apache apache-ssl apache-perl`
+# convert list to comma seperated list
+server_list=`echo $default_servers | sed -e 's/[[:space:]][[:space:]]*/, /g'`
+
+# if they haven't already been prompted, preseed the server selection
+db_fget nagios4/httpd seen
+if [ "$RET" = "false" ]; then
+	db_set nagios4/httpd $server_list
+fi
+
+db_input medium nagios4/httpd || true
+db_go || true
+db_get nagios4/httpd
+keepgoing="$RET"
+
+if [ "$keepgoing" ]; then
+	db_input medium nagios4/nagios1-in-apacheconf || true
+
+	# the passwords are reset at the end of every postinst run,
+	# however, they are left in the "seen" state so that the
+	# admin is not prompted for them at every upgrade.
+	while [ ! "$passwordsmatch" ]; do
+		#only ask for a password if no htpasswd exists
+		test -f /etc/nagios4/htpasswd.users && break 
+		db_input high nagios4/adminpassword || true
+		db_input high nagios4/adminpassword-repeat || true
+		db_go || true
+		db_get nagios4/adminpassword
+		p1="$RET"
+		db_get nagios4/adminpassword-repeat
+		p2="$RET"
+		if [ "$p1" = "$p2" ]; then
+			passwordsmatch="yes"
+		else
+			db_fset nagios4/adminpassword seen false
+			db_fset nagios4/adminpassword-repeat seen false
+			db_fset nagios4/adminpassword-mismatch seen false
+			db_input critical nagios4/adminpassword-mismatch || true
+		fi
+	done
+fi
+db_go || true

debian/nagios4-cgi.dirs

@@ -0,0 +1,3 @@
+etc/nagios4/stylesheets
+usr/share/nagios4/htdocs/ssi 
+usr/lib/cgi-bin

debian/nagios4-cgi.install

@@ -0,0 +1,10 @@
+debian/httpd.webapps-common /usr/share/nagios4/debian
+debian-configs/cgi.cfg /etc/nagios4
+usr/share/nagios4/htdocs/*.php
+usr/share/nagios4/htdocs/media
+usr/share/nagios4/htdocs/contexthelp
+usr/share/nagios4/htdocs/robots.txt
+usr/share/nagios4/htdocs/images
+usr/share/nagios4/htdocs/includes
+usr/lib/cgi-bin/*
+usr/share/nagios4/htdocs/stylesheets/* /etc/nagios4/stylesheets/

debian/nagios4-cgi.postinst

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+set -e
+
+# some shorthands for sanity
+en="/etc/nagios4"
+enc="/etc/nagios4/conf.d"
+usn="/usr/share/nagios4"
+
+. /usr/share/debconf/confmodule
+. $usn/debian/httpd.webapps-common
+
+if [ -n "$NAG4DEBUG" ]; then
+  echo "now debugging $0 $@"
+  set -x
+fi
+
+# location of the default apache configuration for nagios.
+apacheconf=$en/apache2.conf
+# location of the default htpasswd authentication file.
+htpw=$en/htpasswd.users
+
+setperm() {
+    local user="$1"
+    local group="$2"
+    local mode="$3"
+    local file="$4"
+    shift 4
+    # only do something when no setting exists
+    if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+      chown "$user":"$group" "$file"
+      chmod "$mode" "$file"
+    fi
+}
+
+case "$1" in
+  configure)
+    if ! getent passwd nagios > /dev/null ; then
+      echo 'Adding system-user for nagios' 1>&2
+      adduser --system --group --home /var/lib/nagios \
+              --disabled-login --force-badname nagios > /dev/null
+    fi
+
+	# get the list of selected servers
+	db_get nagios4/httpd
+	servers=$(echo $RET | sed -e 's/,/ /g')
+	db_get nagios4/adminpassword
+	admpass="$RET"
+	# get whether they want support for 1.x urls:
+	db_get nagios4/nagios1-in-apacheconf
+	nagiosone="$RET"
+
+	unwanted_servers=""
+
+	#check which servers to uninclude
+	for s in $wc_httpd_supported
+	do
+		if ! echo $servers | grep -q $s 
+		then
+			unwanted_servers="$s $unwanted_servers"
+		fi
+	done
+
+	# register apache2.conf via ucf:
+	if [ "$nagiosone" = "true" ]; then
+		ucf --debconf-ok /usr/share/doc/nagios4-common/examples/apache2.nagios1.conf $apacheconf
+	else
+		ucf --debconf-ok /usr/share/doc/nagios4-common/examples/apache2.conf $apacheconf
+	fi
+
+
+	# configure the web servers, if it is desired
+	if [ "$servers" ]; then
+		if wc_httpd_apache_include $apacheconf nagios4 $servers; then
+			# reload the selected servers if they are running 
+			running_servers="$(wc_httpd_running $servers)"
+			if [ "$running_servers" ]; then
+				wc_httpd_invoke "reload" $running_servers
+			fi
+		fi	
+	fi
+
+	if [ "$unwanted_servers" ]; then
+		servers_to_deconf="$(wc_httpd_apache_configured $apacheconf nagios4 $unwanted_servers)"
+		if [ "$servers_to_deconf" ]; then
+			if wc_httpd_apache_uninclude $apacheconf nagios4 $servers_to_deconf; then
+				# reload the selected servers if they are running
+				running_servers="$(wc_httpd_running $unwanted_servers)"
+				if [ "$running_servers" ]; then
+					wc_httpd_invoke "reload" $running_servers
+				fi
+			fi
+		fi
+	fi
+
+
+	# we reset the password every run, so if it exists we're running
+	# after being specifically given a password and can unconditionally set it.
+	# XXX there's no way of setting the pw w/out giving it on the cmdline? wtf?
+	if [ -n "$admpass" ]; then
+		touch "$htpw"
+		htpasswd -b "$htpw" nagiosadmin "$admpass"
+	fi
+
+	# everything went well, so now let's reset the password
+	db_set nagios4/adminpassword ""
+	db_set nagios4/adminpassword-repeat ""
+	# ... done with debconf here
+	db_stop
+    ;;
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+  *)
+    echo "postinst called with unknown argument \$1'" >&2
+    exit 1
+    ;;
+esac
+
+#DEBHELPER#

debian/nagios4-cgi.postrm

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# some shorthands for sanity
+en="/etc/nagios4"
+enc="/etc/nagios4/conf.d"
+usn="/usr/share/nagios4"
+
+case "$1" in
+  remove)
+  	;;
+  purge)
+	rm -f /etc/nagios4/htpasswd.users
+	rm -f /etc/nagios4/apache2.conf
+	if which ucf >/dev/null 2>&1; then
+		ucf --purge /etc/nagios4/apache2.conf
+	fi
+    ;;
+esac
+
+#DEBHELPER#

debian/nagios4-cgi.prerm

@@ -1,17 +1,17 @@
 #!/bin/sh -e
 
-. /usr/share/nagios3/debian/httpd.webapps-common
+. /usr/share/nagios4/debian/httpd.webapps-common
 
-apacheconf="/etc/nagios3/apache2.conf"
+apacheconf="/etc/nagios4/apache2.conf"
 
 if [ -f $apacheconf ]; then
   case "$1" in
     remove)
 	# find the configured servers
-	configured_servers=`wc_httpd_apache_configured $apacheconf nagios3`
+	configured_servers=`wc_httpd_apache_configured $apacheconf nagios4`
 	if [ "$configured_servers" ]; then
 		# deconfigure them
-		wc_httpd_apache_uninclude $apacheconf nagios3 $configured_servers
+		wc_httpd_apache_uninclude $apacheconf nagios4 $configured_servers
 		# reload the configured servers if they are running 
 		running_servers="`wc_httpd_running $configured_servers`"
 		if [ "$running_servers" ]; then

debian/nagios4-cgi.templates

@@ -0,0 +1,38 @@
+Template: nagios4/httpd
+Type: multiselect
+Choices: apache2
+Default: apache2
+Description: Apache servers to configure for nagios4:
+ Please select which apache servers should be configured for nagios4.
+ .
+ If you would prefer to perform configuration manually, leave all
+ servers unselected.
+
+Template: nagios4/adminpassword
+Type: password
+Description: Nagios web administration password:
+ Please provide the password to be created with the "nagiosadmin" user.
+ .
+ This is the username and password you will use to log in to your nagios
+ installation after configuration is complete.  If you do not provide
+ a password, you will have to configure access to nagios yourself.
+
+Template: nagios4/adminpassword-repeat
+Type: password
+Description: Password confirmation:
+
+Template: nagios4/adminpassword-mismatch
+Type: note
+Description: The passwords do not match
+
+Template: nagios4/nagios1-in-apacheconf
+Type: boolean
+Default: false
+Description: Enable support for nagios 1.x links in nagios4?
+ Please choose whether the Apache configuration for nagios4 should
+ provide compatibility with links from nagios 1.x.
+ .
+ If you select this option, the apache configuration used for nagios
+ will include directives to support URLs from nagios 1.x.
+ You should not choose this option if you still have nagios 1.x on your
+ system, or unpredictable results may occur.

debian/nagios4-common.dirs

@@ -0,0 +1,11 @@
+etc/init.d
+etc/nagios4
+etc/nagios4/conf.d
+usr/share/nagios4/plugins/eventhandlers
+var/lib/nagios4/rw
+var/lib/nagios4/spool
+var/lib/nagios4/spool/checkresults
+var/log/nagios4/archives
+var/run/nagios4
+var/cache/nagios4
+usr/share/nagios4/debian

debian/nagios4-common.examples

@@ -3,3 +3,4 @@ sample-config/template-object/localhost.cfg
 sample-config/resource.cfg
 sample-config/nagios.cfg
 sample-config/cgi.cfg
+debian/apache2.conf

debian/nagios4-common.install

@@ -0,0 +1,8 @@
+debian-configs/* /etc/nagios4
+debian/resource.cfg /etc/nagios4
+debian/conf.d/* /etc/nagios4/conf.d
+sample-config/README /usr/share/doc/nagios4-common/examples
+sample-config/*.cfg /usr/share/doc/nagios4-common/examples
+sample-config/template-object/README /usr/share/doc/nagios4-common/examples/template-object
+sample-config/template-object/*.cfg /usr/share/doc/nagios4-common/examples/template-object
+contrib/eventhandlers/* usr/share/nagios4/plugins/eventhandlers

debian/nagios4-common.links

@@ -0,0 +1 @@
+usr/share/nagios4/htdocs/docs usr/share/doc/nagios4-common/html

debian/nagios4-common.lintian-overrides

@@ -0,0 +1,2 @@
+non-standard-file-perm etc/nagios4/resource.cfg 0600 != 0644
+dir-or-file-in-var-run var/run/nagios4/

debian/nagios4-common.nagios4.default

@@ -1,14 +1,14 @@
-# /etc/default/nagios3
+# /etc/default/nagios4
 
-# Enable Nagios3 at boottime? ("no" disables nagios3)
+# Enable Nagios3 at boottime? ("no" disables nagios4)
 # compatibility note: if this variable is _not_ found Nagios3 will start
 ENABLED="yes"
 
 # location of the nagios configuration file
-NAGIOSCFG="/etc/nagios3/nagios.cfg"
+NAGIOSCFG="/etc/nagios4/nagios.cfg"
 
 # location of the CGI configuration file
-CGICFG="/etc/nagios3/cgi.cfg"
+CGICFG="/etc/nagios4/cgi.cfg"
 
 # nicelevel to run nagios daemon with
 NICENESS=5

debian/nagios4-common.nagios4.init

@@ -5,10 +5,10 @@
 #               Clamav version by Magnus Ekdahl <magnus@debian.org>
 #		Nagios version by Sean Finney <seanius@debian.org> and probably others
 #		nagios2 version by Marc Haber <mh+debian-packages@zugschlus.de>
-#		nagios3 version by Alexander Wirt <formorer@debian.org>
+#		nagios4 version by Alexander Wirt <formorer@debian.org>
 
 ### BEGIN INIT INFO
-# Provides:          nagios3
+# Provides:          nagios4
 # Required-Start:    $local_fs $remote_fs $syslog $named $network $time
 # Required-Stop:     $local_fs $remote_fs $syslog $named $network
 # Should-Start:      
@@ -23,15 +23,15 @@ set -e
 
 . /lib/lsb/init-functions
 
-DAEMON=/usr/sbin/nagios3
+DAEMON=/usr/sbin/nagios4
-NAME="nagios3"
+NAME="nagios4"
-DESC="nagios3 monitoring daemon"
+DESC="nagios4 monitoring daemon"
-NAGIOSCFG="/etc/nagios3/nagios.cfg"
+NAGIOSCFG="/etc/nagios4/nagios.cfg"
-CGICFG="/etc/nagios3/cgi.cfg"
+CGICFG="/etc/nagios4/cgi.cfg"
 NICENESS=5
 
 [ -x "$DAEMON" ] || exit 0
-[ -r /etc/default/nagios3 ] && . /etc/default/nagios3
+[ -r /etc/default/nagios4 ] && . /etc/default/nagios4
 
 
 # this is from madduck on IRC, 2006-07-06
@@ -47,18 +47,8 @@ log()
   log_action_end_msg ${success:-0} "$*"
 }
 
-check_run () {
-    if [ ! -d '/var/run/nagios3' ];
-    then
-        mkdir /var/run/nagios3
-        chown nagios:nagios /var/run/nagios3
-        chmod 0750 /var/run/nagios3
-    fi  
-}
-
-
 check_started () {
-	#nagios3-core can be installed without -cgi
+	#nagios4-core can be installed without -cgi
 	if [ -e $CGICFG ];
 	then
 		check_cmd=$(get_config nagios_check_command $CGICFG)
@@ -68,7 +58,7 @@ check_started () {
 		fi
 	else 
 		#use hardcoded default version
-		check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3'"
+		check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/nagios4/status.dat 5 '/usr/sbin/nagios4'"
 	fi
 
   eval $check_cmd >/dev/null
@@ -131,15 +121,19 @@ if [ ! -f "$NAGIOSCFG" ]; then
 fi
 
 THEPIDFILE=$(get_config "lock_file")
-[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/nagios3/nagios.pid'
+[ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/nagios4/nagios.pid'
 
 start () {
 
   if [ "$ENABLED" = "no"  ]; then
-	  log_warning_msg "Not starting Nagios3 - set ENABLED to yes in /etc/default/nagios3"
+	  log_warning_msg "Not starting Nagios3 - set ENABLED to yes in /etc/defrault/nagios4"
 	  exit 0
   fi
 
+  DIRECTORY=$(dirname $THEPIDFILE)
+  [ ! -d $DIRECTORY ] && mkdir -p $DIRECTORY
+  chown nagios:nagios $DIRECTORY
+
   if ! check_started; then
     if ! check_named_pipe; then
       log_action_msg "named pipe exists - removing"
@@ -162,13 +156,13 @@ start () {
 stop () {
     killproc -p $THEPIDFILE
     ret=$?
-    if [ `pidof nagios3 | wc -l ` -gt 0 ]; then
+    if [ `pidof nagios4 | wc -l ` -gt 0 ]; then
         echo -n "Waiting for $NAME daemon to die.."
         cnt=0
-        while [ `pidof nagios3 | wc -l ` -gt 0 ]; do
+        while [ `pidof nagios4 | wc -l ` -gt 0 ]; do
             cnt=`expr "$cnt" + 1`
             if [ "$cnt" -gt 15 ]; then
-                kill -9 `pidof nagios3`
+                kill -9 `pidof nagios4`
                 break
             fi
             sleep 1
@@ -218,12 +212,6 @@ reload () {
  fi
 }
 
-check() {
-    $DAEMON -v $NAGIOSCFG
-}
-
-check_run
-
 case "$1" in
   start)
     log_daemon_msg "Starting $DESC" "$NAME"

debian/nagios4-common.postinst

@@ -3,13 +3,13 @@
 set -e
 
 # some shorthands for sanity
-en="/etc/nagios3"
+en="/etc/nagios4"
-enc="/etc/nagios3/conf.d"
+enc="/etc/nagios4/conf.d"
-usn="/usr/share/nagios3"
+usn="/usr/share/nagios4"
 
 . /usr/share/debconf/confmodule
 
-if [ -n "$NAG3DEBUG" ]; then
+if [ -n "$NAG4DEBUG" ]; then
   echo "now debugging $0 $@"
   set -x
 fi
@@ -22,11 +22,9 @@ setperm() {
     shift 4
     # only do something when no setting exists
     if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
-      if [ -e "$file" ]; then
       chown "$user":"$group" "$file"
       chmod "$mode" "$file"
     fi
-    fi
 }
 
 case "$1" in
@@ -40,13 +38,14 @@ case "$1" in
 	# explicitly set permissions on some files that are dependent
 	# on the uid/gid of the nagios user, which is dynamically created.
         setperm root nagios 0640 $en/resource.cfg
-        setperm nagios adm 2751 /var/log/nagios3
+        setperm nagios adm 2751 /var/log/nagios4
-        setperm nagios adm 2751 /var/log/nagios3/archives
+        setperm nagios adm 2751 /var/log/nagios4/archives
-        setperm nagios nagios 0750 /var/lib/nagios3
+        setperm nagios nagios 0750 /var/run/nagios4
-	setperm nagios nagios 0750 /var/lib/nagios3/spool
+        setperm nagios nagios 0750 /var/lib/nagios4
-	setperm nagios nagios 0750 /var/lib/nagios3/spool/checkresults
+	setperm nagios nagios 0750 /var/lib/nagios4/spool
-        setperm nagios www-data 02750 /var/cache/nagios3
+	setperm nagios nagios 0750 /var/lib/nagios4/spool/checkresults
-        setperm nagios www-data 0700 /var/lib/nagios3/rw
+        setperm nagios www-data 02750 /var/cache/nagios4
+        setperm nagios www-data 0700 /var/lib/nagios4/rw
 
 	db_stop
     ;;

debian/nagios4-common.postrm

@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+# some shorthands for sanity
+en="/etc/nagios4"
+enc="/etc/nagios4/conf.d"
+usn="/usr/share/nagios4"
+
+case "$1" in
+  remove)
+  	;;
+  purge)
+        for file in $en/resource.cfg /var/log/nagios4 /var/run/nagios4 \
+	            /var/lib/nagios4 /var/lib/nagios4/spool \
+		    /var/lib/nagios4/spool/checkresults \
+		    /var/cache/nagios4 /var/lib/nagios4/rw; do
+	    dpkg-statoverride --force --remove $file 2>/dev/null || true
+	done
+        rm -rf /var/run/nagios4 /var/log/nagios4 /var/lib/nagios4 \
+	       /var/cache/nagios4
+	rm -f /etc/nagios4/conf.d/host-gateway_nagios4.cfg
+	#rm -f /etc/nagios4/conf.d/extcommands_nagios4.cfg
+	if which ucf >/dev/null 2>&1; then
+		ucf --purge /etc/nagios4/conf.d/host-gateway_nagios4.cfg
+		#ucf --purge /etc/nagios4/conf.d/extcommands_nagios4.cfg
+	fi
+    ;;
+esac
+
+#DEBHELPER#

debian/nagios4-core.dirs

@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/nagios4

debian/nagios4-core.links

@@ -0,0 +1 @@
+usr/share/doc/nagios4-common usr/share/doc/nagios4-core

debian/nagios4-core.manpages

@@ -0,0 +1,2 @@
+debian/nagios4.8
+debian/nagios4stats.8

debian/nagios4-core.postinst

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+#if we stop nagios4 in nagios4.prerm we should also start it here..
+#(#481334)
+if [ -x "/etc/init.d/nagios4" ]; then
+	if ! /etc/init.d/nagios4 status >/dev/null; then
+
+		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+			invoke-rc.d nagios4 start || true
+		else
+			/etc/init.d/nagios4 start || true
+		fi
+	fi
+fi
+
+#DEBHELPER#

debian/nagios4-core.prerm

@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+# we attempt to stop nagios4 twice, once in nagios4-common's prerm
+# and once here.  otherwise, if nagios4+nagios4-common are being purged,
+# the /usr/sbin/nagios4 binary could disappear before nagios4-common's
+# prerm script runs, which would prevent it from being able to stop
+# the binary.
+if [ -x "/etc/init.d/nagios4" ]; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d nagios4 stop || true
+	else
+		/etc/init.d/nagios4 stop || true
+	fi
+fi
+
+#DEBHELPER#

debian/nagios4-dbg.postinst

@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+#update-alternatives --quiet --install /usr/bin/mini_epn mini_epn /usr/bin/mini_epn_nagios4 10 \
+#        --slave /usr/share/man/man8/mini_epn.8.gz mini_epn.8.gz /usr/share/man/man8/mini_epn_nagios4.8.gz
+
+#DEBHELPER#

debian/nagios4-dbg.prerm

@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+#if [ "$1" != "upgrade" ]; then
+#  update-alternatives --remove mini_epn /usr/bin/mini_epn_nagios4
+#fi
+
+#DEBHELPER#

debian/nagios4-doc.dirs

@@ -0,0 +1,2 @@
+usr/share/nagios4/htdocs
+etc/nagios4/stylesheets

debian/nagios4-doc.doc-base

@@ -1,9 +1,9 @@
-Document: nagios3
+Document: nagios4
 Title: Nagios Documentation
 Author: Ethan Galstad
 Abstract: Nagios user and administrator's documentation
 Section: Network/Monitoring
 
 Format: HTML
-Index: /usr/share/nagios3/htdocs/docs/index.html
+Index: /usr/share/nagios4/htdocs/docs/index.html
-Files: /usr/share/nagios3/htdocs/docs/*.html
+Files: /usr/share/nagios4/htdocs/docs/*.html

debian/nagios4-doc.install

@@ -0,0 +1 @@
+usr/share/nagios4/htdocs/docs

debian/nagios4-doc.links

@@ -0,0 +1,2 @@
+usr/share/nagios4/htdocs/docs usr/share/doc/nagios4-doc/html
+etc/nagios4/stylesheets usr/share/nagios4/stylesheets

debian/nagios4-doc.lintian-overrides

@@ -0,0 +1 @@
+package-contains-empty-directory usr/share/nagios4/htdocs/ssi/

debian/nagios4.8

@@ -1,13 +1,13 @@
-.TH nagios3 "8" "February 2006" "sean finney " "nagios"
+.TH nagios4 "8" "February 2006" "sean finney " "nagios"
 .SH NAME
-nagios3 \- network/systems status monitoring daemon
+nagios4 \- network/systems status monitoring daemon
 
 .SH SYNOPSIS
-.B nagios3 [\-h] [\-v] [\-s] [\-d] <main_config_file>
+.B nagios4 [\-h] [\-v] [\-s] [\-d] <main_config_file>
 .br
 
 .SH DESCRIPTION
-.B nagios3
+.B nagios4
 is a daemon program that monitors the status of various network
 accessible systems, devices, and more.  For more information, please
 consult the online documentation available at http://www.nagios.org,
@@ -17,7 +17,7 @@ or on your nagios server's web page.
 .TP
 main_config_file
 The main configuration file.  On debian systems this defaults to
-/etc/nagios3/nagios.cfg
+/etc/nagios4/nagios.cfg
 .TP
 \fB\-h\fR
 A helpful usage message
@@ -36,11 +36,11 @@ Starts Nagios in daemon mode (instead of as a foreground process).
 
 .SH FILES
 .TP
-.IP /etc/nagios3
+.IP /etc/nagios4
-Default configuration directory for nagios3
+Default configuration directory for nagios4
 
 .SH AUTHOR
-nagios3 is written and maintained by Ethan Galstad <nagios@nagios.org>.  This
+nagios4 is written and maintained by Ethan Galstad <nagios@nagios.org>.  This
 manual page was written by sean finney <seanius@debian.org> for the
 Debian GNU/Linux operating system (but it may be freely used, modified,
 and redistributed by others).

debian/nagios4.links

@@ -0,0 +1 @@
+usr/share/doc/nagios4-common usr/share/doc/nagios4

debian/nagios4.lintian-overrides

@@ -0,0 +1 @@
+usr-share-doc-symlink-without-dependency nagios4-common

debian/nagios4stats.8

@@ -1,13 +1,13 @@
-.TH nagios3stats "8" "February 2006" "sean finney " "nagios"
+.TH nagios4stats "8" "February 2006" "sean finney " "nagios"
 .SH NAME
-nagios3stats \- report statistics information from the nagios system
+nagios4stats \- report statistics information from the nagios system
 
 .SH SYNOPSIS
-.B nagios3stats [\-hVL] [\-c config] [\-m] [\-d]
+.B nagios4stats [\-hVL] [\-c config] [\-m] [\-d]
 .br
 
 .SH DESCRIPTION
-.B nagios3stats
+.B nagios4stats
 Is a program designed to provide information on the running nagios
 system.  It can provide a brief summary of information, or it can
 be used to export specific information about the nagios system
@@ -20,15 +20,15 @@ with your nagios server's web page.
 .TP
 \fB\-c\fR|\-\-config=FILE
 The main configuration file.  On debian systems this defaults to
-/etc/nagios3/nagios.cfg
+/etc/nagios4/nagios.cfg
 .TP
 \fB\-m\fR|\-\-mrtg
 Print output in MRTG-compatible format.  For more details run
-nagios3stats with \-\-help
+nagios4stats with \-\-help
 .TP
 \fB\-d\fR|\-\-data=VARS
 Comma-seperated list of variables to output in MRTG format.  For
-more details run nagios3stats with \-\-help.
+more details run nagios4stats with \-\-help.
 .TP
 \fB\-h\fR|\-\-help
 A helpful usage message
@@ -41,11 +41,11 @@ Print license details
 
 .SH FILES
 .TP
-.IP /etc/nagios3
+.IP /etc/nagios4
-Default configuration directory for nagios3
+Default configuration directory for nagios4
 
 .SH AUTHOR
-nagios3 is written and maintained by Ethan Galstad <nagios@nagios.org>.  This
+nagios4 is written and maintained by Ethan Galstad <nagios@nagios.org>.  This
 manual page was written by sean finney <seanius@debian.org> for the
 Debian GNU/Linux operating system (but it may be freely used, modified,
 and redistributed by others).

debian/patches/10_p1_pl_shebang.patch

@@ -1,12 +0,0 @@
-Author: Marc Haber <mh+debian-packages@zugschlus.de>
-Description: Fix shebang of perl interpreter
---- a/p1.pl
-+++ b/p1.pl
-@@ -1,4 +1,6 @@
-- package Embed::Persistent;
-+#!/usr/bin/perl
-+
-+package Embed::Persistent;
- 
- # p1.pl for Nagios
- 

debian/patches/50_cgi.cfg-debianize.patch

@@ -30,7 +30,7 @@ Description: Debianize cgi.cfg
 +# have to be tweaked a bit, as different versions of the plugin
 +# use different command line arguments/syntaxes.
  
-+nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3'
++nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios4/status.dat 5 '/usr/sbin/nagios4'
  
  
  # AUTHENTICATION USAGE

debian/patches/52_nagios.cfg-debianize.patch

@@ -2,35 +2,24 @@ Author: Alexander Wirt <formorer@debian.org>
 Description: Debianize nagios.cfg
 --- a/sample-config/nagios.cfg.in
 +++ b/sample-config/nagios.cfg.in
-@@ -2,10 +2,6 @@
- #
- # NAGIOS.CFG - Sample Main Config File for Nagios @VERSION@
- #
--# Read the documentation for more information on this configuration
--# file.  I've provided some comments here, but things may not be so
--# clear without further explanation.
--#
- # Last Modified: 12-14-2008
- #
- ##############################################################################
 @@ -16,9 +12,19 @@
  # for historical purposes.  This should be the first option specified 
  # in the config file!!!
  
 -log_file=@localstatedir@/nagios.log
-+log_file=/var/log/nagios3/nagios.log
++log_file=/var/log/nagios4/nagios.log
  
 +# Commands definitions
-+cfg_file=/etc/nagios3/commands.cfg
++cfg_file=/etc/nagios4/commands.cfg
  
 +# Debian also defaults to using the check commands defined by the debian
 +# nagios-plugins package
 +cfg_dir=/etc/nagios-plugins/config
 +
-+# Debian uses by default a configuration directory where nagios3-common,
++# Debian uses by default a configuration directory where nagios4-common,
 +# other packages and the local admin can dump or link configuration
 +# files into.
-+cfg_dir=/etc/nagios3/conf.d
++cfg_dir=/etc/nagios4/conf.d
  
  # OBJECT CONFIGURATION FILE(S)
  # These are the object configuration files in which you define hosts,
@@ -57,7 +46,7 @@ Description: Debianize nagios.cfg
  # when the config files are modified after Nagios starts.
  
 -object_cache_file=@localstatedir@/objects.cache
-+object_cache_file=/var/cache/nagios3/objects.cache
++object_cache_file=/var/cache/nagios4/objects.cache
  
  
  
@@ -66,7 +55,7 @@ Description: Debianize nagios.cfg
  #  restarts.
  
 -status_file=@localstatedir@/status.dat
-+status_file=/var/cache/nagios3/status.dat
++status_file=/var/cache/nagios4/status.dat
  
  
  
@@ -93,7 +82,7 @@ Description: Debianize nagios.cfg
  # running.
  
 -temp_file=@localstatedir@/nagios.tmp
-+temp_file=/var/cache/nagios3/nagios.tmp
++temp_file=/var/cache/nagios4/nagios.tmp
  
  
  
@@ -102,7 +91,7 @@ Description: Debianize nagios.cfg
  # placed (assuming you've chosen to do log rotation).
  
 -log_archive_path=@localstatedir@/archives
-+log_archive_path=/var/log/nagios3/archives
++log_archive_path=/var/log/nagios4/archives
  
  
  
@@ -115,15 +104,6 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -1142,7 +1147,7 @@
- # embedded Perl interpreter) is located.  If you didn't compile
- # Nagios with embedded Perl support, this option has no effect.
- 
--p1_file=@bindir@/p1.pl
-+p1_file=/usr/lib/nagios3/p1.pl
- 
- 
- 
 @@ -1226,8 +1231,8 @@
  # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
  # commands.
@@ -140,7 +120,7 @@ Description: Debianize nagios.cfg
  # This option determines where Nagios should write debugging information.
  
 -debug_file=@localstatedir@/nagios.debug
-+debug_file=/var/log/nagios3/nagios.debug
++debug_file=/var/log/nagios4/nagios.debug
  
  
  

debian/patches/60_fix_p1.pl_patch_mini_epn.patch

@@ -1,13 +0,0 @@
-Author: Alexander Wirt <formorer@debian.org>
-Description: Call p1.pl from /usr/lib/nagios3 
---- a/contrib/mini_epn.c
-+++ b/contrib/mini_epn.c
-@@ -19,7 +19,7 @@
- 	#endif
- 	*/
- 
--	char *embedding[] = { "", "p1.pl" };
-+	char *embedding[] = { "", "/usr/lib/nagios3/p1.pl" };
- 	char *plugin_output ;
- 	char fname[MAX_INPUT_CHARS];
- 	char *args[] = {"", "0", "", "", NULL };

debian/patches/70_fix_eventhandler_paths.patch

@@ -7,7 +7,7 @@ Description: Fixes paths for all contributed eventhandlers
  printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/nagios3/rw/nagios.cmd"
++CommandFile="/var/lib/nagios4/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
@@ -18,7 +18,7 @@ Description: Fixes paths for all contributed eventhandlers
  printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/nagios3/rw/nagios.cmd"
++CommandFile="/var/lib/nagios4/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
@@ -29,7 +29,7 @@ Description: Fixes paths for all contributed eventhandlers
  
  # Location of the submit_check_result_via_nsca script
 -SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca"
-+SubmitCmd="/usr/share/nagios3/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
++SubmitCmd="/usr/share/nagios4/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
  
  # Convert the state string to the corresponding return code
  return_code=-1
@@ -53,7 +53,7 @@ Description: Fixes paths for all contributed eventhandlers
  printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/nagios3/rw/nagios.cmd"
++CommandFile="/var/lib/nagios4/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
@@ -64,7 +64,7 @@ Description: Fixes paths for all contributed eventhandlers
  printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/nagios3/rw/nagios.cmd"
++CommandFile="/var/lib/nagios4/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
@@ -79,7 +79,7 @@ Description: Fixes paths for all contributed eventhandlers
  
  # Location of the event handlers
 -eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
-+eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers"
++eventhandlerdir="/usr/share/nagios4/plugins/eventhandlers"
  
  
  # Only take action on hard host states...
@@ -94,7 +94,7 @@ Description: Fixes paths for all contributed eventhandlers
  
  # Location of the event handlers
 -eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
-+eventhandlerdir="/usr/share/nagios3/plugins/eventhandlers"
++eventhandlerdir="/usr/share/nagios4/plugins/eventhandlers"
  
  
  # Only take action on hard service states...
@@ -105,7 +105,7 @@ Description: Fixes paths for all contributed eventhandlers
  echocmd="/bin/echo"
   
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
-+CommandFile="/var/lib/nagios3/rw/nagios.cmd"
++CommandFile="/var/lib/nagios4/rw/nagios.cmd"
   
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`

debian/patches/99_fix_php_warning.patch

@@ -1,20 +0,0 @@
-Author: Alexander Wirt <formorer@debian.org>
-Description: No description.
---- a/html/index.php
-+++ b/html/index.php
-@@ -8,6 +8,7 @@
- </head>
- 
- <?php
-+date_default_timezone_set('UTC');
-  // allow specifying main window URL for permalinks, etc.
- $corewindow="main.php";
- if(isset($_GET['corewindow'])){
---- a/html/main.php
-+++ b/html/main.php
-@@ -1,5 +1,6 @@
- <?php
- include_once(dirname(__FILE__).'/includes/utils.inc.php');
-+date_default_timezone_set('UTC');
- 
- $this_version="3.5.1";

debian/patches/99_security_status_cgi_servicegroup.patch

@@ -1,50 +0,0 @@
-Author: Jonas Meurer <jmeurer@inet.de>
-Description: Stop cgi-bin/status.c from listing unauthorized hosts and
-				services in servicegroup view
-Upstream bugreport: http://tracker.nagios.org/view.php?id=456
---- a/cgi/status.c
-+++ b/cgi/status.c
-@@ -2547,6 +2547,10 @@
- 		if(temp_host == NULL)
- 			continue;
- 
-+		/* make sure user has rights to view this host */
-+		if(is_authorized_for_host(temp_host, &current_authdata) == FALSE)
-+			continue;
-+
- 		/* skip this if it isn't a new host... */
- 		if(temp_host == last_host)
- 			continue;
-@@ -2752,6 +2756,10 @@
- 		if(temp_host == NULL)
- 			continue;
- 
-+		/* make sure user has rights to view this host */
-+		if(is_authorized_for_host(temp_host, &current_authdata) == FALSE)
-+			continue;
-+
- 		/* skip this if it isn't a new host... */
- 		if(temp_host == last_host)
- 			continue;
-@@ -2936,6 +2944,10 @@
- 		if(temp_service == last_service)
- 			continue;
- 
-+		/* make sure user has rights to view this service */
-+		if(is_authorized_for_service(temp_service, &current_authdata) == FALSE)
-+			continue;
-+
- 		/* find the service status */
- 		temp_servicestatus = find_servicestatus(temp_service->host_name, temp_service->description);
- 		if(temp_servicestatus == NULL)
-@@ -3290,6 +3302,10 @@
- 		if(temp_host == NULL)
- 			continue;
- 
-+		/* make sure user has rights to view this host */
-+		if(is_authorized_for_host(temp_host, &current_authdata) == FALSE)
-+			continue;
-+
- 		/* get the status of the host */
- 		temp_hoststatus = find_hoststatus(temp_host->name);
- 		if(temp_hoststatus == NULL)

debian/patches/remove_javascript

@@ -1,19 +0,0 @@
---- a/html/Makefile.in
-+++ b/html/Makefile.in
-@@ -26,7 +26,6 @@
- 	rm -f docs/*~
- 	rm -f docs/images/*.jbf
- 	rm -f stylesheets/*~
--	rm -f js/*~
- 
- distclean: clean
- 	rm -f Makefile config.inc.php
-@@ -61,8 +60,6 @@
- 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- 	for file in contexthelp/*.html; \
- 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
--	for file in js/*.js; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
- #	for file in docs/*.html; \
- #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
- #	for file in docs/images/*.*; \

debian/patches/series

@@ -1,11 +1,6 @@
-remove_javascript
-10_p1_pl_shebang.patch
 40_fix_spurious_dollar_signs_added_to_command_lines.patch
 50_cgi.cfg-debianize.patch
 51_commands.cfg-debianize.patch
 52_nagios.cfg-debianize.patch
 55_strip_logarchivepath.patch
-60_fix_p1.pl_patch_mini_epn.patch
 70_fix_eventhandler_paths.patch
-80_dont_call_home.patch
-99_fix_php_warning.patch

debian/po/POTFILES.in

@@ -1 +1 @@
-[type: gettext/rfc822deb] nagios3-cgi.templates
+[type: gettext/rfc822deb] nagios4-cgi.templates

debian/po/cs.po

@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 2.4-1\n"
+"Project-Id-Version: nagios4 2.4-1\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2006-08-13 17:01+0200\n"
 "Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Heslo webové administrace Nagios:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr ""
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -44,36 +44,36 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Potvrzení hesla:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Hesla nesouhlasí"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Servery Apache pro nastavení s nagios3:"
+#~ msgstr "Servery Apache pro nastavení s nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
-#~ "Vyberte prosím, které servery apache nastavit pro použití s nagios3."
+#~ "Vyberte prosím, které servery apache nastavit pro použití s nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
 #~ "unselected."
 #~ msgstr "Pokud dáváte přednost ruční konfiguraci, nevybírejte žádné servery."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Povolit podporu odkazů nagios 1.x v nagios3?"
+#~ msgstr "Povolit podporu odkazů nagios 1.x v nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Vyberte si prosím, zda má konfigurace Apache pro nagios3 poskytovat "
+#~ "Vyberte si prosím, zda má konfigurace Apache pro nagios4 poskytovat "
 #~ "kompatibilitu s odkazy z nagios 1.x."
 
 #~ msgid ""

debian/po/da.po

@@ -1,12 +1,12 @@
-# Danish translation nagios3.
+# Danish translation nagios4.
-# Copyright (C) 2010 nagios3 og nedenstående oversættere.
+# Copyright (C) 2010 nagios4 og nedenstående oversættere.
-# This file is distributed under the same license as nagios3 package.
+# This file is distributed under the same license as nagios4 package.
 # Joe Hansen <joedalton2@yahoo.dk>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3\n"
+"Project-Id-Version: nagios4\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2010-11-30 17:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Adgangskode for Nagios' internetadministration:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr ""
@@ -32,7 +32,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -44,22 +44,22 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Bekræftelse af adgangskode:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Apacheservere at konfigurere for nagios3:"
+#~ msgstr "Apacheservere at konfigurere for nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
-#~ "Vælg venligst hvilke apacheservere der skal konfigureres for nagios3."
+#~ "Vælg venligst hvilke apacheservere der skal konfigureres for nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -67,14 +67,14 @@ msgstr "Adgangskoderne er ikke ens"
 #~ msgstr ""
 #~ "Hvis du ønsker at udføre konfigurationen manuelt, så vælg ingen servere."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Aktiver understøttelse for nagios 1.x-henvisninger i nagios3?"
+#~ msgstr "Aktiver understøttelse for nagios 1.x-henvisninger i nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Vælg venligst hvorvidt Apachekonfigurationen for nagios3 skal tilbyde "
+#~ "Vælg venligst hvorvidt Apachekonfigurationen for nagios4 skal tilbyde "
 #~ "kompatibilitet med henvisninger fra nagios 1.x."
 
 #~ msgid ""

debian/po/de.po

@@ -1,12 +1,12 @@
 # translation of po-debconf template to German
 # Copyright (C) 2006, Matthias Julius
-# This file is distributed under the same license as the nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 #
 # Matthias Julius <mdeb@julius-net.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 2.5-3\n"
+"Project-Id-Version: nagios4 2.5-3\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2006-11-27 22:53-0500\n"
 "Last-Translator: Matthias Julius <mdeb@julius-net.net>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Passwort für die Web-Administration von nagios:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -47,22 +47,22 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Passwortbestätigung:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein."
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Für nagios3 einzurichtende Apache-Server:"
+#~ msgstr "Für nagios4 einzurichtende Apache-Server:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
-#~ "Bitte wählen Sie, welche Apache-Server für nagios3 eingerichtet werden "
+#~ "Bitte wählen Sie, welche Apache-Server für nagios4 eingerichtet werden "
 #~ "sollen."
 
 #~ msgid ""
@@ -72,14 +72,14 @@ msgstr "Die Passwörter stimmen nicht überein."
 #~ "Falls Sie es vorziehen, die Einrichtung manuell durchzuführen, lassen Sie "
 #~ "alle Server deselektiert."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Unterstützung für nagios-1.x-Links in nagios3 freischalten?"
+#~ msgstr "Unterstützung für nagios-1.x-Links in nagios4 freischalten?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Bitte wählen Sie, ob die Apache-Konfiguration für nagios3 Kompatibilität "
+#~ "Bitte wählen Sie, ob die Apache-Konfiguration für nagios4 Kompatibilität "
 #~ "mit Links von nagios 1.x zur Verfügung stellen soll."
 
 #~ msgid ""

debian/po/es.po

@@ -1,6 +1,6 @@
-# nagios3 po-debconf translation to spanish
+# nagios4 po-debconf translation to spanish
 # Copyright (C) 2004 Software in the Public Interest
-# This file is distributed under the same license as the nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 #
 # Changes:
 # - Initial translation
@@ -27,8 +27,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 2.5\n"
+"Project-Id-Version: nagios4 2.5\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2006-10-23 23:28-0500\n"
 "Last-Translator: Rudy Godoy <rudy@kernel-panik.org>\n"
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Clave de administración web de Nagios"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr ""
@@ -55,7 +55,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -69,23 +69,23 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Confirmar clave:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Servidores apache que se deberían configurar para nagios3:"
+#~ msgstr "Servidores apache que se deberían configurar para nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
 #~ "Por favor, seleccione los servidores apache que se deberían configurar "
-#~ "para nagios3."
+#~ "para nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -94,14 +94,14 @@ msgstr "Las contraseñas no coinciden"
 #~ "No elija ningún servidor si prefiere realizar la configuración de forma "
 #~ "manual."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "¿Desea activar el soporte para enlaces de nagios 1.x en nagios3?"
+#~ msgstr "¿Desea activar el soporte para enlaces de nagios 1.x en nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Indique si la configuración de apache para nagios3 debería ser "
+#~ "Indique si la configuración de apache para nagios4 debería ser "
 #~ "compatible\n"
 #~ "con enlaces de nagios 1.x."
 

debian/po/eu.po

@@ -1,12 +1,12 @@
-# translation of nagios3-eu.po to Euskara
+# translation of nagios4-eu.po to Euskara
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Piarres Beobide <pi@beobide.net>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3-eu\n"
+"Project-Id-Version: nagios4-eu\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2008-09-16 10:46+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
@@ -19,20 +19,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Nagios web kudeatzaile pasahitza:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Mesedez ezarri \"nagiosadmin\" erabiltzailearen pasahitza."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -44,22 +44,22 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Pasahitz berrespena:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Pasahitzak ez datoz bat"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Nagios3-rako konfiguratu behar diren apache zerbitzariak:"
+#~ msgstr "nagios4-rako konfiguratu behar diren apache zerbitzariak:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
-#~ "Mesedez hautatu zein apache zerbitzari konfiguratu behar dira nagios3-"
+#~ "Mesedez hautatu zein apache zerbitzari konfiguratu behar dira nagios4-"
 #~ "rako.apache konfiguratuta errepikatu arte."
 
 #~ msgid ""
@@ -69,14 +69,14 @@ msgstr "Pasahitzak ez datoz bat"
 #~ "Eskuzko instalazio bat egitea nahigo baduzu, utzi zerbitzari guztiak "
 #~ "hautatu gabe."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Nagios 1.x loturako gaitu nagios3-an?"
+#~ msgstr "Nagios 1.x loturako gaitu nagios4-an?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Mesedez hautatu Apache zerbitzariko nagios3 konfigurazioak nagios 1.x "
+#~ "Mesedez hautatu Apache zerbitzariko nagios4 konfigurazioak nagios 1.x "
 #~ "bertsioko loturekin bateragarritasuna mantendu behar duen ala ez."
 
 #~ msgid ""

debian/po/fi.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3\n"
+"Project-Id-Version: nagios4\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
@@ -15,20 +15,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Nagios-verkkoylläpidon salasana:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Anna salasana käyttäjätunnukselle ”nagiosadmin”."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -40,22 +40,22 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Salasanan vahvistus:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Salasanat eivät täsmää."
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Apache-palvelimet, joiden asetuksia muokataan nagios3:a varten:"
+#~ msgstr "Apache-palvelimet, joiden asetuksia muokataan nagios4:a varten:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
-#~ "Valitse minkä Apache-palvelimien asetuksia tulisi muokata nagios3:n "
+#~ "Valitse minkä Apache-palvelimien asetuksia tulisi muokata nagios4:n "
 #~ "käyttöönottamiseksi."
 
 #~ msgid ""
@@ -63,14 +63,14 @@ msgstr "Salasanat eivät täsmää."
 #~ "unselected."
 #~ msgstr "Jos haluat tehdä asetukset käsin, älä valitse mitään palvelinta."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Otetaanko nagiosin version 1.x linkkien tuki käyttöön nagios3:ssa?"
+#~ msgstr "Otetaanko nagiosin version 1.x linkkien tuki käyttöön nagios4:ssa?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Valitse tulisiko nagios3:n Apache-asetusten olla yhteensopivia nagios 1.x:"
+#~ "Valitse tulisiko nagios4:n Apache-asetusten olla yhteensopivia nagios 1.x:"
 #~ "n linkkien kanssa."
 
 #~ msgid ""

debian/po/fr.po

@@ -1,12 +1,12 @@
-# Nagios3 
+# nagios4 
 # Copyright (C) 2006
-# This file is distributed under the same license as the Nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 # Sean Finney, Marc Haber et Joerg Jasper <pkg-nagios-devel@lists.alioth.debian.org>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3_2.4-1\n"
+"Project-Id-Version: nagios4_2.4-1\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2006-06-07 10:58+0100\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Mot de passe pour l'administration web de Nagios :"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr ""
@@ -36,7 +36,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -49,21 +49,21 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Mots de passe différents"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Serveurs Apache à configurer pour Nagios3 :"
+#~ msgstr "Serveurs Apache à configurer pour nagios4 :"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
-#~ msgstr "Veuillez choisir le(s) serveur(s) web à configurer pour Nagios3."
+#~ msgstr "Veuillez choisir le(s) serveur(s) web à configurer pour nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -72,14 +72,14 @@ msgstr "Mots de passe diff
 #~ "Si vous préférez configurer vous-même ce paquet, ne sélectionnez aucun "
 #~ "serveur."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Faut-il activer la gestion des liens de Nagios 1.x pour Nagios3 ?"
+#~ msgstr "Faut-il activer la gestion des liens de Nagios 1.x pour nagios4 ?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Veuillez choisir si la configuration d'Apache pour Nagios3 doit permettre "
+#~ "Veuillez choisir si la configuration d'Apache pour nagios4 doit permettre "
 #~ "la compatibilité avec les liens de Nagios 1.x."
 
 #~ msgid ""

debian/po/it.po

@@ -1,12 +1,12 @@
-# Italian (it) translation of debconf templates for nagios3
+# Italian (it) translation of debconf templates for nagios4
 # Copyright (C) 2008 Software in the Public Interest
-# This file is distributed under the same license as the nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 # Luca Monducci <luca.mo@tiscali.it>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 3.0.3\n"
+"Project-Id-Version: nagios4 3.0.3\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2008-11-15 21:02+0100\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
@@ -18,20 +18,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Password per l'amministrazione di nagios da web:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Inserire la password da associare all'utente \"nagiosadmin\"."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -43,22 +43,22 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Conferma della password:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Le password non coincidono"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Server Apache da configurare per nagios3:"
+#~ msgstr "Server Apache da configurare per nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
-#~ "Selezionare quali server Apache devono essere configurati per nagios3."
+#~ "Selezionare quali server Apache devono essere configurati per nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -67,14 +67,14 @@ msgstr "Le password non coincidono"
 #~ "Per effettuare una configurazione manuale, lasciare tutti i server non "
 #~ "selezionati."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Attivare il supporto per i collegamenti di nagios 1.x in nagios3?"
+#~ msgstr "Attivare il supporto per i collegamenti di nagios 1.x in nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Scegliere se la configurazione di Apache per nagios3 deve fornire anche "
+#~ "Scegliere se la configurazione di Apache per nagios4 deve fornire anche "
 #~ "la compatibilità con i collegamenti di nagios 1.x."
 
 #~ msgid ""

debian/po/ja.po

@@ -1,11 +1,11 @@
-# Japanese debconf templates translation for nagios3.
+# Japanese debconf templates translation for nagios4.
 # Copyright (C) 2007 Noritada Kobayashi
-# This file is distributed under the same license as the nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 (debconf) 2.6-3\n"
+"Project-Id-Version: nagios4 (debconf) 2.6-3\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2007-03-02 22:03+0900\n"
 "Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
@@ -17,20 +17,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "nagios ウェブ管理用パスワード:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "\"nagiosadmin\" ユーザ用に作成するパスワードを入力してください。"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -42,21 +42,21 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "パスワードの確認:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "nagios3 の設定をする Apache サーバ:"
+#~ msgstr "nagios4 の設定をする Apache サーバ:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
-#~ msgstr "nagios3 の設定をする Apache サーバを選択してください。"
+#~ msgstr "nagios4 の設定をする Apache サーバを選択してください。"
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -64,14 +64,14 @@ msgstr "パスワードが一致しません"
 #~ msgstr ""
 #~ "手動で設定を行う方がよい場合は、どのサーバも選択せずに次に進んでください。"
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "nagios3 内で nagios 1.x のリンクのサポートを有効にしますか?"
+#~ msgstr "nagios4 内で nagios 1.x のリンクのサポートを有効にしますか?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "nagios3 用の Apache の設定によって nagios 1.x 由来のリンクとの互換性を与え"
+#~ "nagios4 用の Apache の設定によって nagios 1.x 由来のリンクとの互換性を与え"
 #~ "るかどうかを選択してください。"
 
 #~ msgid ""

debian/po/nl.po

@@ -1,12 +1,12 @@
-# Dutch translation of nagios3 debconf templates.
+# Dutch translation of nagios4 debconf templates.
 # Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 # Jeroen Schot <schot@a-eskwadraat.nl>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 3.2.3-3\n"
+"Project-Id-Version: nagios4 3.2.3-3\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2012-01-06 10:59+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
@@ -18,20 +18,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Nagios webbeheerwachtwoord:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Kies een wachtwoord voor de gebruiker \"nagiosadmin\"."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -43,21 +43,21 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Wachtwoord ter bevestiging:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "De wachtwoorden komen niet overeen"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
 #~ msgstr "Automatisch te configureren apache-servers:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
-#~ msgstr "Welke apache-servers moeten er worden geconfigureerd voor nagios3?"
+#~ msgstr "Welke apache-servers moeten er worden geconfigureerd voor nagios4?"
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -66,14 +66,14 @@ msgstr "De wachtwoorden komen niet overeen"
 #~ "Als u de configuratie liever handmatig doet, selecteer dan geen enkele "
 #~ "server."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
 #~ msgstr "Ondersteuning activeren voor nagios-1.x-links?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Geef aan of de Apache-configuratie van nagios3 compatibiliteit moet "
+#~ "Geef aan of de Apache-configuratie van nagios4 compatibiliteit moet "
 #~ "aanbieden met links van nagios 1.x."
 
 #~ msgid ""

debian/po/pl.po

@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 3.0.3-3\n"
+"Project-Id-Version: nagios4 3.0.3-3\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2008-11-20 17:20+0100\n"
 "Last-Translator: Łukasz Paździora <lukpaz@gmail.com>\n"
@@ -19,20 +19,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Hasło administratora Nagios:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Proszę podać hasło dla użytkownika \"nagiosadmin\"."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -44,23 +44,23 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Potwierdzenie hasła:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Hasła nie są takie same"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Konfiguracja serwerów Apache dla nagios3:"
+#~ msgstr "Konfiguracja serwerów Apache dla nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
 #~ "Proszę wybrać, które serwery apache powinny zostać skonfigurowane dla "
-#~ "nagios3."
+#~ "nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -69,14 +69,14 @@ msgstr "Hasła nie są takie same"
 #~ "Nie zaznaczaj żadnego serwera jeżeli chcesz przeprowadzić konfigurację "
 #~ "ręcznie."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Włączyć obsługę linków z nagios 1.x w nagios3?"
+#~ msgstr "Włączyć obsługę linków z nagios 1.x w nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Czy konfiguracja Apache dla nagios3 powinna być kompatybilna z linkami z "
+#~ "Czy konfiguracja Apache dla nagios4 powinna być kompatybilna z linkami z "
 #~ "nagios 1.x."
 
 #~ msgid ""

debian/po/pt.po

@@ -1,12 +1,12 @@
-# translation of nagios3 debconf to Portuguese
+# translation of nagios4 debconf to Portuguese
 # Copyright (C) 2007 Américo Monteiro
-# This file is distributed under the same license as the nagios3 package.
+# This file is distributed under the same license as the nagios4 package.
 #
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3 2.9-1\n"
+"Project-Id-Version: nagios4 2.9-1\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2007-08-04 04:08+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Password de administração Web do Nagios:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr ""
@@ -34,7 +34,7 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -46,23 +46,23 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Confirmação da password:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "As passwords não condizem."
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Servidores Apache a configurar para nagios3:"
+#~ msgstr "Servidores Apache a configurar para nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
 #~ "Por favor seleccione quais servidores Apache deverão ser configurados "
-#~ "para nagios3."
+#~ "para nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -71,14 +71,14 @@ msgstr "As passwords não condizem."
 #~ "Se você preferir efectuar a configuração manualmente, não seleccione "
 #~ "nenhum servidor."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Activar suporte para atalhos do nagios 1.x no nagios3?"
+#~ msgstr "Activar suporte para atalhos do nagios 1.x no nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Por favor escolha se a configuração do Apache para nagios3 deverá "
+#~ "Por favor escolha se a configuração do Apache para nagios4 deverá "
 #~ "providenciar compatibilidade com atalhos do nagios 1.x."
 
 #~ msgid ""

debian/po/pt_BR.po

@@ -1,12 +1,12 @@
-# nagios3 Brazilian Portuguese translation.
+# nagios4 Brazilian Portuguese translation.
-# Copyright (C) THE nagios3's COPYRIGHT HOLDER
+# Copyright (C) THE nagios4's COPYRIGHT HOLDER
-# This file is distributed under the same license as nagios3 package.
+# This file is distributed under the same license as nagios4 package.
 # Bruno Gurgel Gomes de Oliveira <bruno@4linux.com.br>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3_3.0.3-1\n"
+"Project-Id-Version: nagios4_3.0.3-1\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2008-07-25 19:40-0300\n"
 "Last-Translator: Bruno Gurgel Gomes de Oliveira <bruno@4linux.com.br>\n"
@@ -20,20 +20,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Senha de administração web do Nagios:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Por favor, forneça a senha a ser criada com o usuário \"nagiosadmin\"."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -45,23 +45,23 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Confirmação de senha:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "As senhas não coincidem"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Servidores apache a serem configurados para o nagios3:"
+#~ msgstr "Servidores apache a serem configurados para o nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
 #~ msgstr ""
 #~ "Por favor, selecione quais servidores apache deverão ser configurados "
-#~ "para o nagios3."
+#~ "para o nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -70,14 +70,14 @@ msgstr "As senhas não coincidem"
 #~ "Se você preferir realizar a configuração manualmente, não selecione "
 #~ "nenhum servidor."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Habilitar suporte para links do nagios 1.x no nagios3?"
+#~ msgstr "Habilitar suporte para links do nagios 1.x no nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Por favor, selecione se a configuração do Apache para o nagios3 deve "
+#~ "Por favor, selecione se a configuração do Apache para o nagios4 deve "
 #~ "fornecer compatibilidade com links do nagios 1.x."
 
 #~ msgid ""

debian/po/ru.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2008-09-15 19:06+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
@@ -21,20 +21,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Пароль для веб-администрирования Nagios:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Введите пароль для создаваемой учётной записи \"nagiosadmin\"."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -46,35 +46,35 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Введите пароль ещё раз:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Пароли не совпадают"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Серверы apache для настройки под nagios3:"
+#~ msgstr "Серверы apache для настройки под nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
-#~ msgstr "Выберите серверы apache, которые нужно настроить для nagios3."
+#~ msgstr "Выберите серверы apache, которые нужно настроить для nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
 #~ "unselected."
 #~ msgstr "Если вы хотите выполнить настройку вручную, то ничего не выбирайте."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
-#~ msgstr "Включить поддержку ссылок nagios 1.x в nagios3?"
+#~ msgstr "Включить поддержку ссылок nagios 1.x в nagios4?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
-#~ "Выберите, нужно ли настраивать Apache в nagios3 для предоставления "
+#~ "Выберите, нужно ли настраивать Apache в nagios4 для предоставления "
 #~ "обратной совместимости по ссылкам с nagios 1.x."
 
 #~ msgid ""

debian/po/sv.po

@@ -1,12 +1,12 @@
-# translation of nagios3.po to swedish
+# translation of nagios4.po to swedish
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Martin Bagge <brother@bsnet.se>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: nagios3\n"
+"Project-Id-Version: nagios4\n"
-"Report-Msgid-Bugs-To: nagios3@packages.debian.org\n"
+"Report-Msgid-Bugs-To: nagios4@packages.debian.org\n"
 "POT-Creation-Date: 2013-06-26 23:55+0200\n"
 "PO-Revision-Date: 2008-09-17 23:30+0100\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
@@ -19,20 +19,20 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid "Nagios web administration password:"
 msgstr "Lösenord för nagios webbadministration:"
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "Please provide the password to be created with the \"nagiosadmin\" user."
 msgstr "Ange lösenordet som ska användas för användaren \"nagiosadmin\"."
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:1001
+#: ../nagios4-cgi.templates:1001
 msgid ""
 "This is the username and password you will use to log in to your nagios "
 "installation after configuration is complete.  If you do not provide a "
@@ -44,21 +44,21 @@ msgstr ""
 
 #. Type: password
 #. Description
-#: ../nagios3-cgi.templates:2001
+#: ../nagios4-cgi.templates:2001
 msgid "Password confirmation:"
 msgstr "Upprepa lösenordet:"
 
 #. Type: note
 #. Description
-#: ../nagios3-cgi.templates:3001
+#: ../nagios4-cgi.templates:3001
 msgid "The passwords do not match"
 msgstr "Lösenorden stämmer inte överrens"
 
-#~ msgid "Apache servers to configure for nagios3:"
+#~ msgid "Apache servers to configure for nagios4:"
-#~ msgstr "Ange vilken apacheversion som ska förberedas för nagios3:"
+#~ msgstr "Ange vilken apacheversion som ska förberedas för nagios4:"
 
-#~ msgid "Please select which apache servers should be configured for nagios3."
+#~ msgid "Please select which apache servers should be configured for nagios4."
-#~ msgstr "Ange den apacheserver som ska ställas in för nagios3."
+#~ msgstr "Ange den apacheserver som ska ställas in för nagios4."
 
 #~ msgid ""
 #~ "If you would prefer to perform configuration manually, leave all servers "
@@ -67,11 +67,11 @@ msgstr "Lösenorden stämmer inte överrens"
 #~ "Om du föredrar att ställa in apache manuellt markerar du inte något av "
 #~ "alternativen."
 
-#~ msgid "Enable support for nagios 1.x links in nagios3?"
+#~ msgid "Enable support for nagios 1.x links in nagios4?"
 #~ msgstr "Aktivera stöd för länkar som de såg ut inagios 1.x?"
 
 #~ msgid ""
-#~ "Please choose whether the Apache configuration for nagios3 should provide "
+#~ "Please choose whether the Apache configuration for nagios4 should provide "
 #~ "compatibility with links from nagios 1.x."
 #~ msgstr ""
 #~ "Ange om du vill att inställningarna i Apache ska ha stöd för länkar från "