On Fri, Jan 21, 2005 at 10:49:18PM +0100, Christian Perrier wrote: > > Attached is a proposed patch which should fix this issue. > > (I included some other simple changes, too) > > > While preparing what was supposed to be a l10n NMU, I went on a few > other simple to fix issues: > > * Lintian fixes (the obvious ones): > - Remove dh-make boilerplate in copyright > - Remove initial capitals in packages description synopsis > and improve English slightly
Ok, attached the updated patch which I plan to upload. Gruesse, -- Frank Lichtenheld <[EMAIL PROTECTED]> www: http://www.djpig.de/
diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/changelog viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/changelog 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/changelog 2005-01-24 11:32:27.000000000 +0100 @@ -1,3 +1,22 @@ +viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.4) unstable; urgency=high + + * NMU. + * Don't try to change the config file if there are vhosts configured. + This will most probably mess it up (Closes: #289466) + * Bug fix: "viewcvs: Updated Japanese po-debconf template translation + (ja.po)", thanks to Hideki Yamane (Closes: #241832). + * Bug fix: "Update of the french debconf translation", thanks to Michel + Grentzinger (Closes: #244514). + * Bug fix: "[INTL:nl] New po-debconf translation in Dutch for viewcvs.", + thanks to Tim Dijkstra (Closes: #289639). + * Copyright holder has changed, correct copyright file + * More changes by Christian Perrier: + + Remove dh-make boilerplate in copyright + + Remove initial capitals in packages description synopsis + and improve English slightly + + -- Frank Lichtenheld <[EMAIL PROTECTED]> Fri, 21 Jan 2005 12:33:29 +0100 + viewcvs (0.9.2+cvs.1.0.dev.2004.07.28-1.3) unstable; urgency=HIGH * NMU. diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/config viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/config --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/config 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/config 2005-01-21 13:02:34.000000000 +0100 @@ -15,6 +15,10 @@ fi if [ -x /usr/lib/viewcvs/viewcvs-config -a -f /etc/viewcvs/viewcvs.conf ]; then + if [ -n "`/usr/lib/viewcvs/viewcvs-config --all --section vhosts 2>/dev/null`" ]; then + exit 0 + fi + cvs_roots=`/usr/lib/viewcvs/viewcvs-config --get cvs_roots` svn_roots=`/usr/lib/viewcvs/viewcvs-config --get svn_roots` # svn_parent_path=`/usr/lib/viewcvs/viewcvs-config --get svn_parent_path` diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/control viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/control --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/control 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/control 2005-01-24 11:33:30.000000000 +0100 @@ -10,7 +10,7 @@ Depends: ${python:Depends}, cvs | subversion, rcs, mime-support, debconf (>= 1.0) Recommends: enscript, httpd Suggests: cvsgraph, viewcvs-query, python2.3-subversion -Description: Viewing CVS Repositories via HTTP +Description: view CVS Repositories via HTTP The ViewCVS software was inspired by cvsweb (by Henner Zeller). ViewCVS can browse directories, commit-logs, and specific revisions of files. It can display diffs between versions and show selections of files based on @@ -22,7 +22,7 @@ Architecture: all Depends: viewcvs (= ${Source-Version}), python-mysqldb, python-egenix-mxdatetime Replaces: viewcvs (<< 0.9.2-6) -Description: Viewing CVS (viewcvs-query.cgi) +Description: view CVS (viewcvs-query.cgi) The ViewCVS software was inspired by cvsweb (by Henner Zeller). ViewCVS can browse directories, commit-logs, and specific revisions of files. It can display diffs between versions and show selections of files based on diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/copyright viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/copyright --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/copyright 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/copyright 2005-01-24 11:31:25.000000000 +0100 @@ -3,13 +3,13 @@ It was downloaded from <http://viewcvs.sourceforge.net/> -Upstream Author(s): Greg Stein <[EMAIL PROTECTED]> +Upstream Author: Greg Stein <[EMAIL PROTECTED]> Copyright: -# Copyright (C) 1999-2000 Greg Stein. All Rights Reserved. +# Copyright (C) 1999-2002 The ViewCVS Group. All Rights Reserved. # -# By using this file, you agree to the terms and conditions set forth below: +# By using ViewCVS, you agree to the terms and conditions set forth below: # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/fr.po viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/fr.po --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/fr.po 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/fr.po 2005-01-21 12:25:49.000000000 +0100 @@ -11,10 +11,10 @@ # msgid "" msgstr "" -"Project-Id-Version: viewcvs_0.9.2+cvs.1.0.dev.2003.05.05-2\n" +"Project-Id-Version: viewcvs_0.9.2+cvs.1.0.dev.2004.07-2\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-24 15:48+0900\n" -"PO-Revision-Date: 2003-07-09 23:05+0200\n" +"PO-Revision-Date: 2004-08-31 09:48+0200\n" "Last-Translator: Michel Grentzinger <[EMAIL PROTECTED]>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ #. Description #: ../templates:4 msgid "Where are your cvs roots?" -msgstr "Où sont situés vos entrepôts CVS ?" +msgstr "Emplacement de vos entrepôts CVS :" #. Type: string #. Description @@ -43,30 +43,28 @@ #. Type: string #. Description #: ../templates:12 -#, fuzzy msgid "Where are your svn roots?" -msgstr "Où sont situés vos entrepôts CVS ?" +msgstr "Emplacement de vos entrepôts svn :" #. Type: string #. Description #: ../templates:12 -#, fuzzy msgid "" "This setting specifies each of the Subversion roots (repositories) on your " "system and assigns names to them. Each root should be given by a \"name: path" "\" value. Multiple roots should be separated by commas and can be placed on " "separate lines." msgstr "" -"Ce paramètre définit chacun des entrepôts CVS sur votre système et leur " -"attribue un nom. Chaque entrepôt doit être indiqué sous la forme « nom: " -"chemin ». Les noms des différents entrepôts doivent être séparés par des " -"virgules." +"Ce paramètre définit chacune des racines Subversion (entrepôts) sur votre " +"système et leur attribue un nom. Chaque entrepôt doit être indiqué sous la " +"forme « nom: chemin ». Les noms des différents entrepôts doivent être " +"séparés par des virgules et peuvent être placés sur des lignes distinctes." #. Type: string #. Description #: ../templates:21 msgid "Where is your svn directory which has any number of repositories?" -msgstr "" +msgstr "Répertoire svn contenant plusieurs entrepôts :" #. Type: string #. Description @@ -80,6 +78,14 @@ "notice each Subversion repository in that directory as a new root whose name " "is the subdirectory of the parent path in which that repository lives." msgstr "" +"La variable « svn_parent_path » pointe vers un répertoire où se trouvent un " +"nombre quelconque d'entrepôts Subversion. Plutôt que de vous obliger à " +"ajouter une nouvelle entrée à « svn_roots » à chaque fois que vous créez un " +"nouvel entrepôt, ViewCVS vous permet de placer tous vos entrepôts Subversion " +"dans un seul répertoire parent en indiquant simplement ce répertoire racine. " +"ViewCVS définira chaque entrepôt Subversion de ce répertoire comme une " +"nouvelle racine dont le nom sera le sous-répertoire du répertoire parent " +"dans lequel cet entrepôt réside." #. Type: string #. Description @@ -90,20 +96,23 @@ "either rename the offending repository on disk, or grant new names to the " "clashing item in cvs_roots or svn_roots." msgstr "" +"Attention : ces noms peuvent, bien entendu, interférer avec les noms que " +"vous avez définis dans les variables « cvs_roots » ou « svn_roots ». Si cela " +"se produit, vous pouvez renommer le répertoire posant problème sur le " +"disque, ou attribuer de nouveaux noms aux lignes « cvs_roots » ou " +"« svn_roots »." #. Type: select #. Description #: ../templates:39 -#, fuzzy msgid "Which is default root?" -msgstr "Quel est l'entrepôt CVS par défaut ?" +msgstr "Entrepôt par défaut :" #. Type: select #. Description #: ../templates:39 -#, fuzzy msgid "Default of CVS/SVN Root." -msgstr "Entrepôt CVS par défaut." +msgstr "Veuillez indiquer l'entrepôt CVS/SVN par défaut." #. Type: string #. Default @@ -115,7 +124,7 @@ #. Description #: ../templates:45 msgid "Please enter CVS administorator address:" -msgstr "Veuillez indiquer l'adresse de l'administrateur CVS :" +msgstr "Adresse électronique de l'administrateur CVS :" #. Type: string #. Description @@ -149,7 +158,7 @@ "\"[seq]\" will match any character in seq, and \"[!seq]\" will match any " "character not in seq." msgstr "" -"Ceci devrait contenir une liste des modules du référentiel qui ne devraient " +"Ceci devrait contenir une liste des modules de l'entrepôt qui ne devraient " "pas être affichés (soit avec un chemin par défaut, soit avec un chemin " "explicitement indiqué). Ce paramètre peut être une simple liste de modules, " "ou il peut être plus complexe :\n" @@ -166,7 +175,7 @@ #. Description #: ../templates:67 msgid "Do you allow tarball generation?" -msgstr "Souhaitez-vous permettre la génération d'archives (« tarball ») ?" +msgstr "Autorisez-vous la création d'archives (« tarball ») ?" #. Type: boolean #. Description @@ -175,8 +184,8 @@ "ViewCVS can generate a tarball from a repository on the fly. This option " "allows to download a tarball of the current directory." msgstr "" -"ViewCVS peut produire à la volée une archive à partir d'un référentiel. " -"Cette option permet de télécharger une archive du répertoire courant." +"ViewCVS peut produire à la volée une archive à partir de l'entrepôt. Cette " +"option permet de télécharger une archive du répertoire courant." #. Type: note #. Description diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/ja.po viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/ja.po --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/ja.po 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/ja.po 2005-01-21 12:24:11.000000000 +0100 @@ -11,67 +11,141 @@ # # Developers do not need to manually edit POT or PO files. # -#, fuzzy +# msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: viewcvs 0.9.2+cvs.1.0.dev.2004.03.24-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-06-28 10:15+0200\n" -"PO-Revision-Date: 2003-11-23 22:02+0900\n" +"POT-Creation-Date: 2004-03-24 15:48+0900\n" +"PO-Revision-Date: 2004-03-28 19:02+0900\n" "Last-Translator: Hideki Yamane <[EMAIL PROTECTED]>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description #: ../templates:4 msgid "Where are your cvs roots?" msgstr "CVS ¤Îë¥ÈÇ£¥ì¥Èê¤Ïɳ¤Ë¢¤ê¤Þ¹¤«?" +#. Type: string #. Description #: ../templates:4 msgid "" "This setting specifies each of the CVS roots on your system and assigns " "names to them. Each root should be given by a \"name: path\" value. Multiple " "roots should be separated by commas." -msgstr "¤³¤ÎÀßÄê¤Ç CVS ¥ë¥ÈÇ£¥ì¥È꤬¤½¤ì¤ì¥¹¥Æà¤Îɳ¤Ë¢¤ë¤Î«¤ò»ØÄê¤ÆÌÁ¤òÉÕ±¤Þ¹¡£¤½¤ì¤ì¤Îë¥ÈÇ£¥ì¥Èê¤ËÏ \"name: path\" ¤È¤¤¦ÃÍòͤ¨¤ëÉÍ׬¤¢¤ê¤Þ¹¡£Ê¿ô¤Îë¥ÈÇ£¥ì¥Èê¤Ï³¥ó¥ÞÇèÀÚëÉÍ׬¤¢¤ê¤Þ¹¡£" +msgstr "" +"¤³¤ÎÀßÄê¤Ç CVS ¥ë¥ÈÇ£¥ì¥È꤬¤½¤ì¤ì¥¹¥Æà¤Îɳ¤Ë¢¤ë¤Î«¤ò»ØÄê" +"¤ÆÌÁ¤òÉÕ±¤Þ¹¡£¤½¤ì¤ì¤Îë¥ÈÇ£¥ì¥Èê¤ËÏ \"name: path\" ¤È¤¤¦ÃÍò" +"ͤ¨¤ëÉÍ׬¤¢¤ê¤Þ¹¡£Ê¿ô¤Îë¥ÈÇ£¥ì¥Èê¤Ï³¥ó¥ÞÇèÀÚëÉÍ׬¤¢¤ê¤Þ" +"¤¹¡£" +#. Type: string #. Description #: ../templates:12 -msgid "Which is default cvs root?" -msgstr "ɽà¤Î CVS ¥ë¥ÈÇ£¥ì¥Èê¤ÏÉì¤Ç¹¤«?" +msgid "Where are your svn roots?" +msgstr "svn ¤Îë¥ÈÇ£¥ì¥Èê¤Ïɳ¤Ë¢¤ê¤Þ¹¤«?" +#. Type: string #. Description #: ../templates:12 -msgid "Default of CVS Root." -msgstr "ɽà¤Î CVS ¥ë¥ÈÇ£¥ì¥Èê" +msgid "" +"This setting specifies each of the Subversion roots (repositories) on your " +"system and assigns names to them. Each root should be given by a \"name: path" +"\" value. Multiple roots should be separated by commas and can be placed on " +"separate lines." +msgstr "" +"¤³¤ÎÀßÄê¤Ç Subversion ¤Îë¥ÈÇ£¥ì¥Èê (¥ê¥Ý¸¥Èê) ¤¬¤½¤ì¤ì¥¹¥Æà¤Î" +"¤É³¤Ë¢¤ë¤Î«¤ò»ØÄê¤ÆÌÁ¤òÉÕ±¤Þ¹¡£¤½¤ì¤ì¤Îë¥ÈÇ£¥ì¥Èê¤ËÏ \"name: path\" ¤È¤¤¦ÃÍò" +"ͤ¨¤ëÉÍ׬¤¢¤ê¤Þ¹¡£Ê¿ô¤Îë¥ÈÇ£¥ì¥Èê¤Ï³¥ó¥ÞÇèÀÚëÉÍ׬¤¢¤ê¤Þ¹¡£" + +#. Type: string +#. Description +#: ../templates:21 +msgid "Where is your svn directory which has any number of repositories?" +msgstr "¥ê¥Ý¸¥Èꤢ¤ë svn ¥Ç£¥ì¥Èê¤Ïɳ¤ËÊê¤Þ¹¤«?" + +#. Type: string +#. Description +#: ../templates:21 +msgid "" +"The 'svn_parent_path' is a directory in which any number of Subversion " +"repositories may reside. Rather than force you to add a new entry to " +"'svn_roots' each time you create a new repository, ViewCVS rewards you for " +"putting all your Subversion repositories in a single parent directory by " +"allowing you to simply specifiy that parent directory. ViewCVS will then " +"notice each Subversion repository in that directory as a new root whose name " +"is the subdirectory of the parent path in which that repository lives." +msgstr "" +"'svn_parent_path' ¤Ï¤¤¯¤Äâ¤Î Subversion ¤Îê¥Ý¸¥Èê¥Ç£¥ì¥ÈêÃÖ«¤ì¤ë¤è" +"¤ËÊê¤Þ¹¡£ViewCVS ¤ÇÏ·¤·¤¤¥ì¥Ý¸¥Èê¤òºî¤ë¤ÓË·¤·¤¤¥¨¥ó¥Èê¤ò 'svn_roots' " +"¤ËÄÉù¤ë¤è¤Ë¹¤ë¤è¤ê¤âÃ¤ËÆÇ£¥ì¥Èê¤ò»ØÄê¤ÆÁ¤ÆÎ Subversion ¥ê¥Ý¸" +"¥Èê¤ò¤ÒÈÄÎÆÇ£¥ì¥Èê¤ËÃÖ¯¤è¤Ë·¤Þ¹¡£ViewCVS ¤Ï½¤ÎÝ˽¤ì¤ì¤Î " +"Subversion ¥ê¥Ý¸¥Èê¤òÎê¥Ý¸¥ÈêÃÖ«¤ì¤Æ¤¤ë¿ÆÇ£¥ì¥Èê¤Îµ¥ÖÇ£¥ì" +"¥Èê̤ȷ¤Æ·¤·¤¤¥ë¥ÈÇ£¥ì¥Èê¤òǼ±¤·¤Þ¹¡£" + +#. Type: string +#. Description +#: ../templates:21 +msgid "" +"Caution: these names can, of course, clash with names you have defined in " +"your cvs_roots or svn_roots configuration items. If this occurs, you can " +"either rename the offending repository on disk, or grant new names to the " +"clashing item in cvs_roots or svn_roots." +msgstr "" +"Ãí°Õ: ÅöêÁ¤Ç¹¤¬¡¢cvs_roots ¤ä svn_roots ¤ÎÀßÄê¤ÇÄêµÁ·¤¿ÌÁ¤È³¤ÎÌÁ¤¬" +"¤ÖÄ«¤ë¾ì¹ç¤¢¤ê¤Þ¹¡£¤³¤Îè¤Êì¹ç¤ÏÌäÂ굯¤³¤ë¥ê¥Ý¸¥Èê¤ÎÌÁ¤òÊѹ¤¹¤ë" +"¤«¡¢cvs_roots ¤Þ¿¤Ï svn_roots Æâ¤ÎÌÁ¤¬¾×ÆÍ¹¤ë¤â¤ÎØ·¤·¤¤ÌÁ¤òÉÕͤǤ޹¡£" + + +#. Type: select +#. Description +#: ../templates:39 +msgid "Which is default root?" +msgstr "ɽà¤Îë¥ÈÇ£¥ì¥Èê¤Ïɳ¤Ç¹¤«?" + +#. Type: select +#. Description +#: ../templates:39 +msgid "Default of CVS/SVN Root." +msgstr "ɽà¤Î CVS/SVN ¥ë¥ÈÇ£¥ì¥Èê" +#. Type: string #. Default -#: ../templates:17 +#: ../templates:44 msgid "<a href=\"mailto:[EMAIL PROTECTED]">CVS admin</a>" msgstr "<a href=\"mailto:[EMAIL PROTECTED]">CVS ´ÉÍý¼Ô</a>" +#. Type: string #. Description -#: ../templates:18 +#: ../templates:45 msgid "Please enter CVS administorator address:" msgstr "CVS ´ÉÍý¼ÔÎá¥ë¥Éì¤òÆþÎÏ·¤Æ¯¤Àµ¤¤: " +#. Type: string #. Description -#: ../templates:18 +#: ../templates:45 msgid "" "This address is shown in the footer of the generated pages. It must be the " "address of the local CVS maintainer. (e.g. <a href=\"mailto:[EMAIL PROTECTED]" "\">cvsadmin</a>)" -msgstr "¤³¤Î¢¥Éì¤ÏÀÀ¤µ¤ì¥Ú¼¥¸¤Î¼Éô¤Ëɼ¨¤µ¤ì¤Þ¹¡£¤³¤ì¤Ïí¥«¥ë¤Î CVS ¥á¥ó¥ÆÊ΢¥Éì¤Ç¢¤ëÉÍ׬¤¢¤ê¤Þ¹¡£ (Îã <a href=\"mailto:[EMAIL PROTECTED]">cvsadmin</a>)" +msgstr "" +"¤³¤Î¢¥Éì¤ÏÀÀ¤µ¤ì¥Ú¼¥¸¤Î¼Éô¤Ëɼ¨¤µ¤ì¤Þ¹¡£¤³¤ì¤Ïí¥«¥ë¤Î CVS ¥á¥ó" +"¥ÆÊ΢¥Éì¤Ç¢¤ëÉÍ׬¤¢¤ê¤Þ¹¡£ (Îã <a href=\"mailto:[EMAIL PROTECTED]" +"\">cvsadmin</a>)" +#. Type: string #. Description -#: ../templates:25 +#: ../templates:52 msgid "Do you have access forbidden modules?" msgstr "¥¢¥¯¥»¥¹¤òµö²Ä·¤Ê¤¥â¥å¥ë¤Ï¢¤ê¤Þ¹¤«?" +#. Type: string #. Description -#: ../templates:25 +#: ../templates:52 msgid "" "This should contain a list of modules in the repository that should not be " "displayed (by default or by explicit path specification). This configuration " @@ -82,29 +156,44 @@ "sequence of zero or more characters, \"?\" will match any single character, " "\"[seq]\" will match any character in seq, and \"[!seq]\" will match any " "character not in seq." -msgstr "¤³¤³¤ÇÏê¥Ý¸¥ÈêÆâ¤Îɼ¨¤µ¤»¤¿¤¯¤Ê¤¥â¥å¥ë¤Îê¥ÈòÀßÄê¤Æ¯¤Àµ¤¤ (¥Ññ¡¼¥¸¤¬Äó¹¤ëɽà¤Îâ¤Î«¡¢¤â¤¯¤ÏÌÀ¨Å¤Ë path ¤ò»ØÄê¤Þ¹) ¡£¤³¤ÎÀßÄê¤ÏäËâ¥å¥ë¤òÎóµóÆâ¤Þ¤¤Þ»¤ó¢¼¡¤Îè¤ÊÊ»¨¤ÊØÄê¤òë¤Èâ¤Ç¤Þ¹: \n" -" *) ÌÀ¨Å¤ÊÖÇÏʤ¡×Ȥ¤¦Àë¸Àò¹Ô¦¤¿¤á¤ËÏ¢¥â¥å¥ë̤ÎÁ¤Ë \"!\" ¤òÍøÍÑ·¤Þ¹¡£\n" -" *) ¥·¥§¥ë·Á°¤Î°¥í¥Öɸ½¤âÍøÍÑÄǤǹ¡£ \"*\" ¤Ï0Ê»ú°Êå¤ÎÊ»úÎó¡¢ \"?\" ¤ÏǰÕÎ1Ê»ú¡¢\"[seq]\" ¤Ï seq ¤ËÞÞì¤ëǰÕÎÊ»ú¤·¤Æ \"[!seq]\" ¤Ï seq ¤ËÞÞì¤Ê¤Ç°ÕÎÊ»ú¤Ë½¤ì¤ì¥ÞÃÁ·¤Þ¹¡£" +msgstr "" +"¤³¤³¤ÇÏê¥Ý¸¥ÈêÆâ¤Îɼ¨¤µ¤»¤¿¤¯¤Ê¤¥â¥å¥ë¤Îê¥ÈòÀßÄê¤Æ¯¤Àµ¤¤ " +"(¥Ññ¡¼¥¸¤¬Äó¹¤ëɽà¤Îâ¤Î«¡¢¤â¤¯¤ÏÌÀ¨Å¤Ë path ¤ò»ØÄê¤Þ¹) ¡£¤³¤Î" +"ÀßÄê¤ÏäËâ¥å¥ë¤òÎóµóÆâ¤Þ¤¤Þ»¤ó¢¼¡¤Îè¤ÊÊ»¨¤ÊØÄê¤òë" +"¤Èâ¤Ç¤Þ¹: \n" +" *) ÌÀ¨Å¤ÊÖÇÏʤ¡×Ȥ¤¦Àë¸Àò¹Ô¦¤¿¤á¤ËÏ¢¥â¥å¥ë̤ÎÁ¤Ë \"!\" ¤ò" +"ÍøÍÑ·¤Þ¹¡£\n" +" *) ¥·¥§¥ë·Á°¤Î°¥í¥Öɸ½¤âÍøÍÑÄǤǹ¡£ \"*\" ¤Ï0Ê»ú°Êå¤ÎÊ»úÎó¡¢ \"?\" " +"¤ÏǰÕÎ1Ê»ú¡¢\"[seq]\" ¤Ï seq ¤ËÞÞì¤ëǰÕÎÊ»ú¤·¤Æ \"[!seq]\" ¤Ï " +"seq ¤ËÞÞì¤Ê¤Ç°ÕÎÊ»ú¤Ë½¤ì¤ì¥ÞÃÁ·¤Þ¹¡£" +#. Type: boolean #. Description -#: ../templates:40 +#: ../templates:67 msgid "Do you allow tarball generation?" msgstr "tarball ¤ÎÀÀ¤òµö²Ä·¤Þ¹¤«?" +#. Type: boolean #. Description -#: ../templates:40 +#: ../templates:67 msgid "" "ViewCVS can generate a tarball from a repository on the fly. This option " "allows to download a tarball of the current directory." -msgstr "ViewCVS ¤Ïê¥Ý¸¥Èê¤é tarball ¤òóÕé¤ÇÀÀ¤Ç¤Þ¹¡£¤³¤Îª¥×·¥ç¥ó¤Ï½ºßÎÇ£¥ì¥Èê¤Î tarball ¤ò¥À¦¥ó¥í¥ÉÄǤ˹¤ë¤â¤Îǹ¡£" +msgstr "" +"ViewCVS ¤Ïê¥Ý¸¥Èê¤é tarball ¤òóÕé¤ÇÀÀ¤Ç¤Þ¹¡£¤³¤Îª¥×·¥ç¥ó" +"¤Ï½ºßÎÇ£¥ì¥Èê¤Î tarball ¤ò¥À¦¥ó¥í¥ÉÄǤ˹¤ë¤â¤Îǹ¡£" +#. Type: note #. Description -#: ../templates:46 +#: ../templates:73 msgid "You need modify httpd configuration for online documents and icons." -msgstr "¥ª¥ó¥é¥ó¥É¥å¥á¥ó¥ÈÈ¢¥¤¥³¥ó¤Îɼ¨¤Î¿¤á¤Ë httpd ¤ÎÀßÄê¤òÊѹ¤¹¤ëÉÍ׬¤¢¤ê¤Þ¹¡£" +msgstr "" +"¥ª¥ó¥é¥ó¥É¥å¥á¥ó¥ÈÈ¢¥¤¥³¥ó¤Îɼ¨¤Î¿¤á¤Ë httpd ¤ÎÀßÄê¤òÊѹ¤¹¤ëÉÍ׬¤¢" +"¤ê¤Þ¹¡£" +#. Type: note #. Description -#: ../templates:46 +#: ../templates:73 msgid "" "ViewCVS package has online documents and icons in /usr/share/viewcvs/ If you " "want to use it, you should modify configuration file of httpd (/etc/apache/" @@ -112,4 +201,12 @@ " Alias /viewcvs/ /usr/share/viewcvs/\n" "In addition, default templates use icons as /viewcvs/icons/*, so this " "configuration is required." -msgstr "ViewCVS ¥Ññ¡¼¥¸¤Îª¥ó¥é¥ó¥É¥å¥á¥ó¥ÈÈ¢¥¤¥³¥ó¤¬ /usr/share/view/cvs/ ¤Ë¢¤ê¤Þ¹¡£¤³¤ì¤ò»È¤¤¿¤¤¾ì¹çhttpd ¤ÎÀßÄê¥Õ¡¥¤¥ë (/etc/apache/httpd.conf ¤ÊÉ) ¤ò\n Alias /viewcvs/ /usr/share/viewcvs/\n ¤È¤¤¦¤è¤ËÊѹ¤·¤Ê¯¤ÆÏ¤¤±¤Þ»¤óµ¤é¤Ë¢É½à¤ÎÆó¥×ì¥ÈÇÏ /viewcvs/icons/* ¤Îè¤Ë·¤Æ¢¥¤¥³¥ó¤òÍøÍѹ¤ë¤ÎÇ¢¤³¤ÎÀßÄê¤âÉÍ×ǹ¡£" +msgstr "" +"ViewCVS ¥Ññ¡¼¥¸¤Îª¥ó¥é¥ó¥É¥å¥á¥ó¥ÈÈ¢¥¤¥³¥ó¤¬ /usr/share/view/cvs/ " +"¤Ë¢¤ê¤Þ¹¡£¤³¤ì¤ò»È¤¤¿¤¤¾ì¹çhttpd ¤ÎÀßÄê¥Õ¡¥¤¥ë (/etc/apache/httpd.conf " +"¤ÊÉ) ¤ò\n" +" Alias /viewcvs/ /usr/share/viewcvs/\n" +" ¤È¤¤¦¤è¤ËÊѹ¤·¤Ê¯¤ÆÏ¤¤±¤Þ»¤óµ¤é¤Ë¢É½à¤ÎÆó¥×ì¥ÈÇÏ /" +"viewcvs/icons/* ¤Îè¤Ë·¤Æ¢¥¤¥³¥ó¤òÍøÍѹ¤ë¤ÎÇ¢¤³¤ÎÀßÄê¤âÉÍ×ǹ¡£" + + diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/nl.po viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/nl.po --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/po/nl.po 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/po/nl.po 2005-01-21 12:26:14.000000000 +0100 @@ -1,205 +1,135 @@ -# -# 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. -# +# +# 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: viewcvs 0.9.2+cvs.1.0.dev.2003.08.26-1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-24 15:48+0900\n" -"PO-Revision-Date: 2003-11-10 14:11+0100\n" +"PO-Revision-Date: 2005-01-06 10:27+0100\n" "Last-Translator: Tim Dijkstra <[EMAIL PROTECTED]>\n" "Language-Team: Debian Dutch <debian-l10n-dutch@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" +"X-Poedit-Country: NETHERLANDS\n" #. Type: string -#. Description #: ../templates:4 msgid "Where are your cvs roots?" -msgstr "Waar zijn uw cvs-wortels?" +msgstr "Waar zijn uw cvs-hoofdmappen?" #. Type: string -#. Description #: ../templates:4 -msgid "" -"This setting specifies each of the CVS roots on your system and assigns " -"names to them. Each root should be given by a \"name: path\" value. Multiple " -"roots should be separated by commas." -msgstr "" -"Deze instelling beschrijft alle CVS-wortels (cvs roots) op uw systeem en " -"geeft ze een naam. Elke wortel dient te worden opgeven als \"naam:pad\". " -"Verschillende wortels dienen te worden gescheiden door komma's." +msgid "This setting specifies each of the CVS roots on your system and assigns names to them. Each root should be given by a \"name: path\" value. Multiple roots should be separated by commas." +msgstr "Deze instelling beschrijft alle CVS-hoofdmappen (cvs roots) op uw systeem en geeft ze een naam. Elke hoofdmap dient te worden opgeven als \"naam:pad\". Verschillende hoofdmappen dienen te worden gescheiden door komma's." #. Type: string -#. Description #: ../templates:12 -#, fuzzy msgid "Where are your svn roots?" -msgstr "Waar zijn uw cvs-wortels?" +msgstr "Waar zijn uw svn-hoofdmappen?" #. Type: string -#. Description #: ../templates:12 -#, fuzzy -msgid "" -"This setting specifies each of the Subversion roots (repositories) on your " -"system and assigns names to them. Each root should be given by a \"name: path" -"\" value. Multiple roots should be separated by commas and can be placed on " -"separate lines." -msgstr "" -"Deze instelling beschrijft alle CVS-wortels (cvs roots) op uw systeem en " -"geeft ze een naam. Elke wortel dient te worden opgeven als \"naam:pad\". " -"Verschillende wortels dienen te worden gescheiden door komma's." +msgid "This setting specifies each of the Subversion roots (repositories) on your system and assigns names to them. Each root should be given by a \"name: path\" value. Multiple roots should be separated by commas and can be placed on separate lines." +msgstr "Deze instelling beschrijft alle Subversion-hoofdmappen (repositories) op uw systeem en geeft ze een naam. Elke hoofdmap dient te worden opgeven als \"naam:pad\". Verschillende hoofdmappen dienen te worden gescheiden door komma's en kunnen op verschillende regels replaatst worden." #. Type: string -#. Description #: ../templates:21 msgid "Where is your svn directory which has any number of repositories?" -msgstr "" +msgstr "Waar is uw svn-map met een ongespecificeerd aantal bewaarplaatsen?" #. Type: string -#. Description #: ../templates:21 -msgid "" -"The 'svn_parent_path' is a directory in which any number of Subversion " -"repositories may reside. Rather than force you to add a new entry to " -"'svn_roots' each time you create a new repository, ViewCVS rewards you for " -"putting all your Subversion repositories in a single parent directory by " -"allowing you to simply specifiy that parent directory. ViewCVS will then " -"notice each Subversion repository in that directory as a new root whose name " -"is the subdirectory of the parent path in which that repository lives." -msgstr "" +msgid "The 'svn_parent_path' is a directory in which any number of Subversion repositories may reside. Rather than force you to add a new entry to 'svn_roots' each time you create a new repository, ViewCVS rewards you for putting all your Subversion repositories in a single parent directory by allowing you to simply specifiy that parent directory. ViewCVS will then notice each Subversion repository in that directory as a new root whose name is the subdirectory of the parent path in which that repository lives." +msgstr "De 'svn_parent_path' is een map waarin zich elk aantal Subversion-bewaarplaatsen (repositories) kunnen bevinden. In plaats van u elke keer als u een nieuwe bewaarplaats aanmaakt te dwingen een nieuwe ingang toe te voegen aan 'svn_roots', beloont VieuwCVS u voor het feit dat u al uw bewaarplaatsen in één enkele map heeft geplaats door het mogelijk te maken alleen die enkele map op te geven. ViewCVS zal dan iedere Subversion-bewaarplaats opmerken als een nieuwe hoofdmap, met als naam die van de submap waarin de bewaarplaats zich bevindt." #. Type: string -#. Description #: ../templates:21 -msgid "" -"Caution: these names can, of course, clash with names you have defined in " -"your cvs_roots or svn_roots configuration items. If this occurs, you can " -"either rename the offending repository on disk, or grant new names to the " -"clashing item in cvs_roots or svn_roots." -msgstr "" +msgid "Caution: these names can, of course, clash with names you have defined in your cvs_roots or svn_roots configuration items. If this occurs, you can either rename the offending repository on disk, or grant new names to the clashing item in cvs_roots or svn_roots." +msgstr "Pas op: deze namen kunnen natuurlijk botsen met namen die u hebt gedefineerd in uw cvs_roots of svn_roots instellingen. Als dit voorkomt kunt u of de betreffende sub-mappen hernoemen of ingangen in cvs_roots of svn_roots een nieuwe naam geven." #. Type: select -#. Description #: ../templates:39 -#, fuzzy msgid "Which is default root?" -msgstr "Wat is de standaard cvs-wortel?" +msgstr "Wat is de standaard hoofdmap?" #. Type: select -#. Description #: ../templates:39 -#, fuzzy msgid "Default of CVS/SVN Root." -msgstr "Standaard van CVS wortel." +msgstr "Standaard CVS/SVN hoofdmap." #. Type: string -#. Default #: ../templates:44 msgid "<a href=\"mailto:[EMAIL PROTECTED]">CVS admin</a>" msgstr "<a href=\"mailto:[EMAIL PROTECTED]">CVS-beheerder</a>" #. Type: string -#. Description #: ../templates:45 msgid "Please enter CVS administorator address:" msgstr "Geef het adres van de CVS-beheerder:" #. Type: string -#. Description #: ../templates:45 -msgid "" -"This address is shown in the footer of the generated pages. It must be the " -"address of the local CVS maintainer. (e.g. <a href=\"mailto:[EMAIL PROTECTED]" -"\">cvsadmin</a>)" -msgstr "" -"Dit adres is te zien onderaan de gegenereerde pagina's. Het dient het adres " -"te zijn van de lokale CVS-beheerder. (bv: <a href=\"mailto:[EMAIL PROTECTED]">CVS-" -"beheerder</a>)" +msgid "This address is shown in the footer of the generated pages. It must be the address of the local CVS maintainer. (e.g. <a href=\"mailto:[EMAIL PROTECTED]">cvsadmin</a>)" +msgstr "Dit adres is te zien onderaan de gegenereerde pagina's. Het dient het adres te zijn van de lokale CVS-beheerder. (bv: <a href=\"mailto:[EMAIL PROTECTED]">CVS-beheerder</a>)" #. Type: string -#. Description #: ../templates:52 msgid "Do you have access forbidden modules?" msgstr "Heeft u modules waarvan de toegang verboden is?" #. Type: string -#. Description #: ../templates:52 msgid "" -"This should contain a list of modules in the repository that should not be " -"displayed (by default or by explicit path specification). This configuration " -"can be a simple list of modules, or it can get quite complex:\n" +"This should contain a list of modules in the repository that should not be displayed (by default or by explicit path specification). This configuration can be a simple list of modules, or it can get quite complex:\n" " *) The \"!\" can be used before a module to explicitly state that it is\n" "NOT forbidden.\n" " *) Shell-style \"glob\" expressions may be used. \"*\" will match any\n" -"sequence of zero or more characters, \"?\" will match any single character, " -"\"[seq]\" will match any character in seq, and \"[!seq]\" will match any " -"character not in seq." +"sequence of zero or more characters, \"?\" will match any single character, \"[seq]\" will match any character in seq, and \"[!seq]\" will match any character not in seq." msgstr "" -"Dit dient een lijst van modules te bevatten die niet mogen worden " -"weergegeven (zowel standaard als door middel van een expliciet opgegeven " -"pad). De instelling kan een simpele lijst van modules zijn of het kan " -"behoorlijk ingewikkeld worden;\n" +"Dit dient een lijst van modules te bevatten die niet mogen worden weergegeven (zowel standaard als door middel van een expliciet opgegeven pad). De instelling kan een simpele lijst van modules zijn of het kan behoorlijk ingewikkeld worden;\n" " *) Het \"!\" kan voor een module geplaatst worden om aan te geven dat\n" " de module expliciet NIET verboden is;\n" " *) Shell-achtige \"glob\" expressies mogen worden gebruikt. \"*\" komt\n" " overeen met een serie van nul of meer karakters, \"?\" met een enkel\n" -" karakter, \"[seq]\" met één van de karakters in seq en \"[!seq]\" met " -"één\n" +" karakter, \"[seq]\" met één van de karakters in seq en \"[!seq]\" met één\n" " van de karakters níet in seq." #. Type: boolean -#. Description #: ../templates:67 msgid "Do you allow tarball generation?" msgstr "Staat u het genereren van tar-ballen toe?" #. Type: boolean -#. Description #: ../templates:67 -msgid "" -"ViewCVS can generate a tarball from a repository on the fly. This option " -"allows to download a tarball of the current directory." -msgstr "" -"ViewCVS kan op aanvraag van een CVS-bewaarplaats een tar-bal maken. Deze " -"optie maakt het mogelijk om een tar-bal van de huidige map op te halen." +msgid "ViewCVS can generate a tarball from a repository on the fly. This option allows to download a tarball of the current directory." +msgstr "ViewCVS kan op aanvraag van een CVS-bewaarplaats een tar-bal maken. Deze optie maakt het mogelijk om een tar-bal van de huidige map op te halen." #. Type: note -#. Description #: ../templates:73 msgid "You need modify httpd configuration for online documents and icons." -msgstr "" -"U dient de httpd-configuratie aan te passen voor documentatie en " -"pictogrammen." +msgstr "U dient de httpd-configuratie aan te passen voor documentatie en pictogrammen." #. Type: note -#. Description #: ../templates:73 msgid "" -"ViewCVS package has online documents and icons in /usr/share/viewcvs/ If you " -"want to use it, you should modify configuration file of httpd (/etc/apache/" -"httpd.conf or so) like,\n" +"ViewCVS package has online documents and icons in /usr/share/viewcvs/ If you want to use it, you should modify configuration file of httpd (/etc/apache/httpd.conf or so) like,\n" " Alias /viewcvs/ /usr/share/viewcvs/\n" -"In addition, default templates use icons as /viewcvs/icons/*, so this " -"configuration is required." +"In addition, default templates use icons as /viewcvs/icons/*, so this configuration is required." msgstr "" -"Het ViewCVS-pakket heeft documentatie en pictogrammen in /usr/share/" -"viewcvs/. Als u die beschikbaar wilt maken vanaf viewcvs dient u aan het " -"configuratiebestand van uw httpd (/etc/apache/httpd.conf of iets dergelijks) " -"de volgende regel toe te voegen:\n" +"Het ViewCVS-pakket heeft documentatie en pictogrammen in /usr/share/viewcvs/. Als u die beschikbaar wilt maken vanaf viewcvs dient u aan het configuratiebestand van uw httpd (/etc/apache/httpd.conf of iets dergelijks) de volgende regel toe te voegen:\n" " Alias /viewcvs/ /usr/share/viewcvs/\n" -"Bovendien verwijzen de standaard sjablonen naar de pictogrammen als /viewcvs/" -"icons/*; om dit te laten werken is bovenstaande configuratie nodig." +"Bovendien verwijzen de standaard sjablonen naar de pictogrammen als /viewcvs/icons/*; om dit te laten werken is bovenstaande configuratie nodig." + diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/postinst viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/postinst --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/postinst 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/postinst 2005-01-21 13:11:56.000000000 +0100 @@ -11,6 +11,12 @@ mkdir -p /etc/viewcvs/ cp /etc/viewcvs/viewcvs.conf.default /etc/viewcvs/viewcvs.conf fi + + if [ -n "`/usr/lib/viewcvs/viewcvs-config --all --section vhosts 2>/dev/null`" ]; then + echo not using debconf values since configuration file is too complex + exit 0 + fi + if [ "`md5sum /etc/viewcvs/viewcvs.conf`" != "`md5sum /etc/viewcvs/viewcvs.conf.default`" ]; then cp /etc/viewcvs/viewcvs.conf /etc/viewcvs/viewcvs.conf.dpkg-old fi @@ -38,9 +44,9 @@ db_get viewcvs/allow_tar if [ "$RET" = "false" ]; then - allow_tar="0" - else - allow_tar="1" + allow_tar="0" + else + allow_tar="1" fi if [ -x /usr/lib/viewcvs/viewcvs-config ]; then diff -Naur viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/viewcvs-config viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/viewcvs-config --- viewcvs-0.9.2+cvs.1.0.dev.2004.07.28.bak/debian/viewcvs-config 2005-01-21 11:16:43.000000000 +0100 +++ viewcvs-0.9.2+cvs.1.0.dev.2004.07.28/debian/viewcvs-config 2005-01-21 13:02:11.000000000 +0100 @@ -22,9 +22,10 @@ if __name__ == "__main__": argv = sys.argv getting = 0 + all = 0 section = "general" - opts, args = getopt.getopt(argv[1:], 'k:v:g:s:', - ['key=', 'value=', 'get=', 'section=']) + opts, args = getopt.getopt(argv[1:], 'k:v:g:s:a', + ['key=', 'value=', 'get=', 'section=', 'all']) for opt, val in opts: if opt in ('-k', '--key'): key = val @@ -35,12 +36,19 @@ value = val elif opt in ('-s', '--section'): section = val + elif opt in ('-a', '--all'): + getting = 1 + all = 1 if getting: parser = ConfigParser.ConfigParser() parser.read("/etc/viewcvs/viewcvs.conf") - if parser.has_option(section, value): - print parser.get(section, value) + if all: + for opt, val in parser.items(section): + print opt + '=' + val + else: + if parser.has_option(section, value): + print parser.get(section, value) sys.exit(0) try: