Hi,
Attached is the *real* diff for my dokuwiki 0.0.20060309-5.3 NMU. -- adn Mohammed Adnène Trojette
diff -u dokuwiki-0.0.20060309/debian/po/de.po dokuwiki-0.0.20060309/debian/po/de.po --- dokuwiki-0.0.20060309/debian/po/de.po +++ dokuwiki-0.0.20060309/debian/po/de.po @@ -1,4 +1,4 @@ -# translation of dokuwiki_0.0.20050922-4_de.po to German +# translation of dokuwiki_0.0.20050922-5_de.po to German # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -9,51 +9,48 @@ # /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. -# Erik Schanze <[EMAIL PROTECTED]>, 2006. # +# Erik Schanze <[EMAIL PROTECTED]>, 2006. msgid "" msgstr "" -"Project-Id-Version: dokuwiki_0.0.20050922-4_de\n" +"Project-Id-Version: dokuwiki_0.0.20050922-5_de\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" "POT-Creation-Date: 2006-10-02 14:32+0200\n" -"PO-Revision-Date: 2006-01-08 22:25+0100\n" -"Last-Translator: Erik Schanze <[EMAIL PROTECTED]>\n" -"Language-Team: German <[EMAIL PROTECTED]>\n" +"PO-Revision-Date: 2006-11-04 15:26+0100\n" +"Last-Translator: Erik Schanze <[EMAIL PROTECTED]>\n" +"Language-Team: German <[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.10.2\n" +"X-Generator: KBabel 1.11.4\n" #. Type: string #. Description #: ../templates:1001 msgid "Wiki location:" -msgstr "" +msgstr "Wiki-Speicherort:" #. Type: string #. Description #: ../templates:1001 -#, fuzzy msgid "" "DokuWiki will be accessible through a directory of your website. By default, " "this is http://yourserver/dokuwiki, but you can change it to be anything " "within your server. Enter just the directory portion below." msgstr "" -"Dieses Verzeichnis Ihrer Web-Seite wird als Zugang zu DokuWiki benutzt. " +"Als Zugang zu DokuWiki wird ein Verzeichnis Ihrer Web-Seite benutzt. " "Standardmäßig ist das http://IhrServer/dokuwiki, aber Sie können das für " "Ihren Server anpassen. Geben Sie hier nur das Verzeichnis ein." #. Type: select #. Description #: ../templates:2001 -#, fuzzy msgid "Authorized network:" -msgstr "Lokales Netzwerk" +msgstr "Zugelassenes Netzwerk:" #. Type: select #. Description #: ../templates:2001 -#, fuzzy msgid "" "A Wiki is normally used to provide unlimited access to information, which " "can be freely modified by anyone. Since this is not always wanted, it is " @@ -61,9 +58,9 @@ "address." msgstr "" "Ein Wiki bietet normalerweise uneingeschränkten Zugang zu Informationen, die " -"völlig frei von jedem geändert werden können. Weil das manchmal nicht " -"gewünscht ist, kann der Zugang anhand der entfernten IP-Adresse " -"eingeschränkt werden." +"völlig frei von Jedem geändert werden können. Weil das manchmal nicht " +"gewünscht ist, kann der Zugang zur Web-Seite anhand der entfernten IP-" +"Adresse eingeschränkt werden." #. Type: select #. Description @@ -78,7 +75,7 @@ "Wenn Sie 'nur lokaler Rechner' wählen, können sich nur Benutzer verbinden, " "die direkt an dem Rechner arbeiten, auf dem das Wiki läuft. 'Lokales " "Netzwerk' erlaubt es, von den Rechnern des lokalen Netzwerks (das Sie " -"angeben müssen) mit dem Wiki zu arbeiten. 'global' bedeutet, dass sich jeder " +"angeben müssen) mit dem Wiki zu arbeiten. 'Alle' bedeutet, dass sich jeder " "von überall mit dem Wiki verbinden kann." #. Type: select @@ -98,39 +95,35 @@ #. Choices #: ../templates:2002 msgid "localhost only" -msgstr "" +msgstr "nur lokaler Rechner" #. Type: select #. Choices #: ../templates:2002 -#, fuzzy msgid "local network" -msgstr "Lokales Netzwerk" +msgstr "lokales Netzwerk" #. Type: select #. Choices #: ../templates:2002 msgid "global" -msgstr "" +msgstr "alle" #. Type: string #. Description #: ../templates:3001 -#, fuzzy msgid "Local network:" -msgstr "Lokales Netzwerk" +msgstr "Lokales Netzwerk:" #. Type: string #. Description #: ../templates:3001 -#, fuzzy msgid "" "The specification of your local network should either be an IP network in " "CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)." msgstr "" -"Wie wird Ihr lokales Netzwerk beschrieben? Die Angabe sollte eine IP-" -"Netzwerkadresse im CIDR-Format (x.x.x.x/y) oder ein Domänen-Name (wie " -"meinedomäne.de) sein." +"Die Angabe Ihres lokalen Netzwerks sollte eine IP-Netzwerkadresse im CIDR-" +"Format (x.x.x.x/y) oder ein Domänenname (wie meinedomäne.de) sein." #. Type: string #. Description @@ -145,21 +138,18 @@ #. Type: boolean #. Description #: ../templates:4001 -#, fuzzy msgid "Purge pages on package removal?" -msgstr "Seiten beim Löschen des Pakets entfernen?" +msgstr "Seiten beim Löschen des Pakets vollständig entfernen?" #. Type: boolean #. Description #: ../templates:4001 -#, fuzzy msgid "" "By default, DokuWiki stores all its pages in a file database in /var/lib/" "dokuwiki." msgstr "" "Standardmäßig speichert DokuWiki alle seine Seiten in einer Datei-Datenbank " -"im Verzeichnis /var/lib/dokuwiki. Sollen alle Datenbank-Dateien beim Löschen " -"des Pakets entfernt werden?" +"im Verzeichnis /var/lib/dokuwiki." #. Type: boolean #. Description @@ -177,7 +167,7 @@ #. Description #: ../templates:5001 msgid "Web servers:" -msgstr "" +msgstr "Web-Server:" #. Type: multiselect #. Description @@ -189,55 +179,26 @@ +"DokuWiki kann auf jedem der vorgegebenen Web-Server benutzt werden. Wählen " +"Sie die Server aus, auf welchen DokuWiki installiert werden soll." #. Type: multiselect #. Choices #: ../templates:5002 msgid "apache" -msgstr "" +msgstr "apache" #. Type: multiselect #. Choices #: ../templates:5002 msgid "apache2" -msgstr "" +msgstr "apache2" #. Type: multiselect #. Choices #: ../templates:5002 msgid "apache-ssl" -msgstr "" +msgstr "apache-ssl" #. Type: multiselect #. Choices #: ../templates:5002 msgid "apache-perl" -msgstr "" - -#~ msgid "Where should the web-accessible location of the DokuWiki be?" -#~ msgstr "Wo soll der Web-Zugang für DokuWiki angelegt werden?" - -#~ msgid "Who should be able to access your DokuWiki?" -#~ msgstr "Wer soll Zugang zu DokuWiki haben?" - -#~ msgid "localhost only, local network, global" -#~ msgstr "nur lokaler Rechner, lokales Netzwerk, global" - -#~ msgid "/dokuwiki" -#~ msgstr "/dokuwiki" - -#~ msgid "10.0.0.0/24" -#~ msgstr "10.0.0.0/24" - -#~ msgid "apache, apache2, apache-ssl, apache-perl" -#~ msgstr "apache, apache2, apache-ssl, apache-perl" - -#~ msgid "Which web servers do you want to install into?" -#~ msgstr "Auf welchen Web-Servern soll es installiert werden?" - -#~ msgid "" -#~ "DokuWiki can install into any of the given web servers. All those you " -#~ "specify will have a default config line added to them to install a " -#~ "standard DokuWiki with the defaults you specified earlier." -#~ msgstr "" -#~ "DokuWiki kann auf jedem der vorgegebenen Web-Server installiert werden. " -#~ "Bei den ausgewählten Web-Servern wird eine Zeile zu deren " -#~ "Konfigurationsdatei hinzugefügt, um ein Standard-DokuWiki mit den " -#~ "Einstellungen zu installieren, die Sie vorher eingegeben haben." +msgstr "apache-perl" diff -u dokuwiki-0.0.20060309/debian/dirs dokuwiki-0.0.20060309/debian/dirs --- dokuwiki-0.0.20060309/debian/dirs +++ dokuwiki-0.0.20060309/debian/dirs @@ -1,3 +1,3 @@ usr/share/dokuwiki -var/lib/dokuwiki +var/lib/dokuwiki/acl etc/dokuwiki diff -u dokuwiki-0.0.20060309/debian/control dokuwiki-0.0.20060309/debian/control --- dokuwiki-0.0.20060309/debian/control +++ dokuwiki-0.0.20060309/debian/control @@ -9,7 +9,7 @@ Package: dokuwiki Architecture: all Depends: apache | apache2 | apache-ssl | apache-perl | httpd-cgi, php4 | php5, debconf (>= 0.2.26) | debconf-2.0, ucf -Recommends: imagemagick | php4-gd | php5-gd +Recommends: imagemagick | php4-gd | php5-gd, php4-cli | php5-cli Description: a standards compliant simple to use wiki DokuWiki is a standards compliant, simple to use wiki, mainly aimed at creating documentation of any kind. It is targeted at developer diff -u dokuwiki-0.0.20060309/debian/rules dokuwiki-0.0.20060309/debian/rules --- dokuwiki-0.0.20060309/debian/rules +++ dokuwiki-0.0.20060309/debian/rules @@ -34,14 +34,8 @@ dh_installdirs dh_install - # Copy DokuWiki files to approppriate locations. - cp -r lib inc $(DESTDIR)/usr/share/dokuwiki - cp .htaccess $(DESTDIR)/usr/share/dokuwiki/ - cp *.php $(DESTDIR)/usr/share/dokuwiki/ chown -R root.root $(DESTDIR)/usr/share/dokuwiki chmod 755 $(DESTDIR)/usr/share/dokuwiki - cp -r data $(DESTDIR)/var/lib/dokuwiki - cp conf/* $(DESTDIR)/etc/dokuwiki/ # Allow www-data to write new pages. chown -R www-data.root $(DESTDIR)/var/lib/dokuwiki @@ -53,13 +47,11 @@ chmod 700 $(DESTDIR)/var/lib/dokuwiki/data/cache chmod 700 $(DESTDIR)/var/lib/dokuwiki/data/meta chmod 700 $(DESTDIR)/var/lib/dokuwiki/data/locks + chmod +x $(DESTDIR)/usr/share/dokuwiki/bin/*.php # Decode uuencoded Debian button uudecode -o $(DESTDIR)/usr/share/dokuwiki/lib/tpl/default/images/button-debian.png $(DESTDIR)/usr/share/dokuwiki/lib/tpl/default/images/button-debian.png.uue - # Set up access control system - mkdir $(DESTDIR)/var/lib/dokuwiki/acl - # Build architecture-independent files here. binary-indep: build install dh_testdir diff -u dokuwiki-0.0.20060309/debian/changelog dokuwiki-0.0.20060309/debian/changelog --- dokuwiki-0.0.20060309/debian/changelog +++ dokuwiki-0.0.20060309/debian/changelog @@ -1,3 +1,17 @@ +dokuwiki (0.0.20060309-5.3) unstable; urgency=low + + * Non-maintainer upload. + * Use dh_install instead of copying: + + makes .htaccess a conffile. (Closes: #394083) + * Add bin/ directory to installation. (Closes: #378250) + + add php{4,5}-cli to Recommends. + * Debconf Translations updates: + + German, thanks to Erik Schanze. (Closes: #397030) + * New debconf Translations: + + Portuguese, thanks to Rui Branco. (Closes: #394210) + + -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Sun, 5 Nov 2006 20:27:16 +0100 + dokuwiki (0.0.20060309-5.2) unstable; urgency=high * Non-maintainer upload. diff -u dokuwiki-0.0.20060309/debian/install dokuwiki-0.0.20060309/debian/install --- dokuwiki-0.0.20060309/debian/install +++ dokuwiki-0.0.20060309/debian/install @@ -2,0 +3,7 @@ +lib /usr/share/dokuwiki +inc /usr/share/dokuwiki +bin /usr/share/dokuwiki +.htaccess /usr/share/dokuwiki/ +*.php /usr/share/dokuwiki/ +data /var/lib/dokuwiki +conf/* /etc/dokuwiki/ only in patch2: unchanged: --- dokuwiki-0.0.20060309.orig/debian/po/pt.po +++ dokuwiki-0.0.20060309/debian/po/pt.po @@ -0,0 +1,193 @@ +# Portuguese translation of dokuwiki debconf messages. +# This file is distributed under the same license as the dokuwiki package. +# Rui Branco <[EMAIL PROTECTED]>, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: dokuwiki 0.0.20060309-5.2\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2006-10-02 14:32+0200\n" +"PO-Revision-Date: 2006-10-19 22:55+0100\n" +"Last-Translator: Rui Branco <[EMAIL PROTECTED]>\n" +"Language-Team: Native Portuguese <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Wiki location:" +msgstr "Local do Wiki:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"DokuWiki will be accessible through a directory of your website. By default, " +"this is http://yourserver/dokuwiki, but you can change it to be anything " +"within your server. Enter just the directory portion below." +msgstr "" +"O DokuWiki será acessível através de um directório no seu website. Por " +"omissão, este é http://yourserver/dokuwiki, mas pode alterá-lo para outro " +"dentro do seu servidor web. Introduza abaixo apenas o nome do directório." + +#. Type: select +#. Description +#: ../templates:2001 +msgid "Authorized network:" +msgstr "Rede autorizada:" + +#. Type: select +#. Description +#: ../templates:2001 +msgid "" +"A Wiki is normally used to provide unlimited access to information, which " +"can be freely modified by anyone. Since this is not always wanted, it is " +"possible to restrict access to the site on the basis of the originating IP " +"address." +msgstr "" +"Um Wiki é normalmente utilizado para fornecer acesso ilimitado a informação, " +"e que pode ser modificada de um modo livre por qualquer um. Como por vezes " +"isto não é desejável, é possível restringir o acesso ao site tendo como " +"base o endereço IP de origem." + +#. Type: select +#. Description +#: ../templates:2001 +msgid "" +"If you select 'localhost only', only people on the localhost (the machine " +"the Wiki is running on) will be able to connect. 'local network' will allow " +"people on machines in a local network (which you will need to specify) to " +"talk to the Wiki. 'global' will allow anyone, any where, to connect to the " +"Wiki." +msgstr "" +"Se seleccionar 'apenas máquina local', apenas pessoas a trabalhar na máquina " +"local (a máquina em que o Wiki está a correr) se poderão ligar. A opção " +"'rede local ' permitirá pessoas em máquinas da rede local (que terá de " +"especificar) comunicar com o Wiki. A opção 'global' permitirá toda a gente, " +"em qualquer local, ligar-se ao Wiki." + +#. Type: select +#. Description +#: ../templates:2001 +msgid "" +"For security, this is set to 'localhost only' by default. Unless you have a " +"particular need for privacy on your Wiki, you should be able to allow access " +"globally without compromising site security." +msgstr "" +"Por razões de segurança, esta opção está definida para 'máquina local' por " +"omissão. A não ser que tenha uma necessidade especial de segurança para o " +"Wiki, deverá permitir o acesso global sem comprometer a segurança do site." + +#. Type: select +#. Choices +#: ../templates:2002 +msgid "localhost only" +msgstr "apenas localhost" + +#. Type: select +#. Choices +#: ../templates:2002 +msgid "local network" +msgstr "rede local" + +#. Type: select +#. Choices +#: ../templates:2002 +msgid "global" +msgstr "global" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Local network:" +msgstr "Rede local:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"The specification of your local network should either be an IP network in " +"CIDR format (x.x.x.x/y) or a domain specification (like .mydomain.com)." +msgstr "" +"A especificação da sua rede local deverá ser ou uma rede de IP no formato " +"CIDR (x.x.x.x/y) ou uma especificação de domínio (tal como .meudomínio.com)." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"Anyone who matches the specification given below will be given full and " +"complete access to the DokuWiki." +msgstr "" +"Qualquer pessoa que reuna as condições das especificações atrás enumeradas " +"terá acesso total e completo ao DokuWiki." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "Purge pages on package removal?" +msgstr "Eliminar páginas na remoção de pacotes?" + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"By default, DokuWiki stores all its pages in a file database in /var/lib/" +"dokuwiki." +msgstr "" +"Por omissão, o DokuWiki armazena todas as suas páginas numa base de dados de " +"ficheiros em /var/lib/dokuwiki." + +#. Type: boolean +#. Description +#: ../templates:4001 +msgid "" +"Accepting this option will leave you with a tidier system when the DokuWiki " +"package is removed, but may cause information loss if you have an " +"operational Wiki that gets removed." +msgstr "" +"Ao aceitar esta opção ficará com um sistema mais leve (pequeno) quando o " +"pacote do DokuWiki for removido, mas pode causar perda de informação se " +"possuir um Wiki funcional que seja removido." + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "Web servers:" +msgstr "Servidores Web:" + +#. Type: multiselect +#. Description +#: ../templates:5001 +msgid "" +"DokuWiki can be used with any of the given web servers. Select the servers " +"which you would like DokuWiki to be installed into." +msgstr "" +"O DokuWiki pode ser utilizado com qualquer dos seguintes servidores web. " +"Seleccione os servidores para onde deseja instalar o DokuWiki." + +#. Type: multiselect +#. Choices +#: ../templates:5002 +msgid "apache" +msgstr "apache" + +#. Type: multiselect +#. Choices +#: ../templates:5002 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../templates:5002 +msgid "apache-ssl" +msgstr "apache-ssl" + +#. Type: multiselect +#. Choices +#: ../templates:5002 +msgid "apache-perl" +msgstr "apache-perl"
