[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2013.20130530-1-8-g1114029

["Norbert Preining" <preining@debian.org>]

The following commit has been merged in the master branch:
commit c2b7771f75603e63985b3712d56d5bacec772067
Author: Norbert Preining <preining@debian.org>
Date:   Mon Jul 1 20:47:29 2013 +0900

    fix texcount for \verb+...+ (Closes: #711491)

diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index 439c34b..0fb202a 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -3,8 +3,9 @@ texlive-extra (2013.20130530-2) UNRELEASED; urgency=low
   * UNRELEASED
   * texlive-publishers depends on texlive-latex-recommended (Closes: #710420)
   * texlive-science depends on texlive-latex-recommended (Closes: #711168)
+  * fix texcount for \verb+...+ (Closes: #711491)
 
- -- Norbert Preining <preining@debian.org>  Thu, 06 Jun 2013 09:23:48 +0900
+ -- Norbert Preining <preining@debian.org>  Mon, 01 Jul 2013 20:46:53 +0900
 
 texlive-extra (2013.20130530-1) unstable; urgency=low
 
diff --git a/texlive-extra/debian/patches/series b/texlive-extra/debian/patches/series
index b086e03..eab1f43 100644
--- a/texlive-extra/debian/patches/series
+++ b/texlive-extra/debian/patches/series
@@ -2,3 +2,4 @@ fix-scripts
 fix-mf2pt1-info
 ulqda-use-digest-sha
 latex2man-mktemp
+upstream-texcount-verb-fix
diff --git a/texlive-extra/debian/patches/upstream-texcount-verb-fix b/texlive-extra/debian/patches/upstream-texcount-verb-fix
new file mode 100644
index 0000000..28706aa
--- /dev/null
+++ b/texlive-extra/debian/patches/upstream-texcount-verb-fix
@@ -0,0 +1,17 @@
+upstream fix to texcount to allow for verb+foobar+ constructs
+(Closes: #711491)
+---
+ texmf-dist/scripts/latex2man/latex2man |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- texlive-extra-2013.20130509.orig/texmf-dist/scripts/texcount/texcount.pl
++++ texlive-extra-2013.20130509/texmf-dist/scripts/texcount/texcount.pl
+@@ -1541,7 +1541,7 @@
+  }
+  my $dlm=$&;
+  print_style($dlm,'command');
+- if (!($tex->{'line'} =~ s/^([^$dlm]*)($dlm)// )) {
++ if (!($tex->{'line'} =~ s/^([^$dlm]*)([$dlm])// )) {
+   error($tex,'Invalid \verb: could not find ending delimiter ('.$dlm.').');
+  }
+  print_style($1,'ignore');

-- 
Debian packaging of texlive-nonbin)