Source: gl2ps
Version: 1.3.9-2
Severity: normal

Dear Maintainers,

Just noticed that gl2ps still has 1000_gl2ps_tikz-fix-rotated-text.patch
enabled. This is not only redundant but wrong.

It was extracted from 1.3.9 for 1.3.8-1 to handle a missing brace
problem for rotated text in octave->pgf output, but fix is already
in 1.3.9. Keeping this patch enabled causes an extra brace added,
one by 1.3.9 code and another one by the patch, resulting in buggy
pgf output, now with an error about extra brace.

Please remove it.

Patch attached just for completeness, removal is trivial.

Regards,

-- 
Agustin
>From c88ff10eb94582f693876d0a27667a5a8db68344 Mon Sep 17 00:00:00 2001
From: Agustin Martin Domingo <agmar...@debian.org>
Date: Tue, 21 Jun 2016 17:08:16 +0200
Subject: [PATCH] 1000_gl2ps_tikz-fix-rotated-text.patch: Remove. Applied
 upstream in 1.3.9.

This patch was taken from upstream 1.3.9 and incorporated to 1.3.8-1.3 NMU
to fix #820930.

While it originally fixed a missing brace, keeping it now results in an
extra brace added in #820930 conditions, one by the fixed code in 1.3.9
and another by the applied patch.

Remove it.
---
 .../patches/1000_gl2ps_tikz-fix-rotated-text.patch | 33 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch

diff --git a/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch b/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch
deleted file mode 100644
index bb6ff0c..0000000
--- a/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: gl2psPrintPGFPrimitive misses closing braces for rotated text
- In function gl2psPrintPGFPrimitive, switch case GL2PS_TEXT opens a curly
- brace which is never closed again, if the text is rotated: I discovered
- the problem when trying to produce tikz output with octave, which produced
- broken output when inserting labels to the y -axis.
- Hopes this helps, with kind regards,
- Felix
-Author: Felix
-Bug: https://geuz.org/trac/gl2ps/ticket/11
-Upstream-Commit: https://geuz.org/trac/gl2ps/changeset/601
-Bug-Debian: https://bugs.debian.org/820930
-
-Index: gl2ps/gl2ps.c
-===================================================================
---- gl2ps.orig/gl2ps.c
-+++ gl2ps/gl2ps.c
-@@ -5483,11 +5483,16 @@ static void gl2psPrintPGFPrimitive(void
-             prim->verts[0].rgba[2], prim->data.text->str);
- 
-     fprintf(gl2ps->stream, "}{}{\\pgfusepath{discard}}}");
-+    if(prim->data.text->angle)
-+       fprintf(gl2ps->stream, "}");
-+
-+    fprintf(gl2ps->stream, "\n");
- 
-     if(prim->data.text->angle)
-        fprintf(gl2ps->stream, "}");
- 
-     fprintf(gl2ps->stream, "\n");
-+    
-     break;
-   case GL2PS_SPECIAL :
-     /* alignment contains the format for which the special output text
diff --git a/debian/patches/series b/debian/patches/series
index b320a7b..20745d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1000_gl2ps_tikz-fix-rotated-text.patch
 2000_FixTestLinkage.patch
-- 
2.8.1

-- 
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers

Reply via email to