From: Gerfried Fuchs Date: Fri, 4 Aug 2006 16:02:12 +0000 (-0500) Subject: Imported Debian patch 2.1.1-2 X-Git-Tag: debian/2.1.1-2 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=12050c59490f560a2b58f10b25f138909134df6c;p=pkg%2Ft-prot.git Imported Debian patch 2.1.1-2 --- diff --git a/debian/changelog b/debian/changelog index 3a50dce..3685038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +t-prot (2.1.1-2) unstable; urgency=low + + * Improved handling of preserving configuration during only remove of the + package and reinstall. + * Added debconf translations: Czech by Miroslav Kure, Vietnamese by Clytie + Siddall. + + -- Gerfried Fuchs Fri, 04 Aug 2006 11:02:12 -0500 + t-prot (2.1.1-1) unstable; urgency=low * New upstream release: Doku fixes. diff --git a/debian/config b/debian/config index 6c2ac71..5363681 100644 --- a/debian/config +++ b/debian/config @@ -7,6 +7,4 @@ db_input medium t-prot/muttrc.d || true db_go -# XXX - reconfigure check? - exit 0 diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..794ce66 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,41 @@ +# Czech translation of t-prot debconf messages. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the t-prot package. +# Miroslav Kure , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: t-prot\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2006-07-30 17:41+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable t-prot system wide for mutt?" +msgstr "Chcete celosystémově povolit v muttu podporu t-protu?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " +"script from mutt you have to enable it. You can do this either by creating " +"a symlink in /etc/Muttrc.d/ for systemwide usage (rather, this can be done " +"automatically for you), or let the users decide to add a \"source\" line for " +"it in their ~/.muttrc or ~/.mutt/muttrc. If you acknowledge this question " +"the systemwide usage will be enabled." +msgstr "" +"Balík t-prot poskytuje konfigurační soubor /etc/Muttrc.t-prot. Abyste mohli " +"t-prot využívat přímo z muttu, musíte jej povolit. To můžete provést buď pro " +"celý systém tak, že v adresáři /etc/Muttrc.d/ vytvoříte symbolický odkaz na " +"tento soubor, nebo můžete nechat uživatele, aby se sami rozhodli, zda si do " +"svého ~/.muttrc nebo ~/.mutt/muttrc přidají příslušný řádek \"source\". " +"Odpovíte-li na tuto otázku kladně, povolí se spojení muttu s t-protem " +"automaticky pro všechny uživatele systému." diff --git a/debian/po/de.po b/debian/po/de.po index 7cf7cc5..08064bc 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: t-prot 2.0.2\n" "Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" -"POT-Creation-Date: 2006-03-27 12:44+0200\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" "PO-Revision-Date: 2006-03-27 12:45+0200\n" "Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" @@ -17,13 +17,13 @@ msgstr "" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Do you want to enable t-prot system wide for mutt?" msgstr "Wollen Sie t-prot Systemweit in mutt aktivieren?" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " "script from mutt you have to enable it. You can do this either by creating " diff --git a/debian/po/fr.po b/debian/po/fr.po index ecd9afc..86bd60f 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: t-prot\n" "Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" -"POT-Creation-Date: 2006-03-27 12:44+0200\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" "PO-Revision-Date: 2006-06-28 01:10+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -16,13 +16,13 @@ msgstr "" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Do you want to enable t-prot system wide for mutt?" msgstr "Faut-il activer t-prot pour l'ensemble des utilisateurs de mutt ?" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " "script from mutt you have to enable it. You can do this either by creating " @@ -36,5 +36,5 @@ msgstr "" "peut se faire en choisissant cette option. Elle créera un lien symbolique " "dans /etc/Muttrc.d afin d'offrir cette possibilité à tous les utilisateurs " "du système. Alternativement, si vous ne choisissez pas cette option, chaque " -"utilisateur pourra ajouter une instruction « source » vers ce fichier " -"dans son fichier ~/.muttrc ou ~/.mutt/muttrc." +"utilisateur pourra ajouter une instruction « source » vers ce fichier dans " +"son fichier ~/.muttrc ou ~/.mutt/muttrc." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 7e4dbae..fa59a70 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the t-prot package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: t-prot VERSION\n" "Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" -"POT-Creation-Date: 2006-03-27 12:44+0200\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,13 +18,13 @@ msgstr "" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "Do you want to enable t-prot system wide for mutt?" msgstr "" #. Type: boolean #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " "script from mutt you have to enable it. You can do this either by creating " diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 0000000..cff9cc3 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,42 @@ +# Vietnamese translation for t-prot. +# Copyright © 2006 Free Software Foundation, Inc. +# Clytie Siddall , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: t-prot_2.1.1-1\n" +"Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" +"POT-Creation-Date: 2006-08-02 15:54-0500\n" +"PO-Revision-Date: 2006-07-31 18:04+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \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.6fc1\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable t-prot system wide for mutt?" +msgstr "Bạn có muốn bật chạy t-prot cho mutt trên toàn bộ hệ thống không?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"The t-prot package provides a config file /etc/Muttrc.t-prot -- to use the " +"script from mutt you have to enable it. You can do this either by creating " +"a symlink in /etc/Muttrc.d/ for systemwide usage (rather, this can be done " +"automatically for you), or let the users decide to add a \"source\" line for " +"it in their ~/.muttrc or ~/.mutt/muttrc. If you acknowledge this question " +"the systemwide usage will be enabled." +msgstr "" +"Gói t-prot cung cấp tập tin cấu hình cần bật chạy nếu " +"bạn muốn sử dụng tập lệnh từ mutt. Có thể bật chạy nó hoặc bằng cách tạo " +"liên kết tượng trưng trong thư mục để sử dụng trên toàn bộ " +"hệ thống (hoặc cho gói tạo nó một cách tự động), hoặc cho phép mỗi người " +"dùng quyết định thêm một dòng « nguồn » (source) dành cho nó vào tập tin tài " +"nguyên <~/.muttrc> hay <~/.mutt/muttrc> của họ. Nếu bạn đồng ý, gói này sẽ " +"bật chạy khả năng sử dụng trên toàn bộ hệ thống." diff --git a/debian/postinst b/debian/postinst index 03a0a90..2bb6a7d 100644 --- a/debian/postinst +++ b/debian/postinst @@ -6,17 +6,29 @@ if [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule fi -if [ "$1" != 'configure' ] && [ "$1" != 'reconfigure' ]; then +action=$1 +version=$2 +if [ "${DEBCONF_RECONFIGURE}" = "1" ]; then + # workaround until reconfigure is really available + action=reconfigure +fi + +if [ "$action" != 'configure' ] && [ "$action" != 'reconfigure' ]; then exit 0 fi # change existing symlink from ../Muttrc.t-prot to ../t-prot/Mutrc -if [ "$2" = "2.1-1" ] && [ -L /etc/Muttrc.d/t-prot.rc ]; then +if [ "$version" = "2.1-1" ] && [ -L /etc/Muttrc.d/t-prot.rc ]; then cd /etc/Muttrc.d && ln -sf ../t-prot/Muttrc t-prot.rc || true fi +# if we got reinstalled after a remove, enable the config snippet again +if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/t-prot.rc.removed ] && [ ! -e /etc/Muttrc.d/t-prot.rc ]; then + mv /etc/Muttrc.d/t-prot.rc.removed /etc/Muttrc.d/t-prot.rc || true +fi + # only on new install or reconfigure -if [ "x$2" = "x" ] || [ "$1" = "reconfigure" ] || [ "${DEBCONF_RECONFIGURE}" = "1" ]; then +if [ "x$version" = "x" ] || [ "$action" = "reconfigure" ]; then symlink=true if [ -e /usr/share/debconf/confmodule ]; then db_get t-prot/muttrc.d diff --git a/debian/postrm b/debian/postrm index 25f393a..1fe8e42 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,16 +1,23 @@ #!/bin/sh -e # postrm for t-prot -# remove /etc/Muttrc.d/t-prot.rc symlink on both remove and purge -if [ "$1" = purge ] || [ "$1" = remove ]; then - if [ -L /etc/Muttrc.d/t-prot.rc ]; then - rm /etc/Muttrc.d/t-prot.rc +action=$1 + +case "$action" in + remove) + if [ ! -e /etc/Muttrc.d/t-prot.rc.removed ]; then + # only disable the configuration + mv /etc/Muttrc.d/t-prot.rc /etc/Muttrc.d/t-prot.rc.removed || true fi + ;; + purge) + rm /etc/Muttrc.d/t-prot.rc.removed || true + rm /etc/Muttrc.d/t-prot.rc || true rmdir /etc/Muttrc.d 2> /dev/null || true -fi - -# on purge purge debconf data, too -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge -fi + # remove debconf data on purge + if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge + fi + ;; +esac