Hi,
El Martes, 6 de mayo de 2014 01:54:22 Cédric Boutillier escribió:
> I am considering NMUing dhelp now we have a working ruby-bdb. Attached
> my current patch against dhelp. Let me know if you want to prepare the
> dhelp NMU yourself :)
Could you upload it to DELAYED/2 ?
Dsc here:
http://mentors.debian.net/debian/pool/main/d/dhelp/dhelp_0.6.21+nmu4.dsc
Attached diff.
I will send the nmu mail to the corresponding bugs once you give me the ok.
Thanks,
David
diff -ru dhelp-0.6.21+nmu3/debian/changelog dhelp-0.6.21+nmu4/debian/changelog
--- dhelp-0.6.21+nmu3/debian/changelog 2013-09-22 12:07:33.000000000 +0200
+++ dhelp-0.6.21+nmu4/debian/changelog 2014-05-17 21:55:44.000000000 +0200
@@ -1,3 +1,14 @@
+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 don't affect performance on every system
+ upgrade (Closes: #712621)
+ * Handle correctly arguments passed to '-a' and '-d' options
+ * Update standards version; no changes needed
+
+ -- David Suárez <david.sephi...@gmail.com> Sat, 17 May 2014 19:47:04 +0200
+
dhelp (0.6.21+nmu3) unstable; urgency=low
* Non-maintainer upload.
diff -ru dhelp-0.6.21+nmu3/debian/control dhelp-0.6.21+nmu4/debian/control
--- dhelp-0.6.21+nmu3/debian/control 2013-05-10 11:46:54.000000000 +0200
+++ dhelp-0.6.21+nmu4/debian/control 2014-05-17 21:05:19.000000000 +0200
@@ -4,15 +4,16 @@
Maintainer: Georgios M. Zarkadas <g...@member.fsf.org>
Uploaders: Esteban Manchado Velázquez <z...@debian.org>,
Stefan Hornburg (Racke) <ra...@linuxia.de>,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Build-Depends: debhelper (>= 5), cdbs (>= 0.4.23-1.1),
ruby-gettext
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
diff -ru dhelp-0.6.21+nmu3/lib/dhelp/exporter/cgimap.rb dhelp-0.6.21+nmu4/lib/dhelp/exporter/cgimap.rb
--- dhelp-0.6.21+nmu3/lib/dhelp/exporter/cgimap.rb 2012-06-12 20:59:55.000000000 +0200
+++ dhelp-0.6.21+nmu4/lib/dhelp/exporter/cgimap.rb 2014-05-17 21:32:02.000000000 +0200
@@ -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
diff -ru dhelp-0.6.21+nmu3/lib/dhelp/exporter/html.rb dhelp-0.6.21+nmu4/lib/dhelp/exporter/html.rb
--- dhelp-0.6.21+nmu3/lib/dhelp/exporter/html.rb 2012-06-12 20:59:55.000000000 +0200
+++ dhelp-0.6.21+nmu4/lib/dhelp/exporter/html.rb 2014-05-17 20:06:47.000000000 +0200
@@ -1,3 +1,5 @@
+# encoding: ISO-8859-15
+
require 'dhelp/exporter/base'
require 'dhelp/exporter/cgimap'
require 'erb'
@@ -28,13 +30,14 @@
FileUtils.mkdir_p(export_dir, :mode => create_mode)
FileUtils.chdir(export_dir)
# Create README file
- File.open("README", "w") do |f|
- f.puts <<EOREADME
+ readme_content = <<EOREADME
Don't put files in this directory!
dhelp will delete *all* files in this directory when creating a new index.
Esteban Manchado Velázquez (z...@debian.org)
EOREADME
+ File.open("README", "w") do |f|
+ f.puts readme_content.force_encoding("utf-8")
end
end
diff -ru dhelp-0.6.21+nmu3/Makefile dhelp-0.6.21+nmu4/Makefile
--- dhelp-0.6.21+nmu3/Makefile 2013-09-22 12:03:54.000000000 +0200
+++ dhelp-0.6.21+nmu4/Makefile 2014-05-17 19:53:27.000000000 +0200
@@ -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/1.8
+rubydir = $(DESTDIR_)/lib/ruby/vendor_ruby/
else
+ ifdef OLD_VENDOR_RUBY
+rubydir = $(DESTDIR_)/lib/ruby/vendor_ruby/1.8
+ else
rubydir = $(DESTDIR_)/lib/ruby/1.8
+ endif
endif
# Templates and Perl-related variables
diff -ru dhelp-0.6.21+nmu3/src/dhelp_fetcher.rb dhelp-0.6.21+nmu4/src/dhelp_fetcher.rb
--- dhelp-0.6.21+nmu3/src/dhelp_fetcher.rb 2012-06-12 20:59:55.000000000 +0200
+++ dhelp-0.6.21+nmu4/src/dhelp_fetcher.rb 2014-05-17 19:56:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8 -w
+#!/usr/bin/ruby -w
require 'cgi'
require 'erb'
diff -ru dhelp-0.6.21+nmu3/src/dhelp_parse.rb dhelp-0.6.21+nmu4/src/dhelp_parse.rb
--- dhelp-0.6.21+nmu3/src/dhelp_parse.rb 2012-06-21 21:47:38.000000000 +0200
+++ dhelp-0.6.21+nmu4/src/dhelp_parse.rb 2014-05-17 21:19:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby1.8 -w
+#!/usr/bin/ruby -w
=begin
Documentation generator for dhelp
@@ -89,10 +89,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 }
