[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. b12a6837c3e8ad83a84eaa571b281b21b73c7377

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 39ff151f677925710f3b750b8ac76f96c4f2a8b0
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Mar 27 09:16:17 2010 +0100

    Limit the choices for webserver to apache2

diff --git a/debian/httpd.webapps-common b/debian/httpd.webapps-common
index 9cc5cc1..5050c06 100644
--- a/debian/httpd.webapps-common
+++ b/debian/httpd.webapps-common
@@ -2,7 +2,7 @@
 # taken from the webapps-common project
 # copyright (c) 2005, sean finney (GPL)
 
-wc_httpd_apaches="apache apache-ssl apache-perl apache2"
+wc_httpd_apaches="apache2"
 
 # if they have not specified what they support, assume support for all
 if [ ! "$wc_httpd_supported" ]; then
diff --git a/debian/icinga-cgi.templates b/debian/icinga-cgi.templates
index 2f5da47..9d71401 100644
--- a/debian/icinga-cgi.templates
+++ b/debian/icinga-cgi.templates
@@ -1,6 +1,6 @@
 Template: icinga/httpd
 Type: multiselect
-Choices: apache, apache-ssl, apache2
+Choices: apache2
 Default: apache2
 _Description: Apache servers to configure for icinga:
  Please select which apache servers should be configured for icinga.
diff --git a/debian/po/cs.po b/debian/po/cs.po
index a3857cf..4904f7b 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -114,8 +114,8 @@ msgstr "Hesla nesouhlasí"
 #~ "byste neměli volit v případě, že máte dosud nainstalován nagios 1.x. "
 #~ "Jinak může dojít k neočekávaným výsledkům."
 
-#~ msgid "apache, apache-ssl, apache2"
-#~ msgstr "apache, apache-ssl, apache2"
+#~ msgid "apache2"
+#~ msgstr "apache2"
 
 #~ msgid "apache2"
 #~ msgstr "apache2"
diff --git a/debian/po/de.po b/debian/po/de.po
index dea0458..3405f7b 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -120,5 +120,5 @@ msgstr "Die Passwörter stimmen nicht überein."
 #~ "sollten diese Möglichkeit nicht wählen, falls noch nagios 1.x auf Ihrem "
 #~ "System installiert ist. Dies könnte unvorhersehbare Ergebnisse liefern."
 
-#~ msgid "apache, apache-ssl, apache2"
-#~ msgstr "apache, apache-ssl, apache2"
+#~ msgid "apache2"
+#~ msgstr "apache2"
diff --git a/debian/po/es.po b/debian/po/es.po
index bdb3406..1ac44af 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -143,5 +143,5 @@ msgstr "Las contraseñas no coinciden"
 #~ "opción si todavía tiene nagios 1.x instalado en su sistema, esto puede\n"
 #~ "producir resultados impredecibles."
 
-#~ msgid "apache, apache-ssl, apache2"
-#~ msgstr "apache, apache-ssl, apache2"
+#~ msgid "apache2"
+#~ msgstr "apache2"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index a20a021..90e2497 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -121,7 +121,7 @@ msgstr "Mots de passe diff
 #~ "Vous ne devriez pas choisir cette option si vous avez encore Nagios 1.x "
 #~ "sur votre système, sinon vous risquez d'avoir des résultats inattendus."
 
-#~ msgid "apache, apache-ssl, apache2"
+#~ msgid "apache2"
 #~ msgstr "Apache, Apache-ssl, Apache2"
 
 #~ msgid "apache2"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 8b4aaf2..35f89e7 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -114,5 +114,5 @@ msgstr "パスワードが一致しません"
 #~ "りません。選択すると予測不可能な結果になります。"
 
 # FIXME: Do not mark for translation since these are package names.
-#~ msgid "apache, apache-ssl, apache2"
-#~ msgstr "apache, apache-ssl, apache2"
+#~ msgid "apache2"
+#~ msgstr "apache2"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index c46f8f9..408d595 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -120,5 +120,5 @@ msgstr "As passwords não condizem."
 #~ "escolher esta opção se ainda tiver o nagios 1.x no seu sistema, ou podem "
 #~ "ocorrer resultados imprevisíveis."
 
-#~ msgid "apache, apache-ssl, apache2"
-#~ msgstr "apache, apache-ssl, apache2"
+#~ msgid "apache2"
+#~ msgstr "apache2"

-- 
debian packaging of icinga(-core)