Package: zsh
Severity: normal
The only debconf note used in this package deals with a very old transition
(RC files from /etc to /etc/zsh). I think it's now safe to assume that all
installations have moved these files.
Therefore, the debconf note and all debconf cruft is no longer needed.
I also propose dropping the code that moves configuration files (in
postinst) as this is a transition from a pre-etch package version.
Patch attached.
Strangely, I found no reference to debconf stuff in debian/rules. I haven't
checked carefully but I really wonder how the package was installing the
debconf templates..:-)
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.23-1-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru zsh.old/debian/config zsh/debian/config
--- zsh.old/debian/config 2008-01-25 06:11:50.617213749 +0100
+++ zsh/debian/config 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-[ "$1" = "configure" ] || exit 0
-
-# If there are what look like unmoved rcfiles, warn the administrator
-if test -f /etc/zshenv || test -f /etc/zshrc || test -f /etc/zprofile || test
-f /etc/zlogin; then
- db_input medium zsh/rcmove || true
- db_go
-fi
diff -Nru zsh.old/debian/control zsh/debian/control
--- zsh.old/debian/control 2008-01-25 06:11:50.617213749 +0100
+++ zsh/debian/control 2008-02-04 07:52:25.594553520 +0100
@@ -1,7 +1,7 @@
Source: zsh
Section: shells
Priority: optional
-Build-Depends: texinfo, groff-base, libncursesw5-dev, texi2html (>= 1.76-3),
libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], bsdmainutils,
po-debconf, libpcre3-dev, texlive-latex-base | tetex-bin
+Build-Depends: texinfo, groff-base, libncursesw5-dev, texi2html (>= 1.76-3),
libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], bsdmainutils,
libpcre3-dev, texlive-latex-base | tetex-bin
Maintainer: Clint Adams <[EMAIL PROTECTED]>
Standards-Version: 3.7.3
@@ -9,7 +9,7 @@
Architecture: any
Section: shells
Priority: optional
-Depends: debconf | debconf-2.0, ${shlibs:Depends}
+Depends: ${shlibs:Depends}
Conflicts: pdksh (<< 5.2.14-18)
Recommends: ${shlibs:Recommends}
Suggests: zsh-doc
diff -Nru zsh.old/debian/po/ca.po zsh/debian/po/ca.po
--- zsh.old/debian/po/ca.po 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/ca.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-# zsh (debconf) translation to Catalan.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Aleix Badia i Bosch <[EMAIL PROTECTED]>, 2004
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh_4.2.0-5_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-20 11:44+0200\n"
-"PO-Revision-Date: 2004-03-05 19:46GMT\n"
-"Last-Translator: Aleix Badia i Bosch <[EMAIL PROTECTED]>\n"
-"Language-Team: Catalan <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Els RC globals s'han mogut al directori /etc/zsh/"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Els fitxers RC globals (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) "
-"s'han mogut al directori /etc/zsh."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr ""
-"Haur??eu de suprimir els fitxers antics o moure'ls al directori /etc/zsh."
diff -Nru zsh.old/debian/po/cs.po zsh/debian/po/cs.po
--- zsh.old/debian/po/cs.po 2008-01-25 06:11:50.601193020 +0100
+++ zsh/debian/po/cs.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2004-07-24 09:53+0200\n"
-"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
-"Language-Team: Czech <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Glob?ln? konfigura?n? soubory se p?esunuly do /etc/zsh/"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Glob?ln? konfigura?n? soubory (/etc/zshenv, /etc/zshrc, /etc/zprofile,
/etc/zlogin) se "
-"p?esunuly do adres??e /etc/zsh/."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Star? soubory m??ete smazat, nebo je p?esunout do /etc/zsh."
diff -Nru zsh.old/debian/po/da.po zsh/debian/po/da.po
--- zsh.old/debian/po/da.po 2008-01-25 06:11:50.601193020 +0100
+++ zsh/debian/po/da.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-# translation of zsh to Danish
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-# Claus Hindsgaul <[EMAIL PROTECTED]>, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh_4.1.1-14_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2004-04-02 15:46+0200\n"
-"Last-Translator: Claus Hindsgaul <[EMAIL PROTECTED]>\n"
-"Language-Team: Danish <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Globale ressourcefiler flyttet til /etc/zsh/"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"De globale ressourcefiler (/etc/zshenv, /etc/zshrc, /etc/zprofile,
/etc/zlogin) er "
-"flyttet til mappen /etc/zsh."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Du kan fjerne de gamle filer eller flytte dem til /etc/zsh."
-
diff -Nru zsh.old/debian/po/de.po zsh/debian/po/de.po
--- zsh.old/debian/po/de.po 2008-01-25 06:11:50.581195743 +0100
+++ zsh/debian/po/de.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2004-06-13 08:47-0200\n"
-"Last-Translator: Helge Kreutzmann <[EMAIL PROTECTED]>\n"
-"Language-Team: de <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Globale RC sind nach /etc/zsh/ verschoben worden"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Globale RC-Dateien (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) sind
"
-"in das /etc/zsh-Verzeichnis verschoben worden."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Sie k?nnen die alten Dateien entfernen oder nach /etc/zsh verschieben."
diff -Nru zsh.old/debian/po/es.po zsh/debian/po/es.po
--- zsh.old/debian/po/es.po 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/es.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-# zsh debconf translation to spanish
-# Copyright (C) 2004 Software in the Public Interest
-# This file is distributed under the same license as the zsh package.
-#
-# Changes:
-# - Initial translation
-# Javi Castelo <[EMAIL PROTECTED]> , 2004
-#
-#
-# Traductores, si no conoce el formato PO, merece la pena leer la
-# documentaci?n de gettext, especialmente las secciones dedicadas a este
-# formato, por ejemplo ejecutando:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Equipo de traducci?n al espa?ol, por favor lean antes de traducir
-# los siguientes documentos:
-#
-# - El proyecto de traducci?n de Debian al espa?ol
-# http://www.debian.org/intl/spanish/coordinacion
-# especialmente las notas de traducci?n en
-# http://www.debian.org/intl/spanish/notas
-#
-# - La gu?a de traducci?n de po's de debconf:
-# /usr/share/doc/po-debconf/README-trans
-# o http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh 4.0.9\n"
-"POT-Creation-Date: 2004-02-08 13:23+100\n"
-"PO-Revision-Date: 2004-3-6 21:43+100\n"
-"Last-Translator: Javier Castelo\n"
-"Language-Team: Debian Spanish <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Archivos de configuraci?n de recursos globales movidos a ?/etc/zsh/?"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Los archivos de configuraci?n de recursos globales (?/etc/zshenv?, "
-"?/etc/zprofile?, ?/etc/zlogin?) se han movido al directorio ?/etc/zsh/?."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Puede borrar los archivos antiguos o moverlos a ?/etc/zsh/?."
diff -Nru zsh.old/debian/po/fr.po zsh/debian/po/fr.po
--- zsh.old/debian/po/fr.po 2008-01-25 06:11:50.601193020 +0100
+++ zsh/debian/po/fr.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh-4.0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2003-06-21 07:14+0200\n"
-"Last-Translator: Michel Grentzinger <[EMAIL PROTECTED]>\n"
-"Language-Team: French <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "D?placement des fichiers de configuration globaux vers /etc/zsh/"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Les fichiers de configuration globaux (/etc/zshenv, /etc/zshrc, /etc/"
-"zprofile, /etc/zlogin) ont ?t? d?plac?s vers le r?pertoire /etc/zsh/."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr ""
-"Vous pouvez supprimer les anciens fichiers ou les d?placer vers /etc/zsh."
diff -Nru zsh.old/debian/po/gl.po zsh/debian/po/gl.po
--- zsh.old/debian/po/gl.po 2008-01-25 06:11:50.581195743 +0100
+++ zsh/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-# Galician translation of zsh's debconf templates
-# This file is distributed under the same license as the zsh package.
-# Jacobo Tarrio <[EMAIL PROTECTED]>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-13 20:37+0100\n"
-"PO-Revision-Date: 2007-02-24 15:31+0100\n"
-"Last-Translator: Jacobo Tarrio <[EMAIL PROTECTED]>\n"
-"Language-Team: Galician <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Traslad??ronse os RCs globais a /etc/zsh/"
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Os ficheiros RC globais (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/"
-"zlogin) traslad??ronse ao directorio /etc/zsh."
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Pode eliminar os ficheiros antigos ou trasladalos a /etc/zsh."
diff -Nru zsh.old/debian/po/it.po zsh/debian/po/it.po
--- zsh.old/debian/po/it.po 2008-01-25 06:11:50.581195743 +0100
+++ zsh/debian/po/it.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-# Italian (it) translation of debconf templates for zsh
-# Copyright (C) 2007 Software in the Public Interest
-# This file is distributed under the same license as the zsh package.
-# Luca Monducci <[EMAIL PROTECTED]>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh 4.3.4 italian debconf templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-21 04:34+0200\n"
-"PO-Revision-Date: 2007-05-05 17:07+0200\n"
-"Last-Translator: Luca Monducci <[EMAIL PROTECTED]>\n"
-"Language-Team: Italian <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Spostati i file RC globali in /etc/zsh"
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"I file RC globali (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) sono "
-"stati spostati nella directory /etc/zsh."
-
-#. Type: note
-#. Description
-#: ../templates:1001
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "?? possibile rimuovere i vecchi file oppure spostarli in /etc/zsh."
diff -Nru zsh.old/debian/po/ja.po zsh/debian/po/ja.po
--- zsh.old/debian/po/ja.po 2008-01-25 06:11:50.577194053 +0100
+++ zsh/debian/po/ja.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2003-09-10 00:16+0900\n"
-"Last-Translator: Kenshi Muto <[EMAIL PROTECTED]>\n"
-"Language-Team: Japanese <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "???????????? RC ????/etc/zsh/ ????????????????"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr "???????????? RC ????????
(/etc/zshenv??/etc/zshrc??/etc/zprofile??/etc/zlogin) ?? /etc/zsh
??????????????????????????????"
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "??????????????????????????/etc/zsh ????????????????????????"
diff -Nru zsh.old/debian/po/nl.po zsh/debian/po/nl.po
--- zsh.old/debian/po/nl.po 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/nl.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh_4.0.7-10\n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2003-09-18 19:16-0000\n"
-"Last-Translator: Luk Claes <[EMAIL PROTECTED]>\n"
-"Language-Team: Dutch <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Globale configuratiebestanden verplaatst naar /etc/zsh"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr "Globale configuratiebestanden (/etc/zshenv, /etc/zshrc, /etc/zprofile,
/etc/zlogin) zijn verplaatst naar de /etc/zsh map."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "U kunt de vroegere bestanden verwijderen of verplaatsen naar /etc/zsh."
-
diff -Nru zsh.old/debian/po/POTFILES.in zsh/debian/po/POTFILES.in
--- zsh.old/debian/po/POTFILES.in 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff -Nru zsh.old/debian/po/pt_BR.po zsh/debian/po/pt_BR.po
--- zsh.old/debian/po/pt_BR.po 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/pt_BR.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2004-09-04 13:35-0300\n"
-"Last-Translator: Andr? Lu?s Lopes <[EMAIL PROTECTED]>\n"
-"Language-Team: Debian-BR Project <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Arquivos de recursos globais movidos para /etc/zsh"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Os arquivos de recursos globais (/etc/zshenv, /etc/zshrc, /etc/zprofile, "
-"/etc/zlogin) foram movidos para o diret?rio /etc/zsh."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Voc? pode remover os arquivos antigos ou mov?-los para /etc/zsh."
diff -Nru zsh.old/debian/po/pt.po zsh/debian/po/pt.po
--- zsh.old/debian/po/pt.po 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/pt.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-# translation of zsh_4.0.7-10_pt.po to Portuguese
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-# Bruno Rodrigues <[EMAIL PROTECTED]>, 2003.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh_4.0.7-10_pt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2003-10-12 20:02+0100\n"
-"Last-Translator: Bruno Rodrigues <[EMAIL PROTECTED]>\n"
-"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "As configura????es globais foram movidas para /etc/zsh"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"As configura????es globais (/etc/zshenv, /etc/zshrc, /etc/zprofile "
-"e /etc/zlogin) foram movidas para a directoria /etc/zsh."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Pode remover as configura????es antigas ou mov??-las para /etc/zsh."
-
diff -Nru zsh.old/debian/po/ru.po zsh/debian/po/ru.po
--- zsh.old/debian/po/ru.po 2008-01-25 06:11:50.601193020 +0100
+++ zsh/debian/po/ru.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-# translation of zsh_4.0.7-10.po to russian
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh_4.0.7-10\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2003-10-05 16:37+0600\n"
-"Last-Translator: Ilgiz Kalmetev <[EMAIL PROTECTED]>\n"
-"Language-Team: russian <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=KOI8-R\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.1\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "?????????? RC ?????????? ? ??????? /etc/zsh/"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"?????????? ????? RC (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin)
???? "
-"?????????? ? ??????? /etc/zsh."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "?? ?????? ??????? ?????? ????? ??? ????????? ?? ? ??????? /etc/zsh."
-
diff -Nru zsh.old/debian/po/sv.po zsh/debian/po/sv.po
--- zsh.old/debian/po/sv.po 2008-01-25 06:11:50.601193020 +0100
+++ zsh/debian/po/sv.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh 4.2.5-19\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2005-09-28 23:41-0700\n"
-"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
-"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "Globala RCs flyttade till /etc/zsh/"
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-"Globala RC-filer (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) har
flyttats till /etc/zsh/ mappen."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "Du kan radera de gamla filerna eller flytta dom till /etc/zsh/."
-
diff -Nru zsh.old/debian/po/templates.pot zsh/debian/po/templates.pot
--- zsh.old/debian/po/templates.pot 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr ""
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr ""
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr ""
diff -Nru zsh.old/debian/po/vi.po zsh/debian/po/vi.po
--- zsh.old/debian/po/vi.po 2008-01-25 06:11:50.585193802 +0100
+++ zsh/debian/po/vi.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-# Vietnamese translation for zsh.
-# Copyright ?? 2005 Free Software Foundation, Inc.
-# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zsh 4.2.5-14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:59+0200\n"
-"PO-Revision-Date: 2005-08-21 22:17+0930\n"
-"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
-"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.2.2\n"
-
-#. Description
-#: ../templates:3
-msgid "Global RCs moved to /etc/zsh/"
-msgstr "RC to??n c???c ???? di chuy???n sang </etc/zsh/> r???i."
-
-#. Description
-#: ../templates:3
-msgid ""
-"Global RC files (/etc/zshenv, /etc/zshrc, /etc/zprofile, /etc/zlogin) have "
-"been moved to the /etc/zsh directory."
-msgstr "C??c t???p tin RC to??n c???c (</etc/zshenv>, </etc/zshrc>,
</etc/zprofile>, </etc/zlogin>) ???? ???????c di chuy???n sang th?? m???c
</etc/zsh> r???i."
-
-#. Description
-#: ../templates:3
-msgid "You may remove the old files or move them to /etc/zsh."
-msgstr "B???n c?? th??? lo???i b??? c??c t???p tin c??, ho???c di chuy???n
ch??ng sang </etc/zsh>."
diff -Nru zsh.old/debian/postinst zsh/debian/postinst
--- zsh.old/debian/postinst 2008-01-25 06:11:50.633209056 +0100
+++ zsh/debian/postinst 2008-02-04 07:51:12.218553499 +0100
@@ -1,27 +1,24 @@
#!/bin/sh -e
-# Move a conffile without triggering a dpkg question
-mv_conffile() {
- OLDCONFFILE="$1"
- NEWCONFFILE="$2"
-
- if [ -e "$OLDCONFFILE" ]; then
- echo "Preserving user changes to $NEWCONFFILE ..."
- mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
- mv -f "$OLDCONFFILE" "$NEWCONFFILE"
- fi
-}
-
case "$1" in
(configure)
- if dpkg --compare-versions "$2" le "4.2.5-2"; then
- mv_conffile "/etc/zlogin" "/etc/zsh/zlogin"
- mv_conffile "/etc/zlogout" "/etc/zsh/zlogout"
- mv_conffile "/etc/zprofile" "/etc/zsh/zprofile"
- mv_conffile "/etc/zshenv" "/etc/zsh/zshenv"
- mv_conffile "/etc/zshrc" "/etc/zsh/zshrc"
- fi
- # continue below
+ if test -x /usr/bin/update-menus ; then update-menus ; fi
+
+ update-alternatives --remove zsh /usr/bin/zsh
+ update-alternatives --install /bin/zsh zsh /bin/zsh4 50 \
+ --slave /usr/bin/zsh zsh-usrbin /bin/zsh4
+ update-alternatives --install /bin/rzsh rzsh /bin/zsh4 50 \
+ --slave /usr/share/man/man1/rzsh.1.gz rzsh.1.gz
/usr/share/man/man1/zsh.1.gz
+ update-alternatives --install /bin/ksh ksh /bin/zsh4 5 \
+ --slave /usr/bin/ksh usr.bin.ksh /bin/zsh4 \
+ --slave /usr/share/man/man1/ksh.1.gz ksh.1.gz
/usr/share/man/man1/zsh.1.gz
+
+ mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff
\
+ /usr/local/share/zsh/site-functions || true
+
+ add-shell /bin/zsh
+ add-shell /usr/bin/zsh
+
;;
(abort-upgrade|abort-remove|abort-deconfigure)
@@ -34,21 +31,4 @@
;;
esac
-if test -x /usr/bin/update-menus ; then update-menus ; fi
-
-update-alternatives --remove zsh /usr/bin/zsh
-update-alternatives --install /bin/zsh zsh /bin/zsh4 50 \
- --slave /usr/bin/zsh zsh-usrbin /bin/zsh4
-update-alternatives --install /bin/rzsh rzsh /bin/zsh4 50 \
- --slave /usr/share/man/man1/rzsh.1.gz rzsh.1.gz
/usr/share/man/man1/zsh.1.gz
-update-alternatives --install /bin/ksh ksh /bin/zsh4 5 \
- --slave /usr/bin/ksh usr.bin.ksh /bin/zsh4 \
- --slave /usr/share/man/man1/ksh.1.gz ksh.1.gz
/usr/share/man/man1/zsh.1.gz
-
-mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \
- /usr/local/share/zsh/site-functions || true
-
-add-shell /bin/zsh
-add-shell /usr/bin/zsh
-
exit 0
diff -Nru zsh.old/debian/postrm zsh/debian/postrm
--- zsh.old/debian/postrm 2008-01-25 06:11:50.633209056 +0100
+++ zsh/debian/postrm 2008-02-04 07:53:07.778553157 +0100
@@ -2,10 +2,5 @@
if test -x /usr/bin/update-menus ; then update-menus ; fi
-if [ "$1" = "purge" ] && test -r /usr/share/debconf/confmodule; then
- . /usr/share/debconf/confmodule
- db_purge
-fi
-
remove-shell /bin/zsh
remove-shell /usr/bin/zsh
