From: kcr Date: Mon, 16 Oct 2006 07:31:20 +0000 (+0000) Subject: zephyr (2.1.20010518.SNAPSHOT-16) unstable; urgency=low X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f3a081bb692e97a5a30305ff6fe3eca249b737ab;p=1ts-debian.git zephyr (2.1.20010518.SNAPSHOT-16) unstable; urgency=low * Tweak zhm and postinst scripts to not flush subs on restart. (it will happen one last time on upgrade, sorry) Closes: #148870 * Avoid possible doubling of zephyr-server name in configuration. Closes: #177477 * Add Swedish debconf template. Closes: #343756 * Update Spanish debconf template. Closes: #385052 * Fixup build-depends for new X world. * Make debconf templates lintian compliant (short titles instead of questions, "for internal use" instead of "You should never see this") * LSB init info * invoke init.d scripts properly * Assert Standards-Version: 3.7.2 -- Karl Ramm Mon, 16 Oct 2006 02:41:22 -0400 git-svn-id: svn://svn.1ts.org/debian/branches/pre_sourceforge_packages@196 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f --- diff --git a/zephyr/debian/changelog b/zephyr/debian/changelog index 8a294c8..88f168d 100644 --- a/zephyr/debian/changelog +++ b/zephyr/debian/changelog @@ -1,3 +1,21 @@ +zephyr (2.1.20010518.SNAPSHOT-16) unstable; urgency=low + + * Tweak zhm and postinst scripts to not flush subs on restart. + (it will happen one last time on upgrade, sorry) + Closes: #148870 + * Avoid possible doubling of zephyr-server name in configuration. + Closes: #177477 + * Add Swedish debconf template. Closes: #343756 + * Update Spanish debconf template. Closes: #385052 + * Fixup build-depends for new X world. + * Make debconf templates lintian compliant (short titles instead of + questions, "for internal use" instead of "You should never see this") + * LSB init info + * invoke init.d scripts properly + * Assert Standards-Version: 3.7.2 + + -- Karl Ramm Mon, 16 Oct 2006 02:41:22 -0400 + zephyr (2.1.20010518.SNAPSHOT-15) unstable; urgency=low * fix X build-deps for upcoming xorg transition. Closes: #346863 diff --git a/zephyr/debian/control b/zephyr/debian/control index 5f0d0a6..a9d7257 100644 --- a/zephyr/debian/control +++ b/zephyr/debian/control @@ -3,8 +3,8 @@ Section: net Priority: optional Maintainer: Karl Ramm Uploaders: Karl Ramm , Sam Hartman -Build-Depends: debhelper (>= 3), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev | libreadline4-dev, libx11-dev | xlibs-dev, libxt-dev | xlibs-dev, x-dev | xlibs-dev, libxaw7-dev, libncurses5-dev, bison, libhesiod-dev -Standards-Version: 3.5.9.0 +Build-Depends: debhelper (>= 3), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev, libx11-dev, libxt-dev, x-dev, libxaw8-dev | libxaw7-dev, libxmu-dev, libncurses5-dev, bison, libhesiod-dev +Standards-Version: 3.7.2 Package: libzephyr3 Section: libs diff --git a/zephyr/debian/po/cs.po b/zephyr/debian/po/cs.po index 7f77f9d..3fa269f 100644 --- a/zephyr/debian/po/cs.po +++ b/zephyr/debian/po/cs.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: zephyr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: 2005-03-16 20:16+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -26,8 +26,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "Jaké jsou va¹e zephyr servery?" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -42,8 +42,8 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "Toto jste nikdy nemìli vidìt" +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -91,3 +91,9 @@ msgid "" msgstr "" "Zadejte mezerami oddìlená celá jména va¹ich zephyr serverù (mù¾e to být i " "nadmno¾ina toho, co sdìlujete klientùm)." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Jaké jsou va¹e zephyr servery?" + +#~ msgid "You should never see this" +#~ msgstr "Toto jste nikdy nemìli vidìt" diff --git a/zephyr/debian/po/de.po b/zephyr/debian/po/de.po index 556b5b5..d10580b 100644 --- a/zephyr/debian/po/de.po +++ b/zephyr/debian/po/de.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: zephyr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: 2005-03-16 20:25+0100\n" "Last-Translator: Tobias Toedter \n" "Language-Team: German \n" @@ -26,8 +26,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "Wie heißen Ihre zephyr-Server?" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -43,8 +43,8 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "Dies sollten Sie niemals sehen" +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -96,3 +96,9 @@ msgstr "" "Bitte geben Sie die vollständigen Namen Ihrer zephyr-Server durch " "Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Obermenge von dem " "sein kann, was Sie den Clients angeben.)" + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Wie heißen Ihre zephyr-Server?" + +#~ msgid "You should never see this" +#~ msgstr "Dies sollten Sie niemals sehen" diff --git a/zephyr/debian/po/es.po b/zephyr/debian/po/es.po index ed7f3ef..1284f9a 100644 --- a/zephyr/debian/po/es.po +++ b/zephyr/debian/po/es.po @@ -1,3 +1,10 @@ +# zephyr debconf translation to spanish +# Copyright (C) 2001, 2006 Software in the Public Interest +# This file is distributed under the same license as the zephyr package. +# +# Changes: +# - Initial translation +# Carlos Valdivia Yagüe , 2001, 2006 # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -13,12 +20,12 @@ # msgid "" msgstr "" -"Project-Id-Version: zephyr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" -"PO-Revision-Date: 2003-07-02 16:26+0200\n" -"Last-Translator: Unknown \n" -"Language-Team: Spanish \n" +"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-15\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" +"PO-Revision-Date: 2006-08-28 19:30+0200\n" +"Last-Translator: Carlos Valdivia Yagüe \n" +"Language-Team: Debian L10n Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,8 +33,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "¿Cuáles son sus servidores zephyr?" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -36,15 +43,15 @@ msgid "" "Please type the full names of your zephyr servers, separated by spaces. " "(note that this can be a subset of what you're telling the servers)" msgstr "" -"Por favor, introduzca los nombres completos de sus servidores zephyr " -"separados por espacios. (tenga en cuenta que se puede tratar de sólo una " -"parte de lo que usted considera los servidores)" +"Por favor, introduzca los nombres completos de los servidores zephyr " +"separados por espacios (tenga en cuenta que se puede tratar de un conjunto " +"más amplio de lo que usted considera como los servidores)." #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "No debería poder leer esto" +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -58,7 +65,7 @@ msgid "" "postinst runs." msgstr "" "Para averiguar qué cambios ha realizado el usuario manualmente en el fichero " -"de configuración, hay que mirar en el fichero que hay en el script de " +"de configuración, es preciso mirar en el fichero que hay en el script de " "configuración. Sin embargo, si se trata de preconfigurar el paquete, dicho " "script se ejecuta dos veces antes de que lo haga el posterior a la " "instalación. De ese modo, es posible obtener un valor equivocado antes de " @@ -70,7 +77,7 @@ msgstr "" #. Description #: ../zephyr-clients.templates:20 msgid "You have no zephyr servers specified for the client" -msgstr "" +msgstr "No ha especificado servidores zephyr para el cliente" #. Type: note #. Description @@ -81,6 +88,10 @@ msgid "" "add the names of your zephyr servers, separated by spaces to the zhm_args " "variable." msgstr "" +"Por algún motivo el paquete zephyr-clients no tiene configurado ningún " +"servidor zephyr. Por favor, edite el fichero /etc/default/zephyr-clients y " +"añada los nombres de los servidores zephyr separados por espacios en la " +"variable zhm_args." #. Type: string #. Description @@ -89,6 +100,12 @@ msgid "" "Please type the full names of your zephyr servers, separated by spaces. " "(Note that this can be a superset of that you're telling the clients.)" msgstr "" -"Por favor, introduzca los nombres completos de sus servidores zephyr " -"separados por espacios. (tenga en cuenta que se puede tratar de un conjunto " -"más amplio de lo que usted considera los clientes)" +"Por favor, introduzca los nombres completos de los servidores zephyr " +"separados por espacios (tenga en cuenta que se puede tratar de un conjunto " +"más amplio de lo que usted considera como los clientes)." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "¿Cuáles son sus servidores zephyr?" + +#~ msgid "You should never see this" +#~ msgstr "No debería llegar a leer esto nunca" diff --git a/zephyr/debian/po/fr.po b/zephyr/debian/po/fr.po index 16aa802..54a2d37 100644 --- a/zephyr/debian/po/fr.po +++ b/zephyr/debian/po/fr.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: zephyr_2.1.20010518.SNAPSHOT-10\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: 2005-03-11 18:36+0100\n" "Last-Translator: Michel Grentzinger \n" "Language-Team: French \n" @@ -26,8 +26,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "Serveurs Zephyr :" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -43,8 +43,8 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "Vous ne devriez jamais voir cela" +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -96,3 +96,9 @@ msgstr "" "Veuillez indiquer les noms complets de vos serveurs Zephyr, séparés par des " "espaces (remarquez que cela peut être un sur-ensemble de ce que vous " "indiquez aux clients)." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Serveurs Zephyr :" + +#~ msgid "You should never see this" +#~ msgstr "Vous ne devriez jamais voir cela" diff --git a/zephyr/debian/po/pt_BR.po b/zephyr/debian/po/pt_BR.po index 1af5e87..08f0ed2 100644 --- a/zephyr/debian/po/pt_BR.po +++ b/zephyr/debian/po/pt_BR.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: zephyr 2.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: 2005-03-21 23:30-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" @@ -28,8 +28,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "Quais são os seus servidores zephyr?" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -45,8 +45,8 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "Você nunca deveria ter visto isso" +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -96,3 +96,9 @@ msgstr "" "Por favor digite os nomes completos de seus servidores zephyr, separado por " "espaços. (Note que isso pode ser um subconjunto daquilo que você está " "dizendo aos clientes.)" + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Quais são os seus servidores zephyr?" + +#~ msgid "You should never see this" +#~ msgstr "Você nunca deveria ter visto isso" diff --git a/zephyr/debian/po/ru.po b/zephyr/debian/po/ru.po index 06879ff..9f8638a 100644 --- a/zephyr/debian/po/ru.po +++ b/zephyr/debian/po/ru.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: zephyr\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: 2003-07-02 16:26+0200\n" "Last-Translator: Unknown \n" "Language-Team: Russian \n" @@ -26,8 +26,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "ëÁË ÎÁÚÙ×ÁÀÔÓÑ ×ÁÛÉ ÓÅÒ×ÅÒÁ zephyr?" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -43,8 +43,8 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "÷Ù ÎÉËÏÇÄÁ ÎÅ ÄÏÌÖÎÙ ×ÉÄÅÔØ ÜÔÏ" +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -95,3 +95,9 @@ msgstr "" "÷×ÅÄÉÔÅ ÐÏÌÎÙÅ ÉÍÅÎÁ ×ÁÛÉÈ ÓÅÒ×ÅÒÏ× zephyr, ÒÁÚÄÅÌÅÎÎÙÅ ÐÒÏÂÅÌÁÍÉ. " "(úÁÍÅÔØÔÅ, ÞÔÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÓÕÐÅÒÎÁÂÏÒ ÔÏÇÏ, ÞÔÏ ×Ù ÇÏ×ÏÒÉÔÅ " "ËÌÉÅÎÔÁÍ)." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "ëÁË ÎÁÚÙ×ÁÀÔÓÑ ×ÁÛÉ ÓÅÒ×ÅÒÁ zephyr?" + +#~ msgid "You should never see this" +#~ msgstr "÷Ù ÎÉËÏÇÄÁ ÎÅ ÄÏÌÖÎÙ ×ÉÄÅÔØ ÜÔÏ" diff --git a/zephyr/debian/po/sv.po b/zephyr/debian/po/sv.po new file mode 100644 index 0000000..6af072f --- /dev/null +++ b/zephyr/debian/po/sv.po @@ -0,0 +1,100 @@ +# 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: zephyr 2.1.20010518.SNAPSHOT-13\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" +"PO-Revision-Date: 2005-12-17 23:27+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 +msgid "Zephyr servers:" +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:3 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers)" +msgstr "" +"Vänligen ange hela namnen för dina zephyr-servrar, separerade med " +"mellanslag. (notera att detta kan vara ett subset av vad du berättar för " +"servrarna)" + +#. Type: boolean +#. Description +#: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 +msgid "for internal use" +msgstr "" + +#. Type: boolean +#. Description +#: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 +msgid "" +"We want to try and capture user changes when they edit a config file " +"manually. To do this we look at the file in the config script. However, in " +"the case of preconfigure, the config script is run twice before the postinst " +"is run. Thus we may read the wrong value before the edited value is written " +"out in postinst. If this is false we skip reading config files until " +"postinst runs." +msgstr "" +"Vi vill försöka att fånga in användarändringar när de redigerar en " +"konfigurationsfil manuellt. För att göra dett ser vi på filen i " +"konfigurationsskriptet. Hur som helst, i fallet med förkonfigurationer körs " +"konfigurationsskriptet dubbelt före postinst körs. Därför kan vi läsa av fel " +"värde före det redigerade värdet har skrivits ut i postinst. Om detta är " +"falskt hoppar vi över läsning av konfigurationsfiler tills postinst körs." + +#. Type: note +#. Description +#: ../zephyr-clients.templates:20 +msgid "You have no zephyr servers specified for the client" +msgstr "Du har inga zephyr-servrar angivna för klienten" + +#. Type: note +#. Description +#: ../zephyr-clients.templates:20 +msgid "" +"The zephyr-clients package for whatever reason does not have any zephyr " +"servers configured. Please edit the file /etc/default/zephyr-clients and " +"add the names of your zephyr servers, separated by spaces to the zhm_args " +"variable." +msgstr "" +"Paketet zephyr-clients har av någon anledning inte några zephyr-servrar " +"konfigurerade. Vänligen redigera filen /etc/default/zephyr-clients och lägg " +"till namnen för din zephyr-servrar i variabeln zhm_args, separera med " +"mellanslag." + +#. Type: string +#. Description +#: ../zephyr-server.templates:3 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Vänligen ange hela namnen för dina zephyr-servrar, separerade med mellanslag " +"(Notera att detta kan vara ett superset av vad du berättar för klienterna.)" + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Vilka är dina zephyr-servrar?" + +#~ msgid "You should never see this" +#~ msgstr "Du bör aldrig se detta" diff --git a/zephyr/debian/po/templates.pot b/zephyr/debian/po/templates.pot index c838bfd..039487b 100644 --- a/zephyr/debian/po/templates.pot +++ b/zephyr/debian/po/templates.pot @@ -1,22 +1,14 @@ -# -# 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. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,7 +19,7 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" +msgid "Zephyr servers:" msgstr "" #. Type: string @@ -41,7 +33,7 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" +msgid "for internal use" msgstr "" #. Type: boolean diff --git a/zephyr/debian/po/vi.po b/zephyr/debian/po/vi.po index f19d9e5..88110fb 100644 --- a/zephyr/debian/po/vi.po +++ b/zephyr/debian/po/vi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-13\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 22:17+0100\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2006-10-16 01:15-0400\n" "PO-Revision-Date: 2005-08-21 21:51+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -19,8 +19,8 @@ msgstr "" #. Type: string #. Description #: ../zephyr-clients.templates:3 ../zephyr-server.templates:3 -msgid "What are your zephyr servers?" -msgstr "Bạn có trình phục vụ zephyr nào?" +msgid "Zephyr servers:" +msgstr "" #. Type: string #. Description @@ -36,8 +36,8 @@ msgstr "" #. Type: boolean #. Description #: ../zephyr-clients.templates:10 ../zephyr-server.templates:10 -msgid "You should never see this" -msgstr "Bạn không bao giờ nên thấy điều này." +msgid "for internal use" +msgstr "" #. Type: boolean #. Description @@ -88,3 +88,9 @@ msgstr "" "Hãy gõ tên đầy đủ của các trình phục vụ zephyr của bạn, định giới bằng dấu " "cách (ghi chú: điều này có thể là siêu nhóm của điều mà bạn đang báo những " "trình khách)." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Bạn có trình phục vụ zephyr nào?" + +#~ msgid "You should never see this" +#~ msgstr "Bạn không bao giờ nên thấy điều này." diff --git a/zephyr/debian/rules b/zephyr/debian/rules index e711192..ba235cc 100755 --- a/zephyr/debian/rules +++ b/zephyr/debian/rules @@ -137,7 +137,7 @@ binary-arch: build install # dh_installmenu # dh_installemacsen # dh_installpam - dh_installinit -pzephyr-clients --init-script=zhm + dh_installinit -pzephyr-clients --init-script=zhm --no-start dh_installinit -pzephyr-server-krb --init-script=zephyrd dh_installinit -pzephyr-server --init-script=zephyrd # dh_installcron diff --git a/zephyr/debian/zephyr-clients.init b/zephyr/debian/zephyr-clients.init index ac4c2a4..0caa017 100644 --- a/zephyr/debian/zephyr-clients.init +++ b/zephyr/debian/zephyr-clients.init @@ -60,7 +60,7 @@ EOF /var/run/$NAME.pid --exec $DAEMON sleep 1 start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $zhm_args + /var/run/$NAME.pid --exec $DAEMON -- -N $zhm_args echo "$NAME." ;; *) @@ -72,3 +72,15 @@ EOF esac exit 0 + +### BEGIN INIT INFO +# Provides: zhm +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the zephyr host manager daemon. +# Description: Start the zephyr host manager daemon. +### END INIT INFO + diff --git a/zephyr/debian/zephyr-clients.postinst b/zephyr/debian/zephyr-clients.postinst index 88ebe8a..ba03ef2 100644 --- a/zephyr/debian/zephyr-clients.postinst +++ b/zephyr/debian/zephyr-clients.postinst @@ -67,6 +67,14 @@ EOF ;; esac +if [ -x "/etc/init.d/zhm" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d zhm restart || exit $? + else + /etc/init.d/zhm restart || exit $? + fi +fi + # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/zephyr/debian/zephyr-clients.preinst b/zephyr/debian/zephyr-clients.preinst deleted file mode 100755 index fdf31a2..0000000 --- a/zephyr/debian/zephyr-clients.preinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if test -x /etc/init.d/zhm -then - /etc/init.d/zhm stop -fi - -#DEBHELPER# diff --git a/zephyr/debian/zephyr-clients.prerm b/zephyr/debian/zephyr-clients.prerm index 5f92d7d..69beaac 100644 --- a/zephyr/debian/zephyr-clients.prerm +++ b/zephyr/debian/zephyr-clients.prerm @@ -31,6 +31,14 @@ case "$1" in ;; esac +if [ -x "/etc/init.d/zhm" ] && [ "$1" = remove ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d zhm stop || exit $? + else + /etc/init.d/zhm stop || exit $? + fi +fi + # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/zephyr/debian/zephyr-clients.templates b/zephyr/debian/zephyr-clients.templates index 8b733bb..3309ada 100644 --- a/zephyr/debian/zephyr-clients.templates +++ b/zephyr/debian/zephyr-clients.templates @@ -1,13 +1,13 @@ Template: zephyr-clients/servers Type: string -_Description: What are your zephyr servers? +_Description: Zephyr servers: Please type the full names of your zephyr servers, separated by spaces. (note that this can be a subset of what you're telling the servers) Template: zephyr-clients/read_conf Type: boolean Default: true -_Description: You should never see this +_Description: for internal use We want to try and capture user changes when they edit a config file manually. To do this we look at the file in the config script. However, in the case of preconfigure, the config script is run twice before the diff --git a/zephyr/debian/zephyr-server-krb.init b/zephyr/debian/zephyr-server-krb.init index 494d815..b890a88 100644 --- a/zephyr/debian/zephyr-server-krb.init +++ b/zephyr/debian/zephyr-server-krb.init @@ -64,3 +64,14 @@ case "$1" in esac exit 0 + +### BEGIN INIT INFO +# Provides: zephyrd +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the zephyr server. +# Description: Start the zephyr server. +### END INIT INFO diff --git a/zephyr/debian/zephyr-server.config b/zephyr/debian/zephyr-server.config index 2050dc0..0b9cccb 100644 --- a/zephyr/debian/zephyr-server.config +++ b/zephyr/debian/zephyr-server.config @@ -10,7 +10,7 @@ then # it might know something about servers. # else default to just the current host z="`hostname --fqdn`" - if db_get zephyr-clients/servers && test -n "$RET" + if db_get zephyr-clients/servers && test -n "$RET" && ! echo "$RET" | grep -q "$z" then z="$RET $z" fi diff --git a/zephyr/debian/zephyr-server.init b/zephyr/debian/zephyr-server.init index f744631..b0c96cd 100644 --- a/zephyr/debian/zephyr-server.init +++ b/zephyr/debian/zephyr-server.init @@ -58,3 +58,15 @@ case "$1" in esac exit 0 + +### BEGIN INIT INFO +# Provides: zephyrd +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the zephyr server. +# Description: Start the zephyr server. +### END INIT INFO + diff --git a/zephyr/debian/zephyr-server.templates b/zephyr/debian/zephyr-server.templates index 1e9fbc4..27718f6 100644 --- a/zephyr/debian/zephyr-server.templates +++ b/zephyr/debian/zephyr-server.templates @@ -1,13 +1,13 @@ Template: zephyr-server/servers Type: string -_Description: What are your zephyr servers? +_Description: Zephyr servers: Please type the full names of your zephyr servers, separated by spaces. (Note that this can be a superset of that you're telling the clients.) Template: zephyr-server/read_conf Type: boolean Default: true -_Description: You should never see this +_Description: for internal use We want to try and capture user changes when they edit a config file manually. To do this we look at the file in the config script. However, in the case of preconfigure, the config script is run twice before the diff --git a/zephyr/zhm/zhm.c b/zephyr/zhm/zhm.c index 2b954ba..521bfca 100644 --- a/zephyr/zhm/zhm.c +++ b/zephyr/zhm/zhm.c @@ -27,6 +27,7 @@ int use_hesiod = 0; int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork; int no_server = 1, nservchang, nserv, nclt; int booting = 1, timeout_type, deactivated = 1; +int bootflag = 1; long starttime; u_short cli_port; struct sockaddr_in cli_sin, serv_sin, from; @@ -76,7 +77,7 @@ char *argv[]; exit(-1); } prim_serv[0] = '\0'; - while ((opt = getopt(argc, argv, "drhinf")) != EOF) + while ((opt = getopt(argc, argv, "drhinfN")) != EOF) switch(opt) { case 'd': hmdebug = 1; @@ -101,6 +102,9 @@ char *argv[]; case 'f': noflushflag = 1; break; + case 'N': + bootflag = 0; + break; case '?': default: errflg++; @@ -427,7 +431,10 @@ static void init_hm() memcpy(&serv_sin.sin_addr, hp->h_addr, 4); } - send_boot_notice(HM_BOOT); + if (bootflag) + send_boot_notice(HM_BOOT); + else + send_boot_notice(HM_ATTACH); deactivated = 0; #ifdef _POSIX_VERSION @@ -600,7 +607,6 @@ static void send_stats(notice, sin) void die_gracefully() { syslog(LOG_INFO, "Terminate signal caught..."); - send_flush_notice(HM_FLUSH); unlink(PidFile); closelog(); exit(0);