Merge lp:~noskcaj/ubuntu/vivid/dhelp/merge into lp:ubuntu/vivid/dhelp

[Jackson Doak]

Merge from debian. Makes package work again

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

27. By Jackson Doak on 2015-01-05

Merge from Debian unstable. (LP: #1283061) Remaining changes:

26. By Jackson Doak on 2015-01-05

* Merge from Debian unstable. Remaining changes:
  - lib/dhelp.rb: Exit and return zero code if bdb isn't available; this
    usually indicates that dhelp is not configured yet.
* Non-maintainer upload.
* Fix "Fails to build the index when invalid UTF-8 is met":
  apply patch from Daniel Getz:
  + Load files as UTF-8, regardless of $LANG
  (Closes: #768127)
* Non-maintainer upload.
* Update French program translation (Closes: #684664)
* Update Russian program translation (Closes: #688667)
* Update German program translation (Closes: #689063)
* Add Danish program translation (Closes: #689644)
* Add Italian program translation (Closes: #689920)
* Add Portugese program translation (Closes: #724781)
* Non-maintainer upload.
* Add support for newer ruby versions (Closes: #734523, #732916)
* Cache 'Dpkg.status' calls to not affect performance on every system
    upgrade (Closes: #712621)
* Handle correctly arguments passed to '-a' and '-d' options
* Fix error when 'dhelp_parse' is called without arguments
* Fix Ruby warnings
* Change the encoding of Ruby files to UTF-8

=== modified file 'Makefile'
--- Makefile	2013-09-28 17:00:01 +0000
+++ Makefile	2015-01-05 07:33:40 +0000
@@ -33,13 +33,17 @@
 docdir   = $(DESTDIR_)/share/doc/$(PACKAGE)
 
 # The caller should define VENDOR_RUBY to use the new location for ruby
-# libraries from wheezy and onwards. Undefine it to backport the package
-# to previous Debian releases.
+# libraries from squeeze and onwards; OLD_VENDOR_RUBY for wheezy and onwards.
+# Undefine it to backport the package to previous Debian releases.
 
 ifdef VENDOR_RUBY
+rubydir = $(DESTDIR_)/lib/ruby/vendor_ruby/
+else
+  ifdef OLD_VENDOR_RUBY
 rubydir = $(DESTDIR_)/lib/ruby/vendor_ruby/1.8
-else
+  else
 rubydir = $(DESTDIR_)/lib/ruby/1.8
+  endif
 endif
 
 # Templates and Perl-related variables 

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-28 17:00:01 +0000
+++ debian/changelog	2015-01-05 07:33:40 +0000
@@ -1,3 +1,46 @@
+dhelp (0.6.21+nmu6ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. (LP: #1283061) Remaining changes:
+    - lib/dhelp.rb: Exit and return zero code if bdb isn't available; this
+      usually indicates that dhelp is not configured yet.
+
+ -- Jackson Doak <[e-mail]>  Mon, 05 Jan 2015 18:13:27 +1100
+
+dhelp (0.6.21+nmu6) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Fails to build the index when invalid UTF-8 is met":
+    apply patch from Daniel Getz:
+    + Load files as UTF-8, regardless of $LANG
+    (Closes: #768127)
+
+ -- gregor herrmann <[e-mail]>  Fri, 12 Dec 2014 22:02:20 +0100
+
+dhelp (0.6.21+nmu5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update French program translation (Closes: #684664)
+  * Update Russian program translation (Closes: #688667)
+  * Update German program translation (Closes: #689063)
+  * Add Danish program translation (Closes: #689644)
+  * Add Italian program translation (Closes: #689920)
+  * Add Portugese program translation (Closes: #724781) 
+
+ -- Helge Kreutzmann <[e-mail]>  Thu, 02 Oct 2014 12:38:19 +0200
+
+dhelp (0.6.21+nmu4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add support for newer ruby versions (Closes: #734523, #732916)
+  * Cache 'Dpkg.status' calls to not affect performance on every system
+      upgrade (Closes: #712621)
+  * Handle correctly arguments passed to '-a' and '-d' options
+  * Fix error when 'dhelp_parse' is called without arguments
+  * Fix Ruby warnings
+  * Change the encoding of Ruby files to UTF-8
+
+ -- David Suárez <[e-mail]>  Sun, 18 May 2014 13:18:39 +0200
+
 dhelp (0.6.21+nmu3ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable. (LP: #1208523) Remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-05-19 21:41:22 +0000
+++ debian/control	2015-01-05 07:33:40 +0000
@@ -11,9 +11,10 @@
 
 Package: dhelp
 Depends: perl-modules, libtemplate-perl, libhtml-parser-perl,
- liburi-perl, liblocale-gettext-perl, libdata-page-perl, ruby1.8,
- ruby-bdb | libdb-ruby1.8, ruby-debian, ruby-gettext, doc-base,
- swish++, pstotext, poppler-utils, ucf (>= 0.8), ${misc:Depends}
+ liburi-perl, liblocale-gettext-perl, libdata-page-perl,
+ ruby | ruby-interpreter, ruby-bdb, ruby-debian, ruby-gettext,
+ doc-base, swish++, pstotext, poppler-utils, ucf (>= 0.8),
+ ${misc:Depends}
 Recommends: www-browser | html2text
 Suggests: httpd-cgi, info2www, man2html, catdvi
 Architecture: all

=== added file 'debian/stamp-makefile-check'
=== modified file 'examples/index_package_doc.rb'
--- examples/index_package_doc.rb	2008-10-20 22:31:06 +0000
+++ examples/index_package_doc.rb	2015-01-05 07:33:40 +0000
@@ -37,10 +37,10 @@
 # If the index doesn't exist, we have to force non-incremental indexing
 options = {}
 index_file = '/var/lib/dhelp/documents.index'
-if File.exists? index_file and File.size(index_file) == 0
+if File.exist? index_file and File.size(index_file) == 0
     FileUtils.rm_f index_file
 end
-unless File.exists? index_file
+unless File.exist? index_file
   options[:incremental] = false
 end
 

=== modified file 'lib/dhelp.rb'
--- lib/dhelp.rb	2012-10-25 15:29:52 +0000
+++ lib/dhelp.rb	2015-01-05 07:33:40 +0000
@@ -1,7 +1,7 @@
 =begin
     Ruby support library for dhelp database access
 
-    Copyright (C) 2005  Esteban Manchado Velázquez
+    Copyright (C) 2005  Esteban Manchado Velázquez
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -549,7 +549,7 @@
 
     # Returns the pending-documents-list-for-indexing contents as an array
     def read_pending_file
-      # Don't use File.exists? to avoid races; use exceptions instead
+      # Don't use File.exist? to avoid races; use exceptions instead
       begin
         IO.readlines(pending_file)
       rescue Errno::ENOENT
@@ -577,7 +577,7 @@
     # Returns true if already indexing
     def is_indexing?
       i_file = (incremental ? "#{index_file}.new" : index_file)
-      File.exists?(i_file) and File.size(i_file) == 0
+      File.exist?(i_file) and File.size(i_file) == 0
     end
 
     # Index the list of given dirs/files with index++. Directories are indexed
@@ -593,7 +593,7 @@
       # If the index doesn't exist yet and we're doing incremental,
       # switch to non-incremental mode and create it.  That way we will
       # have at least a partial index until the next rebuild cron job.
-      if incremental and not File.exists?(index_file)
+      if incremental and not File.exist?(index_file)
         @opts[:incremental] = false
         cmd = "#{indexpp_cmd} #{indexpp_options} -"
       end

=== modified file 'lib/dhelp/exporter/cgimap.rb'
--- lib/dhelp/exporter/cgimap.rb	2012-06-12 21:50:00 +0000
+++ lib/dhelp/exporter/cgimap.rb	2015-01-05 07:33:40 +0000
@@ -62,9 +62,14 @@
       }
     end
 
+    @@pkgs_status = {}
+    
     # Return true if the package associated to this item is installed.
     def installed?(item)
-      return package_status(item) == "installed"
+      return @@pkgs_status[item] if @@pkgs_status[item] != nil
+      
+      @@pkgs_status[item] = package_status(item) == "installed"
+      return @@pkgs_status[item]
     end
 
   end   # class BaseMap
@@ -93,7 +98,7 @@
         # From debian wheezy's man2html and onwards
         # the script is inside a 'man' subdirectory.
 
-        if File.exists?("/usr/lib/cgi-bin/man/man2html")
+        if File.exist?("/usr/lib/cgi-bin/man/man2html")
           return "<a href=\"/cgi-bin/man/man2html\">" + _(MAN2HTML) + "</a>"
         else
           return "<a href=\"/cgi-bin/man2html\">" + _(MAN2HTML) + "</a>"

=== modified file 'lib/dhelp/exporter/html.rb'
--- lib/dhelp/exporter/html.rb	2012-10-25 15:29:52 +0000
+++ lib/dhelp/exporter/html.rb	2015-01-05 07:33:40 +0000
@@ -33,7 +33,7 @@
 Don't put files in this directory!
 dhelp will delete *all* files in this directory when creating a new index.
 
-Esteban Manchado Velázquez ([e-mail])
+Esteban Manchado Velázquez ([e-mail])
 EOREADME
       end
     end
@@ -81,7 +81,7 @@
 
       make_page(index_template, export_dir, "index.html")
 
-    rescue Errno::EACCES => e
+    rescue Errno::EACCES # => e
       $stderr.puts "Don't have permissions to regenerate the HTML help"
       exit 1
     end

=== added file 'po/da.po'
--- po/da.po	1970-01-01 00:00:00 +0000
+++ po/da.po	2015-01-05 07:33:40 +0000
@@ -0,0 +1,150 @@
+# Translation of dhelp to Danish.
+# Copyright (C) 2012 dhelp og nedenstående oversættere.
+# This file is distributed under the same license as the dhelp package.
+# Joe Hansen <[e-mail]>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dhelp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-19 23:02+0100\n"
+"PO-Revision-Date: 2012-10-03 21:27+0200\n"
+"Last-Translator: Joe Hansen <[e-mail]>\n"
+"Language-Team: Danish <[e-mail]>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: index.rhtml:8
+msgid "Debian Online Help"
+msgstr "Hjælp til Debian på nettet"
+
+#: fetcher_error.rhtml:8 search_error.tmpl:8
+msgid "Debian Online Help (Error)"
+msgstr "Hjælp til Debian på nettet (fejl)"
+
+#: fetcher_error.rhtml:14 index.rhtml:14 section.rhtml:21 search_error.tmpl:15
+#: search_results.tmpl:15
+msgid "Online Help"
+msgstr "Hjælp på nettet"
+
+#: cgimap.rb:35 search_error.tmpl:19 search_results.tmpl:19
+msgid "info pages"
+msgstr "informationssider"
+
+#: cgimap.rb:36 search_error.tmpl:20 search_results.tmpl:20
+msgid "man pages"
+msgstr "manualsider"
+
+#: fetcher_error.rhtml:19 index.rhtml:19 section.rhtml:26 search_error.tmpl:23
+#: search_results.tmpl:23
+msgid "documentation folder"
+msgstr "dokumentationsmappe"
+
+#: fetcher_error.rhtml:24 index.rhtml:24 section.rhtml:31
+msgid "Search"
+msgstr "Søg"
+
+#: index.rhtml:31
+msgid "Documentation Index"
+msgstr "Dokumentationsindeks"
+
+#: index.rhtml:53
+msgid "See all sections in one page"
+msgstr "Se alle afsnit på en side"
+
+#: search_error.tmpl:34
+msgid "Error"
+msgstr "Fejl"
+
+#: search_pagination.tmpl:6
+msgid "Pages"
+msgstr "Sider"
+
+#: search_pagination.tmpl:11 search_pagination.tmpl:13
+msgid "Previous"
+msgstr "Forrige"
+
+#: search_pagination.tmpl:31 search_pagination.tmpl:33
+msgid "Next"
+msgstr "Næste"
+
+#: search_results.tmpl:34
+msgid "Search results for"
+msgstr "Søgeresultater for"
+
+#: dsearch:240
+msgid ""
+"No search database found.\n"
+"Please run /etc/cron.weekly/dhelp as superuser to create it."
+msgstr ""
+"Ingen søgedatabase blev fundet.\n"
+"Kør venligst /etc/cron.weekly/dhelp som superbruger for at oprette den."
+
+#: dsearch:250
+msgid "Please specify a search term."
+msgstr "Angiv en søgestreng."
+
+#: dsearch:283
+#, perl-format
+msgid ""
+"No results (ignored words: %s). Search terms must be at least 4 characters "
+"long, and must not be \"stop words\". The command \"<tt>index++ -S</tt>\" "
+"gives the stop word list."
+msgstr ""
+"Ingen resultater (ignorerede ord: %s). Søgestrenge skal være på mindst "
+"4 tegn og må ikke være »stop-ord«. Kommandoen »<tt>index++ -S</tt>« "
+"viser listen over stopord."
+
+#: dsearch:285
+msgid "No results."
+msgstr "Ingen resultater."
+
+#: dsearch:323
+#, perl-format
+msgid "Showing only %s out of %s results in offline mode."
+msgstr "Viser kun %s ud af %s resultater i frakoblet tilstand."
+
+#: index.rhtml:46
+msgid "Install package man2html to browse man pages."
+msgstr "Installer pakken man2html for at kigge i manualsider."
+
+#: index.rhtml:51
+msgid "Install package info2www to browse info pages."
+msgstr "Installer pakken info2www for at kigge i informationssider."
+
+#: index.rhtml:61
+msgid ""
+"Welcome to Debian Online Help. Pick a section from the list to browse the "
+"Debian documentation that is installed on the system. Alternatively, you may "
+"want to <a href=\"All/index.html\">see all sections in one page</a>."
+msgstr ""
+"Velkommen til Hjælp til Debian på nettet. Vælg et afsnit fra listen for "
+"at kigge i Debians dokumentation installeret på systemet. Alternativt kan "
+"du <a href=\"All/index.html\">se alle afsnit på en side</a>."
+
+#: index.rhtml:67
+msgid ""
+"If you are using Debian Online Help with a web server, you may have to do a "
+"few actions by hand in order to finish dhelp configuration. Instructions are "
+"given in"
+msgstr ""
+"Hvis du bruger Hjælp til Debian på nettet med en internetserver, så skal "
+"du måske udføre nogle få handlinger manuelt for at afslutte dhelp-konfigurationen. "
+"Instruktioner er angivet i"
+
+#: index.rhtml:74
+msgid ""
+"Debian Online Help can use the features of other packages to supply "
+"additional information (such as man and info pages), but does not enforce "
+"you to co-install them. Thus some items may be <em>disabled</em>. When the "
+"associated helper package is installed, the disabled items will become "
+"enabled as soon as the index is rebuilt."
+msgstr ""
+"Hjælp til Debian på nettet kan bruge funktionerne fra andre pakker til "
+"at angive yderligere information (såsom manual- og informationssider), "
+"men tvinger dig ikke til at installere dem. Derfor kan nogle punkter være "
+"<em>deaktiveret</em>. Når den associerede hjælpepakke er installeret "
+"vil de deaktiverede punkter bliver aktiveret så snart indekset bygges "
+"igen."

=== modified file 'po/de.po'
--- po/de.po	2012-10-25 15:29:52 +0000
+++ po/de.po	2015-01-05 07:33:40 +0000
@@ -2,15 +2,15 @@
 # Copyright (C) 2008 Helge Kreutzmann <[e-mail]>
 # This file is distributed under the same license as the dhelp package.
 # Helge Kreutzmann <[e-mail]>, 2008
-# Georgios M. Zarkadas <[e-mail]>, 2012
+# Holger Wansing <[e-mail]>, 2012
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dhelp-0.6.21\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: dhelp 0.6.22\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-05-28 06:13+0200\n"
-"PO-Revision-Date: 2012-05-28 07:28+0200\n"
-"Last-Translator: Georgios M. Zarkadas <[e-mail]>\n"
+"PO-Revision-Date: 2012-09-28 19:26+0200\n"
+"Last-Translator: Holger Wansing <[e-mail]>\n"
 "Language-Team: de <[e-mail]>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@
 
 #: cgimap.rb:35 search_error.tmpl:19 search_results.tmpl:19
 msgid "info pages"
-msgstr "Info-Seiten"
+msgstr "Infoseiten"
 
 #: cgimap.rb:36 search_error.tmpl:20 search_results.tmpl:20
 msgid "man pages"
@@ -81,11 +81,11 @@
 "Please run /etc/cron.weekly/dhelp as superuser to create it."
 msgstr ""
 "Keine Suchdatenbank gefunden.\n"
-"Bitte führen Sie als Root /etc/cron.weekly/dhelp zur Erstellung aus."
+"Bitte führen Sie als Root /etc/cron.weekly/dhelp für deren Erstellung aus."
 
 #: dsearch:250
 msgid "Please specify a search term."
-msgstr "Bitte geben Sie einen Suchausdruck an."
+msgstr "Bitte geben Sie einen Suchbegriff an."
 
 #: dsearch:283
 #, perl-format
@@ -94,8 +94,8 @@
 "long, and must not be \"stop words\". The command \"<tt>index++ -S</tt>\" "
 "gives the stop word list."
 msgstr ""
-"Keine Ergebnisse (ignorierte Wörter: %s). Suchausdrücke müssen mindestens "
-"vier Zeichen lang sein und dürfen kein »Stoppwörter« enthalten. Der Befehl "
+"Keine Ergebnisse (ignorierte Wörter: %s). Suchbegriffe müssen mindestens "
+"vier Zeichen lang sein und dürfen keine »Stoppwörter« enthalten. Der Befehl "
 "»<tt>index++ -S</tt>« liefert die Liste der Stoppwörter."
 
 #: dsearch:285
@@ -109,11 +109,12 @@
 
 #: index.rhtml:46
 msgid "Install package man2html to browse man pages."
-msgstr "Installieren Sie das man2html Paket zu blättern Handbuchseiten."
+msgstr ""
+"Installieren Sie das Paket man2html, um durch die Handbuchseiten zu blättern."
 
 #: index.rhtml:51
 msgid "Install package info2www to browse info pages."
-msgstr "Installieren Sie das info2www Paket zu blättern Info-Seiten."
+msgstr "Installieren Sie das Paket info2www, um durch die Infoseiten zu blättern."
 
 #: index.rhtml:61
 msgid ""
@@ -121,6 +122,10 @@
 "Debian documentation that is installed on the system. Alternatively, you may "
 "want to <a href=\"All/index.html\">see all sections in one page</a>."
 msgstr ""
+"Willkommen zur Debian Online-Hilfe. Wählen Sie einen Abschnitt aus der "
+"Liste, um durch die Debian-Dokumentation zu blättern, die auf Ihrem System "
+"installiert ist. Alternativ möchten Sie vielleicht "
+"<a href=\"All/index.html\">alle Abschnitte auf einer Seite sehen</a>."
 
 #: index.rhtml:67
 msgid ""
@@ -128,6 +133,9 @@
 "few actions by hand in order to finish dhelp configuration. Instructions are "
 "given in"
 msgstr ""
+"Wenn Sie die Debian Online-Hilfe mit einem Web-Server verwenden, müssen Sie "
+"unter Umständen einige Aktionen von Hand durchführen, um die "
+"dhelp-Konfiguration zu vervollständigen. Instruktionen finden Sie in"
 
 #: index.rhtml:74
 msgid ""
@@ -137,3 +145,9 @@
 "associated helper package is installed, the disabled items will become "
 "enabled as soon as the index is rebuilt."
 msgstr ""
+"Die Debian Online-Hilfe kann Funktionalitäten anderer Pakete verwenden, "
+"um zusätzliche Informationen (wie Handbuch- und Infoseiten) bereitzustellen, "
+"zwingt Sie aber nicht, diese Pakete mit zu installieren. Daher könnten "
+"einige Einträge <em>deaktiviert</em> sein. Wenn das zugehörige Hilfspaket "
+"installiert ist, werden die deaktivierten Einträge aktiv werden, sobald "
+"der Index neu erstellt wird."

=== modified file 'po/fr.po'
--- po/fr.po	2012-10-25 15:29:52 +0000
+++ po/fr.po	2015-01-05 07:33:40 +0000
@@ -1,16 +1,15 @@
 # French translation of dhelp messages.
-# Copyright (C) 2008 Steve Petruzzello <[e-mail]>
+# Copyright (C) 2008, 2012 French l10n team <[e-mail]>
 # This file is distributed under the same license as the dhelp package.
-# Steve Petruzzello <[e-mail]>, 2008
-# Georgios M. Zarkadas <[e-mail]>, 2012
+# Steve Petruzzello <[e-mail]>, 2008, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dhelp-0.6.21\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-05-28 06:13+0200\n"
-"PO-Revision-Date: 2012-05-28 07:16+0200\n"
-"Last-Translator: Georgios M. Zarkadas <[e-mail]>\n"
+"PO-Revision-Date: 2012-07-29 10:50+0200\n"
+"Last-Translator: Steve Petruzzello <[e-mail]>\n"
 "Language-Team:  French <[e-mail]>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +79,7 @@
 "No search database found.\n"
 "Please run /etc/cron.weekly/dhelp as superuser to create it."
 msgstr ""
-"Base de données de recherche non trouvée\n"
+"Base de données de recherche non trouvée.\n"
 "Veuillez exécuter /etc/cron.weekly/dhelp en tant que superutilisateur afin "
 "de la créer."
 
@@ -96,8 +95,8 @@
 "gives the stop word list."
 msgstr ""
 "Aucun résultat (mots ignorés : %s). Les termes de recherches doivent être au "
-"minimum de quatre caractères de long et ne doivent pas être des stop words. "
-"La commande <tt>index++ -S</tt> affiche la liste de ces mots."
+"minimum de quatre caractères de long et ne doivent pas être des « stop "
+"words ». La commande <tt>index++ -S</tt> affiche la liste de ces mots."
 
 #: dsearch:285
 msgid "No results."
@@ -122,6 +121,10 @@
 "Debian documentation that is installed on the system. Alternatively, you may "
 "want to <a href=\"All/index.html\">see all sections in one page</a>."
 msgstr ""
+"Bienvenue sur l'aide en ligne de Debian. Veuillez choisir une section de la "
+"liste afin de naviguer dans la documentation Debian qui est installée sur le "
+"système. Vous pouvez également <a href=\"All/index.html\">voir toutes les "
+"sections sur une page</a>."
 
 #: index.rhtml:67
 msgid ""
@@ -129,6 +132,9 @@
 "few actions by hand in order to finish dhelp configuration. Instructions are "
 "given in"
 msgstr ""
+"Si vous utilisez l'aide en ligne de Debian à l'aide d'un serveur web, vous "
+"devrez terminer la configuration de dhelp en effectuant quelques actions "
+"vous-même. Les instructions se trouvent dans "
 
 #: index.rhtml:74
 msgid ""
@@ -138,3 +144,9 @@
 "associated helper package is installed, the disabled items will become "
 "enabled as soon as the index is rebuilt."
 msgstr ""
+"L'aide en ligne de Debian peut utiliser les fonctionnalités d'autres paquets "
+"pour fournir des renseignements supplémentaires (tels que les pages man et "
+"info), mais ne vous force pas à les installer en parallèle. Par conséquent, "
+"certains points peuvent être <em>désactivés</em>. Lorsque les paquets d'aide "
+"associés sont installés, les points désactivés deviendront activés dès que "
+"l'index sera reconstruit."

=== added file 'po/it.po'
--- po/it.po	1970-01-01 00:00:00 +0000
+++ po/it.po	2015-01-05 07:33:40 +0000
@@ -0,0 +1,153 @@
+# Italian translation of dhelp.
+# Copyright (C) 2012, Beatrice Torracca
+# This file is distributed under the same license as the dhelp package.
+# Beatrice Torracca <[e-mail]>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: dhelp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-19 23:02+0100\n"
+"PO-Revision-Date: 2012-09-23 14:59+0200\n"
+"Last-Translator: Beatrice Torracca <[e-mail]>\n"
+"Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#: index.rhtml:8
+msgid "Debian Online Help"
+msgstr "Guida in linea di Debian"
+
+#: fetcher_error.rhtml:8 search_error.tmpl:8
+msgid "Debian Online Help (Error)"
+msgstr "Guida in linea di Debian (Errore)"
+
+#: fetcher_error.rhtml:14 index.rhtml:14 section.rhtml:21 search_error.tmpl:15
+#: search_results.tmpl:15
+msgid "Online Help"
+msgstr "Guida in linea"
+
+#: cgimap.rb:35 search_error.tmpl:19 search_results.tmpl:19
+msgid "info pages"
+msgstr "pagine info"
+
+#: cgimap.rb:36 search_error.tmpl:20 search_results.tmpl:20
+msgid "man pages"
+msgstr "pagine di manuale"
+
+#: fetcher_error.rhtml:19 index.rhtml:19 section.rhtml:26 search_error.tmpl:23
+#: search_results.tmpl:23
+msgid "documentation folder"
+msgstr "cartella con documentazione"
+
+#: fetcher_error.rhtml:24 index.rhtml:24 section.rhtml:31
+msgid "Search"
+msgstr "Cerca"
+
+#: index.rhtml:31
+msgid "Documentation Index"
+msgstr "Indice della documentazione"
+
+#: index.rhtml:53
+msgid "See all sections in one page"
+msgstr "Vedere tutte le sezioni in una pagina"
+
+#: search_error.tmpl:34
+msgid "Error"
+msgstr "Errore"
+
+#: search_pagination.tmpl:6
+msgid "Pages"
+msgstr "Pagine"
+
+#: search_pagination.tmpl:11 search_pagination.tmpl:13
+msgid "Previous"
+msgstr "Precedente"
+
+#: search_pagination.tmpl:31 search_pagination.tmpl:33
+msgid "Next"
+msgstr "Successiva"
+
+#: search_results.tmpl:34
+msgid "Search results for"
+msgstr "Risultati della ricerca di"
+
+#: dsearch:240
+msgid ""
+"No search database found.\n"
+"Please run /etc/cron.weekly/dhelp as superuser to create it."
+msgstr ""
+"Nessun database per la ricerca trovato.\n"
+"Per crearlo seguire /etc/cron.weekly/dhelp da superutente."
+
+#: dsearch:250
+msgid "Please specify a search term."
+msgstr "Specificare un termine di ricerca."
+
+#: dsearch:283
+#, perl-format
+msgid ""
+"No results (ignored words: %s). Search terms must be at least 4 characters "
+"long, and must not be \"stop words\". The command \"<tt>index++ -S</tt>\" "
+"gives the stop word list."
+msgstr ""
+"Nessun risultato (parole ignorate: %s). I termini di ricerca devono essere "
+"lunghi almeno 4 caratteri e non devono essere \"parole terminali\". L'elenco "
+"delle parole terminali può essere ottenuto con il comando \"<tt>index++ "
+"-S</tt>\"."
+
+#: dsearch:285
+msgid "No results."
+msgstr "Nessun risultato."
+
+#: dsearch:323
+#, perl-format
+msgid "Showing only %s out of %s results in offline mode."
+msgstr "Vengono mostrati solo %s di %s risultati in modalità fuori linea."
+
+#: index.rhtml:46
+msgid "Install package man2html to browse man pages."
+msgstr "Installare il pacchetto man2html per sfogliare le pagine di manuale."
+
+#: index.rhtml:51
+msgid "Install package info2www to browse info pages."
+msgstr "Installare il pacchetto info2www per sfogliare le pagine info."
+
+#: index.rhtml:61
+msgid ""
+"Welcome to Debian Online Help. Pick a section from the list to browse the "
+"Debian documentation that is installed on the system. Alternatively, you may "
+"want to <a href=\"All/index.html\">see all sections in one page</a>."
+msgstr ""
+"Benvenuti nella Guida in linea di Debian. Selezionare una sezione "
+"dall'elenco per sfogliare la documentazione Debian che è installata sul "
+"sistema. In alternativa si possono <a href=\"All/index.html\">vedere tutte le "
+"sezioni in un'unica pagina</a>."
+
+#: index.rhtml:67
+msgid ""
+"If you are using Debian Online Help with a web server, you may have to do a "
+"few actions by hand in order to finish dhelp configuration. Instructions are "
+"given in"
+msgstr ""
+"Se si sta usando la Guida in linea di Debian con un server web, possono "
+"essere necessarie alcune azioni per poter terminare la configurazione di "
+"dhelp. Le istruzioni vengono fornite in"
+
+#: index.rhtml:74
+msgid ""
+"Debian Online Help can use the features of other packages to supply "
+"additional information (such as man and info pages), but does not enforce "
+"you to co-install them. Thus some items may be <em>disabled</em>. When the "
+"associated helper package is installed, the disabled items will become "
+"enabled as soon as the index is rebuilt."
+msgstr ""
+"La Guida in linea di Debian può utilizzare funzionalità di altri pacchetti "
+"per fornire informazioni addizionali (come le pagine di manuale o quelle "
+"info), ma non obbliga ad installarli. Perciò alcuni elementi potrebbero "
+"essere <em>disabilitati</em>. Quando viene installato il pacchetto "
+"ausiliario associato, gli elementi disabilitati vengono abilitati non appena "
+"viene ricostruito l'indice."

=== added file 'po/pt.po'
--- po/pt.po	1970-01-01 00:00:00 +0000
+++ po/pt.po	2015-01-05 07:33:40 +0000
@@ -0,0 +1,153 @@
+# Translation of dhelp to European Portuguese
+# Copyright (C) 2013 THE dhelp'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the dhelp package.
+#
+# Américo Monteiro <[e-mail]>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: dhelp 0.6.22\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-19 23:02+0100\n"
+"PO-Revision-Date: 2013-09-23 01:32+0100\n"
+"Last-Translator: Américo Monteiro <[e-mail]>\n"
+"Language-Team: Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: index.rhtml:8
+msgid "Debian Online Help"
+msgstr "Ajuda Online de Debian"
+
+#: fetcher_error.rhtml:8 search_error.tmpl:8
+msgid "Debian Online Help (Error)"
+msgstr "Ajuda Online de Debian (Erro)"
+
+#: fetcher_error.rhtml:14 index.rhtml:14 section.rhtml:21 search_error.tmpl:15
+#: search_results.tmpl:15
+msgid "Online Help"
+msgstr "Ajuda Online"
+
+#: cgimap.rb:35 search_error.tmpl:19 search_results.tmpl:19
+msgid "info pages"
+msgstr "páginas de informação \"info\""
+
+#: cgimap.rb:36 search_error.tmpl:20 search_results.tmpl:20
+msgid "man pages"
+msgstr "páginas de manuais \"man\""
+
+#: fetcher_error.rhtml:19 index.rhtml:19 section.rhtml:26 search_error.tmpl:23
+#: search_results.tmpl:23
+msgid "documentation folder"
+msgstr "pasta de documentação"
+
+#: fetcher_error.rhtml:24 index.rhtml:24 section.rhtml:31
+msgid "Search"
+msgstr "Procura"
+
+#: index.rhtml:31
+msgid "Documentation Index"
+msgstr "�ndice de Documentação"
+
+#: index.rhtml:53
+msgid "See all sections in one page"
+msgstr "Ver todas as secções numa página única"
+
+#: search_error.tmpl:34
+msgid "Error"
+msgstr "Erro"
+
+#: search_pagination.tmpl:6
+msgid "Pages"
+msgstr "Páginas"
+
+#: search_pagination.tmpl:11 search_pagination.tmpl:13
+msgid "Previous"
+msgstr "Anterior"
+
+#: search_pagination.tmpl:31 search_pagination.tmpl:33
+msgid "Next"
+msgstr "Próxima"
+
+#: search_results.tmpl:34
+msgid "Search results for"
+msgstr "Resultados de procura para"
+
+#: dsearch:240
+msgid ""
+"No search database found.\n"
+"Please run /etc/cron.weekly/dhelp as superuser to create it."
+msgstr ""
+"Nenhuma base de dados de procura encontrada.\n"
+"Por favor execute /etc/cron.weekly/dhelp como super-utilizador para a criar."
+
+#: dsearch:250
+msgid "Please specify a search term."
+msgstr "Por favor especifique o termo de procura."
+
+#: dsearch:283
+#, perl-format
+msgid ""
+"No results (ignored words: %s). Search terms must be at least 4 characters "
+"long, and must not be \"stop words\". The command \"<tt>index++ -S</tt>\" "
+"gives the stop word list."
+msgstr ""
+"Nenhum resultado (palavras ignoradas: %s). Os itens de procura devem ter pelo "
+"menos 4 caracteres de comprimento, e não podem ser \"palavras de stop\". O "
+"comando \"<tt>index++ -S</tt>\" dá a lista das palavras stop."
+
+#: dsearch:285
+msgid "No results."
+msgstr "Nenhum resultado."
+
+#: dsearch:323
+#, perl-format
+msgid "Showing only %s out of %s results in offline mode."
+msgstr "A mostrar apenas %s de %s resultados em modo offline."
+
+#: index.rhtml:46
+msgid "Install package man2html to browse man pages."
+msgstr "Instale o pacote man2html para navegar em páginas man."
+
+#: index.rhtml:51
+msgid "Install package info2www to browse info pages."
+msgstr "Instale o pacote info2www para navegar em páginas info."
+
+#: index.rhtml:61
+msgid ""
+"Welcome to Debian Online Help. Pick a section from the list to browse the "
+"Debian documentation that is installed on the system. Alternatively, you may "
+"want to <a href=\"All/index.html\">see all sections in one page</a>."
+msgstr ""
+"Bem vindo à Ajuda Online de Debian. Escolha uma secção da lista para navegar "
+"na documentação de Debian que está instalada no sistema. Alternativamente, "
+"pode querer <a href=\"All/index.html\">ver todas as secções numa página</a>."
+
+#: index.rhtml:67
+msgid ""
+"If you are using Debian Online Help with a web server, you may have to do a "
+"few actions by hand in order to finish dhelp configuration. Instructions are "
+"given in"
+msgstr ""
+"Você está a usar a Ajuda Online de Debian com um servidor web, poderá ter que "
+"fazer algumas acções manualmente de modo a acabar a configuração do dhelp. "
+"As instruções são dadas em"
+
+#: index.rhtml:74
+msgid ""
+"Debian Online Help can use the features of other packages to supply "
+"additional information (such as man and info pages), but does not enforce "
+"you to co-install them. Thus some items may be <em>disabled</em>. When the "
+"associated helper package is installed, the disabled items will become "
+"enabled as soon as the index is rebuilt."
+msgstr ""
+"A Ajuda Online de Debian pode usar as funcionalidades de outros pacotes "
+"para fornecer informação adicional (tal como as páginas man e info), mas não "
+"força a co-instalá-los. Assim alguns itens pode estar <em>desactivados</em>. "
+"Quando o pacote de ajuda associado for instalado, os itens desactivados "
+"mudarão para activados assim que o índice seja re-construído."
+
+

=== modified file 'po/ru.po'
--- po/ru.po	2012-10-25 15:29:52 +0000
+++ po/ru.po	2015-01-05 07:33:40 +0000
@@ -1,32 +1,31 @@
 # Russian translation of dhelp messages.
 # Copyright (C) 2008 Yuri Kozlov <[e-mail]>
 # This file is distributed under the same license as the dhelp package.
-# Yuri Kozlov <[e-mail]>, 2008.
-# Georgios M. Zarkadas <[e-mail]>, 2012
 #
+# Yuri Kozlov <[e-mail]>, 2008, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: dhelp-0.6.21\n"
+"Project-Id-Version: dhelp-0.6.22\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-05-28 06:13+0200\n"
-"PO-Revision-Date: 2012-05-28 07:52+0200\n"
-"Last-Translator: Georgios M. Zarkadas <[e-mail]>\n"
+"PO-Revision-Date: 2012-09-24 20:34+0400\n"
+"Last-Translator: Yuri Kozlov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: index.rhtml:8
 msgid "Debian Online Help"
-msgstr "Debian Интерактивна� �правка"
+msgstr "Интерактивна� �правка Debian"
 
 #: fetcher_error.rhtml:8 search_error.tmpl:8
 msgid "Debian Online Help (Error)"
-msgstr "Debian Интерактивна� �правка (Ошибка)"
+msgstr "Интерактивна� �правка Debian (Ошибка)"
 
 #: fetcher_error.rhtml:14 index.rhtml:14 section.rhtml:21 search_error.tmpl:15
 #: search_results.tmpl:15
@@ -35,11 +34,11 @@
 
 #: cgimap.rb:35 search_error.tmpl:19 search_results.tmpl:19
 msgid "info pages"
-msgstr "info �траницы"
+msgstr "�траницы info"
 
 #: cgimap.rb:36 search_error.tmpl:20 search_results.tmpl:20
 msgid "man pages"
-msgstr "man �траницы"
+msgstr "�правочные �траницы"
 
 #: fetcher_error.rhtml:19 index.rhtml:19 section.rhtml:26 search_error.tmpl:23
 #: search_results.tmpl:23
@@ -56,7 +55,7 @@
 
 #: index.rhtml:53
 msgid "See all sections in one page"
-msgstr "По�мотреть в�е �екции на одной �транице"
+msgstr "По�мотреть в�е разделы на одной �транице"
 
 #: search_error.tmpl:34
 msgid "Error"
@@ -98,8 +97,8 @@
 "gives the stop word list."
 msgstr ""
 "�ичего не найдено (игнорированные �лова: %s). В и�комых выражени�х должно "
-"быть не менее 4 �имволов и в них не должно быть \"�топ-�лов\". Спи�ок �топ-"
-"�лов можно получить по команде \"<tt>index++ -S</tt>\"."
+"быть не менее 4 �имволов и в них не должно быть «�топ-�лов». Спи�ок �топ-"
+"�лов можно получить по команде «<tt>index++ -S</tt>»."
 
 #: dsearch:285
 msgid "No results."
@@ -112,11 +111,11 @@
 
 #: index.rhtml:46
 msgid "Install package man2html to browse man pages."
-msgstr ""
+msgstr "Дл� про�мотра �правочных �траниц у�тановите пакет man2html."
 
 #: index.rhtml:51
 msgid "Install package info2www to browse info pages."
-msgstr ""
+msgstr "Дл� про�мотра �правочных �траниц у�тановите пакет info2www."
 
 #: index.rhtml:61
 msgid ""
@@ -124,6 +123,11 @@
 "Debian documentation that is installed on the system. Alternatively, you may "
 "want to <a href=\"All/index.html\">see all sections in one page</a>."
 msgstr ""
+"Добро пожаловать в интерактивную �правку Debian. "
+"Дл� про�мотра документации "
+"Debian, котора� у�тановлена в �и�теме, выберите "
+"интере�ующий раздел из �пи�ка. Или же вы можете "
+"<a href=\"All/index.html\">увидеть в�е разделы на одной �транице</a>."
 
 #: index.rhtml:67
 msgid ""
@@ -131,6 +135,9 @@
 "few actions by hand in order to finish dhelp configuration. Instructions are "
 "given in"
 msgstr ""
+"Е�ли вы хотите и�пользовать интерактивную �правку Debian через "
+"веб-�ервер, то дл� завершени� на�тройки dhelp нужно выполнить "
+"не�колько ручных дей�твий. Ин�трукции приведены в"
 
 #: index.rhtml:74
 msgid ""
@@ -140,3 +147,11 @@
 "associated helper package is installed, the disabled items will become "
 "enabled as soon as the index is rebuilt."
 msgstr ""
+"В интерактивной �правке Debian могут быть задей�твованы "
+"другие пакеты, предо�тавл�ющие дополнительную информацию "
+"(такую как �правочные �траницы или �траницы в формате info), "
+"но у�танавливать их необ�зательно. Из-за �того "
+"некоторые �лементы могут быть <em>недо�тупны</em>. "
+"При у�тановке в�помогательного пакета недо�тупные �лементы "
+"активируют�� �разу по�ле пере�оздани� индек�а."
+

=== modified file 'src/dhelp_fetcher.rb'
--- src/dhelp_fetcher.rb	2012-06-12 21:50:00 +0000
+++ src/dhelp_fetcher.rb	2015-01-05 07:33:40 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8 -w
+#!/usr/bin/ruby -w
 
 require 'cgi'
 require 'erb'

=== modified file 'src/dhelp_parse.rb'
--- src/dhelp_parse.rb	2012-06-12 21:50:00 +0000
+++ src/dhelp_parse.rb	2015-01-05 07:33:40 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8 -w
+#!/usr/bin/ruby -w
 
 =begin
     Documentation generator for dhelp
@@ -24,6 +24,11 @@
 PREFIX = '/usr'
 DEFAULT_INDEX_ROOT = "#{PREFIX}/share/doc/HTML"
 
+# Set default file format as UTF-8, without printing a warning
+old_verbose, $VERBOSE = $VERBOSE, false
+Encoding.default_external = "UTF-8"
+$VERBOSE = old_verbose
+
 require 'dhelp'
 require 'dhelp/exporter/html'
 include Dhelp
@@ -89,10 +94,12 @@
 
       opts.on('-a FILE[...]', MSG_DOC_ADD) { |files|
         @action = :add
+        files = [files] if files.is_a? String
         @doc_base_files = files
       }
       opts.on('-d FILE[...]', MSG_DOC_RMV) { |files|
         @action = :delete
+        files = [files] if files.is_a? String
         @doc_base_files = files
       }
       opts.on('-i', MSG_INDEX) { @action = :index }
@@ -111,10 +118,15 @@
     end
     optparse.summary_width = 16
     optparse.parse!
+    
+    if @action == nil
+      $stderr.puts optparse
+      exit 1
+    end
   end
 
   def packaged_configured?
-    File.exists? '/var/lib/dhelp/configured'
+    File.exist? '/var/lib/dhelp/configured'
   end
 
   # Adds the documents supplied in command-line to the pool.
@@ -195,9 +207,6 @@
     when :reindex
       # Recreate the pool, without doing a full indexing.
       pool.rebuild(false)
-    else
-      $stderr.puts usage
-      return 1
     end
 
     # Always executed

=== modified file 'test/doc-base/pica-manual'
--- test/doc-base/pica-manual	2008-11-11 20:10:49 +0000
+++ test/doc-base/pica-manual	2015-01-05 07:33:40 +0000
@@ -1,6 +1,6 @@
 Document: pica-manual
 Title: PICA Manual
-Author: Esteban Manchado Velázquez
+Author: Esteban Manchado Velázquez
 Abstract: This manual describes what PICA is
  and how it can be used to administer your
  machines and keep them up-to-date and secure.

=== modified file 'test/tc_dhelpdocumentpool.rb'
--- test/tc_dhelpdocumentpool.rb	2012-10-25 15:29:52 +0000
+++ test/tc_dhelpdocumentpool.rb	2015-01-05 07:33:40 +0000
@@ -106,7 +106,7 @@
     # Now, once everything is indexed, force a reindexing (like the cron job)
     FileUtils.rm_f TEST_INDEX_FILE
     @pool.rebuild
-    assert File.exists?(TEST_INDEX_FILE),
+    assert File.exist?(TEST_INDEX_FILE),
            "Index file should exist after rebuilding"
     assert(File.size(TEST_INDEX_FILE) > 0,
            "Index file should have non-zero size after rebuilding")

=== modified file 'test/tc_docbasedocument.rb'
--- test/tc_docbasedocument.rb	2008-11-11 20:10:49 +0000
+++ test/tc_docbasedocument.rb	2015-01-05 07:33:40 +0000
@@ -12,7 +12,7 @@
 
     assert_equal 'pica-manual', file.document
     assert_equal 'PICA Manual', file.title
-    assert_equal 'Esteban Manchado Velázquez', file.author
+    assert_equal 'Esteban Manchado Velázquez', file.author
     assert_equal 'Admin', file.section
     assert_equal "This manual describes what PICA is and how it can be used to administer your machines and keep them up-to-date and secure.", file.abstract
 

=== modified file 'test/ts_dhelp.rb'
--- test/ts_dhelp.rb	2007-10-20 17:35:26 +0000
+++ test/ts_dhelp.rb	2015-01-05 07:33:40 +0000
@@ -1,7 +1,7 @@
 =begin
 Testsuite for the Ruby parts of dhelp
 
-    Copyright (C) 2005  Esteban Manchado Velázquez
+    Copyright (C) 2005  Esteban Manchado Velázquez
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by