* Split the ssh binary package into openssh-client and openssh-server

  (closes: #39741). openssh-server depends on openssh-client for some
  common functionality; it didn't seem worth creating yet another package
  for this.
* New transitional ssh package, depending on openssh-client and
  openssh-server. May be removed once nothing depends on it.
* When upgrading from ssh to openssh-{client,server}, it's very difficult
  for the maintainer scripts to find out what version we're upgrading from
  without dodgy dpkg hackery. I've therefore taken the opportunity to move
  a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
  and ssh/user_environment_tell.
* In general, upgrading to this version directly from woody without first
  upgrading to the version in sarge is not currently guaranteed to work
  very smoothly due to the aforementioned version discovery problems.

1 files changed, 111 insertions, 137 deletions

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 00973c88d..4bf9baf82 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh_3.6.1p2-9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-06 17:54+0000\n"
+"POT-Creation-Date: 2004-07-31 03:10+0100\n"
 "PO-Revision-Date: 2003-11-09 16:29-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -25,13 +25,50 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-client.templates.master:4
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Deseja que que /usr/lib/ssh-keysign seja instalado SUID root ?"
+
+#. Type: boolean
+#. Description
+#: ../openssh-client.templates.master:4
+msgid ""
+"You have the option of installing the ssh-keysign helper with the SUID bit "
+"set."
+msgstr ""
+"Existe a opção de instalar o cliente auxiliar ssh-keysign com o bit SUID "
+"definido."
+
+#. Type: boolean
+#. Description
+#: ../openssh-client.templates.master:4
+msgid ""
+"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
+"based authentication."
+msgstr ""
+"Caso você instale o ssh-keysign com o bit SUID ativado, você será capaz de "
+"usar a autenticação baseada em host do protocolo SSH 2."
+
+#. Type: boolean
+#. Description
+#: ../openssh-client.templates.master:4
+msgid ""
+"If in doubt, I suggest you install it with SUID.  If it causes problems you "
+"can change your mind later by running:   dpkg-reconfigure ssh"
+msgstr ""
+"Caso esteja em dúvida, é sugerido que você instale com o bit SUID ativado. "
+"Caso isso cause problemas e você mude de idéia posteriormente execute o "
+"comando : dpkg-reconfigure ssh"
+
+#. Type: boolean
+#. Description
+#: ../openssh-server.templates.master:4
 msgid "Generate new configuration file"
 msgstr "Gerar novo arquivo de configuração"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -49,7 +86,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -68,7 +105,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:4
+#: ../openssh-server.templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -78,13 +115,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir somente protocolo SSH versão 2"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -100,7 +137,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -111,7 +148,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:23
+#: ../openssh-server.templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -120,34 +157,15 @@ msgstr ""
 "README.Debian deste pacote possui instruções sobre o que mudar em seu "
 "arquivo de configuração sshd_config."
 
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid "ssh2 keys merged in configuration files"
-msgstr "Chaves ssh2 incluídas nos arquivos de configuração"
-
-#. Type: note
-#. Description
-#: ../templates.master:37
-msgid ""
-"As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
-"keys. This means the authorized_keys2 and known_hosts2 files are no longer "
-"needed. They will still be read in order to maintain backwards compatibility"
-msgstr ""
-"A partir do versão 3 o OpenSSH não usa mais arquivos separados para as "
-"chaves ssh1 e ssh2. Isto significa que os arquivos \"authorized_keys2\" e "
-"\"know_hosts2\" não são mais necessários. Os mesmos continuarão a ser lidos "
-"para manter a compatibilidade com versões anteriores."
-
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Deseja continuar (e arriscar acabar com sessões ssh ativas) ?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -159,7 +177,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:46
+#: ../openssh-server.templates.master:38
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -169,13 +187,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "NOTA: Encaminhamento de X11 e Autorização desabilitados por padrão."
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -185,7 +203,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -195,20 +213,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:56
+#: ../openssh-server.templates.master:48
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Maiores detalhes podem ser encontrados em /usr/share/doc/ssh/README.Debian."
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: rsh-server está instalado --- provavelmente não é uma boa idéia"
 
 #. Type: note
 #. Description
-#: ../templates.master:67
+#: ../openssh-server.templates.master:59
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -219,13 +237,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: telnetd está instalado --- provavelmente não é uma boa idéia"
 
 #. Type: note
 #. Description
-#: ../templates.master:74
+#: ../openssh-server.templates.master:66
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -239,13 +257,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: você deve criar uma nova host key"
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -257,113 +275,69 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:82
+#: ../openssh-server.templates.master:74
 msgid "You will need to generate a new host key."
 msgstr "Você precisará gerar uma nova host key."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
-msgstr "Deseja que que /usr/lib/ssh-keysign seja instalado SUID root ?"
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"You have the option of installing the ssh-keysign helper with the SUID bit "
-"set."
-msgstr ""
-"Existe a opção de instalar o cliente auxiliar ssh-keysign com o bit SUID "
-"definido."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
-"based authentication."
-msgstr ""
-"Caso você instale o ssh-keysign com o bit SUID ativado, você será capaz de "
-"usar a autenticação baseada em host do protocolo SSH 2."
+#~ msgid "ssh2 keys merged in configuration files"
+#~ msgstr "Chaves ssh2 incluídas nos arquivos de configuração"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:92
-msgid ""
-"If in doubt, I suggest you install it with SUID.  If it causes problems you "
-"can change your mind later by running:   dpkg-reconfigure ssh"
-msgstr ""
-"Caso esteja em dúvida, é sugerido que você instale com o bit SUID ativado. "
-"Caso isso cause problemas e você mude de idéia posteriormente execute o "
-"comando : dpkg-reconfigure ssh"
+#~ msgid ""
+#~ "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
+#~ "keys. This means the authorized_keys2 and known_hosts2 files are no "
+#~ "longer needed. They will still be read in order to maintain backwards "
+#~ "compatibility"
+#~ msgstr ""
+#~ "A partir do versão 3 o OpenSSH não usa mais arquivos separados para as "
+#~ "chaves ssh1 e ssh2. Isto significa que os arquivos \"authorized_keys2\" e "
+#~ "\"know_hosts2\" não são mais necessários. Os mesmos continuarão a ser "
+#~ "lidos para manter a compatibilidade com versões anteriores."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "Do you want to run the sshd server?"
-msgstr "Você deseja executar o servidor sshd ?"
+#~ msgid "Do you want to run the sshd server?"
+#~ msgstr "Você deseja executar o servidor sshd ?"
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid "This package contains both the ssh client, and the sshd server."
-msgstr "Este pacote contém ambos o cliente ssh e o servidor sshd."
+#~ msgid "This package contains both the ssh client, and the sshd server."
+#~ msgstr "Este pacote contém ambos o cliente ssh e o servidor sshd."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"Normally the sshd Secure Shell Server will be run to allow remote logins via "
-"ssh."
-msgstr ""
-"Normalmente o sshd Secure Shell Server será executado para permitir logins "
-"remotos via ssh."
+#~ msgid ""
+#~ "Normally the sshd Secure Shell Server will be run to allow remote logins "
+#~ "via ssh."
+#~ msgstr ""
+#~ "Normalmente o sshd Secure Shell Server será executado para permitir "
+#~ "logins remotos via ssh."
 
-#. Type: boolean
-#. Description
-#: ../templates.master:105
-msgid ""
-"If you are only interested in using the ssh client for outbound connections "
-"on this machine, and don't want to log into it at all using ssh, then you "
-"can disable sshd here."
-msgstr ""
-"Se você está interessado somente em usar o cliente ssh para conexões para "
-"fora desta máquina, e não quer logar na mesma usando ssh, então você pode "
-"desabilitar o sshd aqui."
+#~ msgid ""
+#~ "If you are only interested in using the ssh client for outbound "
+#~ "connections on this machine, and don't want to log into it at all using "
+#~ "ssh, then you can disable sshd here."
+#~ msgstr ""
+#~ "Se você está interessado somente em usar o cliente ssh para conexões para "
+#~ "fora desta máquina, e não quer logar na mesma usando ssh, então você pode "
+#~ "desabilitar o sshd aqui."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid "Environment options on keys have been deprecated"
-msgstr "Opções ed ambiente sobre chaves estão obsoletas"
+#~ msgid "Environment options on keys have been deprecated"
+#~ msgstr "Opções ed ambiente sobre chaves estão obsoletas"
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid ""
-"This version of OpenSSH disables the environment option for public keys by "
-"default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
-"are using this option in an authorized_keys file, beware that the keys in "
-"question will no longer work until the option is removed."
-msgstr ""
-"Esta versão do OpenSSH desabilita a opção de ambiente para chaves públicas "
-"por padrão par evitar certos ataques (por exemplo, LD_PRELOAD). Caso você "
-"esteja usando esta opção em um arquivo authorized_keys, tenha cuidado pois "
-"as chaves em questão não irão mais funcionar até que esta opção seja "
-"removida."
+#~ msgid ""
+#~ "This version of OpenSSH disables the environment option for public keys "
+#~ "by default, in order to avoid certain attacks (for example, LD_PRELOAD). "
+#~ "If you are using this option in an authorized_keys file, beware that the "
+#~ "keys in question will no longer work until the option is removed."
+#~ msgstr ""
+#~ "Esta versão do OpenSSH desabilita a opção de ambiente para chaves "
+#~ "públicas por padrão par evitar certos ataques (por exemplo, LD_PRELOAD). "
+#~ "Caso você esteja usando esta opção em um arquivo authorized_keys, tenha "
+#~ "cuidado pois as chaves em questão não irão mais funcionar até que esta "
+#~ "opção seja removida."
 
-#. Type: note
-#. Description
-#: ../templates.master:117
-msgid ""
-"To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
-"sshd_config after the upgrade is complete, taking note of the warning in the "
-"sshd_config(5) manual page."
-msgstr ""
-"Para reabilitar esta opção, defina a opção \"PermitUserEnvironment yes\" no "
-"arquivo /et/ssh/sshd_config depois da a atualização terminar, atentando para "
-"o aviso na página de manual do sshd_config(5)."
+#~ msgid ""
+#~ "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
+#~ "sshd_config after the upgrade is complete, taking note of the warning in "
+#~ "the sshd_config(5) manual page."
+#~ msgstr ""
+#~ "Para reabilitar esta opção, defina a opção \"PermitUserEnvironment yes\" "
+#~ "no arquivo /et/ssh/sshd_config depois da a atualização terminar, "
+#~ "atentando para o aviso na página de manual do sshd_config(5)."
 
 #~ msgid "Privilege separation"
 #~ msgstr "Separação de Previlégios"