[gl2ps] 02/04: Refresh patches.

[Anton Gladky]

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

gladk pushed a commit to branch experimental
in repository gl2ps.

commit ad4890fb39b06fc4577f71a7a0155cd16b565d37
Author: Anton Gladky <gladk at debian.org>
Date:   Thu May 19 23:05:43 2016 +0200

    Refresh patches.
---
 debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch | 19 ++++++++++++-------
 debian/patches/2000_FixTestLinkage.patch              | 14 +++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch b/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch
index 42e9f5f..21a60cc 100644
--- a/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch
+++ b/debian/patches/1000_gl2ps_tikz-fix-rotated-text.patch
@@ -10,19 +10,24 @@ Bug: https://geuz.org/trac/gl2ps/ticket/11
 Upstream-Commit: https://geuz.org/trac/gl2ps/changeset/601
 Bug-Debian: https://bugs.debian.org/820930
 
---- a/gl2ps.c
-+++ b/gl2ps.c
-@@ -5447,7 +5447,12 @@
-             prim->verts[0].rgba[0], prim->verts[0].rgba[1],
+Index: gl2ps-1.3.9-source/gl2ps.c
+===================================================================
+--- gl2ps-1.3.9-source.orig/gl2ps.c
++++ gl2ps-1.3.9-source/gl2ps.c
+@@ -5483,11 +5483,16 @@ static void gl2psPrintPGFPrimitive(void
              prim->verts[0].rgba[2], prim->data.text->str);
  
--    fprintf(gl2ps->stream, "}{}{\\pgfusepath{discard}}}\n");
-+    fprintf(gl2ps->stream, "}{}{\\pgfusepath{discard}}}");
-+
+     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/2000_FixTestLinkage.patch b/debian/patches/2000_FixTestLinkage.patch
index e39effb..b11191b 100644
--- a/debian/patches/2000_FixTestLinkage.patch
+++ b/debian/patches/2000_FixTestLinkage.patch
@@ -2,10 +2,10 @@ Description: fix linkage of test-binaries
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-05-19
 
-Index: gl2ps/CMakeLists.txt
+Index: gl2ps-1.3.9-source/CMakeLists.txt
 ===================================================================
---- gl2ps.orig/CMakeLists.txt
-+++ gl2ps/CMakeLists.txt
+--- gl2ps-1.3.9-source.orig/CMakeLists.txt
++++ gl2ps-1.3.9-source/CMakeLists.txt
 @@ -55,6 +55,8 @@ set(GL2PS_EXTRA_VERSION "" CACHE STRING
  set(GL2PS_VERSION "${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}")
  set(GL2PS_VERSION "${GL2PS_VERSION}.${GL2PS_PATCH_VERSION}${GL2PS_EXTRA_VERSION}")
@@ -15,7 +15,7 @@ Index: gl2ps/CMakeLists.txt
  execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE DATE 
                  OUTPUT_STRIP_TRAILING_WHITESPACE)
  if(NOT DATE)
-@@ -113,7 +115,7 @@ if(OPENGL_FOUND)
+@@ -118,7 +120,7 @@ if(OPENGL_FOUND)
    set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
  
    add_library(shared SHARED gl2ps.c gl2ps.h)
@@ -23,8 +23,8 @@ Index: gl2ps/CMakeLists.txt
 +  target_link_libraries(shared ${EXTERNAL_LLICIBRARIES})
    set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps)
    set_target_properties(shared PROPERTIES
-                         VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
-@@ -122,7 +124,7 @@ if(OPENGL_FOUND)
+     VERSION ${GL2PS_MAJOR_VERSION}.${GL2PS_MINOR_VERSION}.${GL2PS_PATCH_VERSION}
+@@ -127,7 +129,7 @@ if(OPENGL_FOUND)
      set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
    endif(MSVC)
  
@@ -33,7 +33,7 @@ Index: gl2ps/CMakeLists.txt
  endif(OPENGL_FOUND)
  
  if(WIN32)
-@@ -133,16 +135,14 @@ endif(WIN32)
+@@ -138,16 +140,14 @@ endif(WIN32)
  
  install(FILES gl2ps.h DESTINATION include)
  install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gl2ps.git