[SCM] Debian packaging of texinfo) branch, master, updated. debian/5.1.dfsg.1-3-4-g0086f86
The following commit has been merged in the master branch:
commit 509c617184a319b7e2348a16e75c6b6dcbcb0a52
Author: Norbert Preining <preining@debian.org>
Date: Thu Jul 11 16:38:22 2013 +0900
temporary fix for @enumerate 10 (Closes: #709673)
diff --git a/debian/changelog b/debian/changelog
index 2e12fa8..97ba008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-texinfo (5.1.dfsg.1-4) UNRELEASED; urgency=low
+texinfo (5.1.dfsg.1-4) unstable; urgency=low
* pre-depend on dpkg >= 1.16.1 (for interest-nowait) (Closes: #709443)
+ * temporary fix for @enumerate 10 (Closes: #709673)
- -- Norbert Preining <preining@debian.org> Thu, 23 May 2013 21:32:42 +0900
+ -- Norbert Preining <preining@debian.org> Thu, 11 Jul 2013 16:37:26 +0900
texinfo (5.1.dfsg.1-3) unstable; urgency=low
diff --git a/debian/patches/maybe-upstream-fix-itemize-start b/debian/patches/maybe-upstream-fix-itemize-start
new file mode 100644
index 0000000..5e60ddd
--- /dev/null
+++ b/debian/patches/maybe-upstream-fix-itemize-start
@@ -0,0 +1,31 @@
+Fix continuation of @enumerate with numbers >= 10
+Bug report #709673
+patch is discussed on texinfo ml, but not decided by now
+---
+ tp/Texinfo/Common.pm | 2 +-
+ tp/Texinfo/Parser.pm | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- texinfo.orig/tp/Texinfo/Common.pm
++++ texinfo/tp/Texinfo/Common.pm
+@@ -1382,7 +1382,7 @@
+ my $specification = shift;
+ my $number = shift;
+
+- if ($specification =~ /^[0-9]$/) {
++ if ($specification =~ /^[0-9]+$/) {
+ return $specification + $number -1;
+ }
+
+--- texinfo.orig/tp/Texinfo/Parser.pm
++++ texinfo/tp/Texinfo/Parser.pm
+@@ -2973,7 +2973,8 @@
+ $current->{'cmdname'});
+ }
+ my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
+- if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) {
++ if (!defined($arg->{'text'}) or ($arg->{'text'} !~ /^[[:alnum:]]$/ and
++ $arg->{'text'} !~ /^[0-9]+$/)) {
+ $self->_command_error($current, $line_nr,
+ $self->__("bad argument to \@%s"),
+ $current->{'cmdname'});
diff --git a/debian/patches/series b/debian/patches/series
index 1c494de..b9e3aa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ warn_missing_tex
numerical-signal-names
info_universal_argument
dont_build_info
+maybe-upstream-fix-itemize-start
--
Debian packaging of texinfo)
Reply to: