Run of fresh-snapshots for ruby-htmlentities

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot ruby-htmlentities 

Merge these changes:

git pull https://janitor.debian.net/git/ruby-htmlentities fresh-snapshots/main
git pull https://janitor.debian.net/git/ruby-htmlentities fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/ruby-htmlentities fresh-snapshots/upstream

Summary

Merged new upstream version: 4.3.3+git20150705.1.049ec3b (was: 4.3.3).

Diff

Branch: main

diff --git a/History.txt b/History.txt
index 867acd3..8a3d21a 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,6 @@
+== 4.3.4 (2015-07-05)
+* Remove erroneous 'Iodot' entity (a typo'd duplicate of Idot).
+
 == 4.3.3 (2014-12-25)
 * Remove duplicate hash entry that causes warnings in Ruby 2.2.0.
 
diff --git a/Rakefile b/Rakefile
index 4756e51..9d75bcc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,10 +3,10 @@ require "rake/clean"
 
 CLEAN.include("doc")
 DOCTYPES = %w[html4 xhtml1]
-DATA_FILES = DOCTYPES.map{ |d| "lib/htmlentities/#{d}.rb" }
+DATA_FILES = DOCTYPES.map{ |d| "lib/htmlentities/mappings/#{d}.rb" }
 SOURCES = FileList["lib/**/*.rb"] - DATA_FILES
 
-task :default => :test
+task :default => [:entities, :test]
 
 Rake::TestTask.new do |t|
   t.libs << "test"
@@ -16,8 +16,7 @@ Rake::TestTask.new do |t|
 end
 
 DOCTYPES.each do |name|
-  file "lib/htmlentities/#{name}.rb" => %w[util/build_entities.rb] do |f|
-    rm_f f.name
+  file "lib/htmlentities/mappings/#{name}.rb" do |f|
     sh %{ruby util/build_entities.rb #{name} > #{f.name}}
   end
 end
diff --git a/debian/changelog b/debian/changelog
index 93e0e98..fd9c45b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-htmlentities (4.3.3-2) UNRELEASED; urgency=medium
+ruby-htmlentities (4.3.3+git20150705.1.049ec3b-1) UNRELEASED; urgency=medium
 
   [ Cédric Boutillier ]
   * Use https:// in Vcs-* fields
@@ -18,7 +18,7 @@ ruby-htmlentities (4.3.3-2) UNRELEASED; urgency=medium
   * Update Vcs-* headers from URL redirect.
   * Use canonical URL in Vcs-Git.
 
- -- Utkarsh Gupta <guptautkarsh2102@gmail.com>  Tue, 13 Aug 2019 05:38:59 +0530
+ -- Utkarsh Gupta <guptautkarsh2102@gmail.com>  Sun, 04 Apr 2021 23:36:31 -0000
 
 ruby-htmlentities (4.3.3-1) unstable; urgency=medium
 
diff --git a/lib/htmlentities/decoder.rb b/lib/htmlentities/decoder.rb
index c03a545..e9e08b2 100644
--- a/lib/htmlentities/decoder.rb
+++ b/lib/htmlentities/decoder.rb
@@ -9,11 +9,11 @@ class HTMLEntities
     def decode(source)
       prepare(source).gsub(@entity_regexp){
         if $1 && codepoint = @map[$1]
-          [codepoint].pack('U')
+          codepoint.chr(Encoding::UTF_8)
         elsif $2
-          [$2.to_i(10)].pack('U')
+          $2.to_i(10).chr(Encoding::UTF_8)
         elsif $3
-          [$3.to_i(16)].pack('U')
+          $3.to_i(16).chr(Encoding::UTF_8)
         else
           $&
         end
diff --git a/lib/htmlentities/encoder.rb b/lib/htmlentities/encoder.rb
index 50e14f6..4ddfc89 100644
--- a/lib/htmlentities/encoder.rb
+++ b/lib/htmlentities/encoder.rb
@@ -99,16 +99,16 @@ class HTMLEntities
     end
 
     def encode_named(char)
-      cp = char.unpack('U')[0]
+      cp = char.codepoints.first
       (e = reverse_map[cp]) && "&#{e};"
     end
 
     def encode_decimal(char)
-      "&##{char.unpack('U')[0]};"
+      "&##{char.codepoints.first};"
     end
 
     def encode_hexadecimal(char)
-      "&#x#{char.unpack('U')[0].to_s(16)};"
+      "&#x#{char.codepoints.first.to_s(16)};"
     end
 
     def reverse_map
diff --git a/lib/htmlentities/mappings/expanded.rb b/lib/htmlentities/mappings/expanded.rb
index 8521047..e75f9d4 100644
--- a/lib/htmlentities/mappings/expanded.rb
+++ b/lib/htmlentities/mappings/expanded.rb
@@ -467,7 +467,6 @@ class HTMLEntities
     'intcal'         => 0x22ba,   # ⊺                  INTERCALATE
     'IOcy'           => 0x0401,   # Ё                  CYRILLIC CAPITAL LETTER IO
     'iocy'           => 0x0451,   # ё                  CYRILLIC SMALL LETTER IO
-    'Iodot'          => 0x0130,   # İ                  LATIN CAPITAL LETTER I WITH DOT ABOVE
     'Iogon'          => 0x012e,   # Į                  LATIN CAPITAL LETTER I WITH OGONEK
     'iogon'          => 0x012f,   # į                  LATIN SMALL LETTER I WITH OGONEK
     'Iota'           => 0x0399,   # Ι   dup xhtml      GREEK CAPITAL LETTER IOTA
diff --git a/lib/htmlentities/version.rb b/lib/htmlentities/version.rb
index d02457d..32ea4ab 100644
--- a/lib/htmlentities/version.rb
+++ b/lib/htmlentities/version.rb
@@ -2,7 +2,7 @@ class HTMLEntities
   module VERSION #:nodoc:
     MAJOR = 4
     MINOR = 3
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/util/build_entities.rb b/util/build_entities.rb
index 61229e9..1f1cd94 100644
--- a/util/build_entities.rb
+++ b/util/build_entities.rb
@@ -34,17 +34,17 @@ dtd.scan(/<!ENTITY \s+ % \s+ (\w+) \s+ PUBLIC \s+ "(.*?)" \s+ "(.*?)" \s* >/x) d
 end
 
 # These two are a special case in the W3C entity file, so fix them:
-entities['lt']  = ?<
-entities['amp'] = ?&
+entities['lt']  = '<'.codepoints.first
+entities['amp'] = '&'.codepoints.first
 
 puts <<"END"
+# encoding: UTF-8
 class HTMLEntities
-  MAPPINGS = {} unless defined? MAPPINGS
   MAPPINGS['#{flavor}'] = {
 #{
-  entities.keys.sort_by{ |s| 
-    [s.downcase, s] 
-  }.map{ |name| 
+  entities.keys.sort_by{ |s|
+    [s.downcase, s]
+  }.map{ |name|
     "    '#{name}' => #{entities[name]}"
   }.join(",\n")
 }

Branch: pristine-tar

diff --git a/ruby-htmlentities_4.3.3+git20150705.1.049ec3b.orig.tar.gz.delta b/ruby-htmlentities_4.3.3+git20150705.1.049ec3b.orig.tar.gz.delta
new file mode 100644
index 0000000..dc778f4
Binary files /dev/null and b/ruby-htmlentities_4.3.3+git20150705.1.049ec3b.orig.tar.gz.delta differ
diff --git a/ruby-htmlentities_4.3.3+git20150705.1.049ec3b.orig.tar.gz.id b/ruby-htmlentities_4.3.3+git20150705.1.049ec3b.orig.tar.gz.id
new file mode 100644
index 0000000..2661cb9
--- /dev/null
+++ b/ruby-htmlentities_4.3.3+git20150705.1.049ec3b.orig.tar.gz.id
@@ -0,0 +1 @@
+66c59caebf2d61b5dae9fa2f1bd9dca5c9369afb

Branch: upstream

Tag: upstream/4.3.3+git20150705.1.049ec3b

Diff is too long (more than 200 lines). Download the raw diff.

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/share/rubygems-integration/all/specifications/htmlentities-4.3.4.gemspec

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/share/rubygems-integration/all/specifications/htmlentities-4.3.3.gemspec

No differences were encountered in the control files

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots ruby-htmlentities

Lintian Result

Full worker log Full build log Full dist log