[texlive-nonbin] 03/03: fix bug introduced when patching g-brief2.cls

[Norbert Preining <preining@debian.org>]

This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository texlive-nonbin.

commit 3de423aa23158d5f1ae2bde2fc63c02c14183d47
Author: Norbert Preining <preining@debian.org>
Date:   Mon Feb 20 13:32:48 2017 +0900

    fix bug introduced when patching g-brief2.cls
---
 texlive-extra/debian/changelog                   | 7 +++++++
 texlive-extra/debian/patches/fix-gbrief-multiple | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index bd5dc51..5825355 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,3 +1,10 @@
+texlive-extra (2016.20170123-4) UNRELEASED; urgency=medium
+
+  * g-brief2.cls: correct the wrong patch for bug #840700
+    (Closes: #855437)
+
+ -- Norbert Preining <preining@debian.org>  Mon, 20 Feb 2017 13:30:26 +0900
+
 texlive-extra (2016.20170123-3) unstable; urgency=medium
 
   * fix location of contracard.sty (Closes: #854800)
diff --git a/texlive-extra/debian/patches/fix-gbrief-multiple b/texlive-extra/debian/patches/fix-gbrief-multiple
index e8d48ef..5603adc 100644
--- a/texlive-extra/debian/patches/fix-gbrief-multiple
+++ b/texlive-extra/debian/patches/fix-gbrief-multiple
@@ -2,14 +2,14 @@
  texmf-dist/tex/latex/g-brief/g-brief2.cls |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- texlive-extra-2016.20161008.orig/texmf-dist/tex/latex/g-brief/g-brief2.cls
-+++ texlive-extra-2016.20161008/texmf-dist/tex/latex/g-brief/g-brief2.cls
+--- texlive-extra-2016.20170123.orig/texmf-dist/tex/latex/g-brief/g-brief2.cls
++++ texlive-extra-2016.20170123/texmf-dist/tex/latex/g-brief/g-brief2.cls
 @@ -333,7 +333,7 @@
      \unitlength1mm
      \begin{picture}(0,0)
        \put(-9,0){\parbox{180mm}{
 -        \tiny \newcounter{blockzahl} \def\@blockbreite{170mm}
-+	\tiny \ifdef{\theblockzahl}{\setcounter{blockzahl}{0}}{\newcounter{blockzahl}} \def\@blockbreite{170mm}
++	\tiny \ifx\c@blockzahl\undefined\newcounter{blockzahl}\else\setcounter{blockzahl}{0}\fi \def\@blockbreite{170mm}
          \iftrennlinien \rule{180mm}{0.5pt} \fi
          \ifthenelse{
            \equal{\namezeilea}{\empty} \and \equal{\namezeileb}{\empty} \and

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git