Bug#773936: unblock: biber/1.9-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
(btw, thanks for already unblocking texlive-bin!)
I would like to ask for an unblock of biber 1.9-3 which fixes #773872
It picks a fix from the 2.0 branch that is fixes some decoding errors
when reading bib files.
The full debdiff is attached, the added patch includes a description.
The patch also adds a test case, and the mentioned git hub issue
provides a testfile which I have tested successfully.
Thanks for consideration
Norbert
unblock biber/1.9-3
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.19.0-rc1+ (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru biber-1.9/debian/changelog biber-1.9/debian/changelog
--- biber-1.9/debian/changelog 2014-10-21 09:08:41.000000000 +0900
+++ biber-1.9/debian/changelog 2014-12-25 08:45:26.000000000 +0900
@@ -1,3 +1,9 @@
+biber (1.9-3) unstable; urgency=medium
+
+ * cherry pick upstream fix for hyphenation fixes (Closes: #773872)
+
+ -- Norbert Preining <preining@debian.org> Thu, 25 Dec 2014 08:43:59 +0900
+
biber (1.9-2) unstable; urgency=medium
* fix precedence warning (Closes: #764592)
diff -Nru biber-1.9/debian/patches/biber-fix-hyphenation biber-1.9/debian/patches/biber-fix-hyphenation
--- biber-1.9/debian/patches/biber-fix-hyphenation 1970-01-01 09:00:00.000000000 +0900
+++ biber-1.9/debian/patches/biber-fix-hyphenation 2014-12-25 08:45:26.000000000 +0900
@@ -0,0 +1,61 @@
+From bug report #773872
+When I add hyphenation hints (hy\-phe\-na\-tion) to bibliography entries,
+running biber and then latex again causes the following error:
+
+! Package inputenc Error: Unicode char \u8:‑ not set up for use with LaTeX.
+
+Reportedly, this bug is fixed in the 2.0 version of biber. But maybe the
+corresponding patch (commit 732ebc5962850416178d4802a44583e3cd1b3740
+upstream) could be backported to jessie? More information on this bug may be
+found upstream at https://github.com/plk/biber/issues/46 .
+---
+ lib/Biber/LaTeX/Recode.pm | 4 ++++
+ lib/Biber/LaTeX/recode_data.xml | 3 +++
+ t/utils.t | 4 ++--
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+--- biber.orig/lib/Biber/LaTeX/Recode.pm
++++ biber/lib/Biber/LaTeX/Recode.pm
+@@ -129,6 +129,10 @@
+ $remap_d->{$type}{map}{NFD($from->textContent())} = NFD($to->textContent());
+ }
+ }
++ # Things we don't want to change when decoding as this breaks some things
++ foreach my $d ($xpc->findnodes('/texmap/decode_exclude/char')) {
++ delete($remap_d->{$type}{map}{NFD($d->textContent())});
++ }
+ }
+
+ # Construct encode set
+--- biber.orig/lib/Biber/LaTeX/recode_data.xml
++++ biber/lib/Biber/LaTeX/recode_data.xml
+@@ -856,6 +856,9 @@
+ <map><from>Psi</from> <to hex="3A8">Ψ</to></map>
+ <map><from>Omega</from> <to hex="3A9">Ω</to></map>
+ </maps>
++ <decode_exclude>
++ <char>-</char>
++ </decode_exclude>
+ <encode_exclude>
+ <char>"</char>
+ <char>#</char>
+--- biber.orig/t/utils.t
++++ biber/t/utils.t
+@@ -4,7 +4,7 @@
+ use utf8;
+ no warnings 'utf8' ;
+
+-use Test::More tests => 34;
++use Test::More tests => 35;
+ use Biber;
+ use Biber::Entry::Name;
+ use Biber::Entry::Names;
+@@ -88,7 +88,7 @@
+ is( latex_encode(NFD('Þ')), '{\TH}', 'latex encode 6'); # Testing preferred
+ is( latex_encode('$'), '$', 'latex encode 7'); # Testing exclude
+ is( latex_encode(NFD('–')), '--', 'latex encode 8'); # Testing raw
+-
++is( latex_decode('a\-a'), 'a\-a', 'discretionary hyphens');
+
+ my @arrayA = qw/ a b c d e f c /;
+ my @arrayB = qw/ c e /;
diff -Nru biber-1.9/debian/patches/series biber-1.9/debian/patches/series
--- biber-1.9/debian/patches/series 2014-10-21 09:08:41.000000000 +0900
+++ biber-1.9/debian/patches/series 2014-12-25 08:45:26.000000000 +0900
@@ -4,3 +4,4 @@
fix-xpathcontext
fix-slurp-unknown
fix-perl-warning
+biber-fix-hyphenation
Reply to: