[gl2ps] 02/15: Refresh patches, remove outdated.

Thu May 19 20:47:30 UTC 2016

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

gladk pushed a commit to branch master
in repository gl2ps.

commit 355710dc93b62d7adb31f77d9103b29c4ec4bfec
Author: Anton Gladky <gladk at debian.org>
Date:   Thu May 19 21:52:02 2016 +0200

    Refresh patches, remove outdated.
---
 debian/patches/2000_FixTestLinkage.patch | 38 ++++++++++++++++++++++++++
 debian/patches/buildsys.diff             | 47 --------------------------------
 debian/patches/linkGL.diff               | 13 ---------
 debian/patches/series                    |  4 +--
 debian/patches/undef.patch               | 24 ----------------
 5 files changed, 39 insertions(+), 87 deletions(-)

diff --git a/debian/patches/2000_FixTestLinkage.patch b/debian/patches/2000_FixTestLinkage.patch
new file mode 100644
index 0000000..b059deb
--- /dev/null
+++ b/debian/patches/2000_FixTestLinkage.patch
@@ -0,0 +1,38 @@
+Description: fix linkage of test-binaries
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-05-19
+
+Index: gl2ps-1.3.8-source/CMakeLists.txt
+===================================================================
+--- gl2ps-1.3.8-source.orig/CMakeLists.txt
++++ gl2ps-1.3.8-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}")
+ 
++INCLUDE(GNUInstallDirs)
++
+ execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE DATE 
+                 OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT DATE)
+@@ -122,7 +124,7 @@ if(OPENGL_FOUND)
+     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+   endif(MSVC)
+ 
+-  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
++  install(TARGETS lib shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif(OPENGL_FOUND)
+ 
+ if(WIN32)
+@@ -140,9 +142,9 @@ install(FILES ${CMAKE_SOURCE_DIR}/gl2psT
+ 
+ if(GLUT_FOUND)
+   add_executable(gl2psTest WIN32 gl2psTest.c)
+-  target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
++  target_link_libraries(gl2psTest shared ${EXTERNAL_LIBRARIES})
+   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+-  target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
++  target_link_libraries(gl2psTestSimple shared ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
+ 
+ find_package(LATEX)
diff --git a/debian/patches/buildsys.diff b/debian/patches/buildsys.diff
deleted file mode 100644
index 875c7e1..0000000
--- a/debian/patches/buildsys.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up gl2ps-1.3.3/Makefile.b gl2ps-1.3.3/Makefile
---- gl2ps-1.3.3/Makefile.b	2009-08-23 19:58:39.000000000 +0200
-+++ gl2ps-1.3.3/Makefile	2009-08-23 19:47:15.000000000 +0200
-@@ -0,0 +1,35 @@
-+OPTFLAGS = -O2 -Wall
-+EXTRALIBS = -lGL -lm
-+CFLAGS += $(OPTFLAGS) -fPIC
-+LDFLAGS += $(EXTRALIBS)
-+LDFLAGS += -Wl,--version-script=Version
-+MAJOR = 0
-+MINOR = 0
-+MICRO = 0
-+NAME = gl2ps
-+HEADERS = gl2ps.h
-+OBJS = gl2ps.o
-+SLIBNAME_SO = lib$(NAME).so
-+SLIBNAME_WITH_MAJOR = $(SLIBNAME_SO).$(MAJOR)
-+SLIBNAME = $(SLIBNAME_WITH_MAJOR).$(MINOR).$(MICRO)
-+SLIBDIR = /usr/lib
-+INCLUDEDIR = /usr/include
-+
-+%.o: %.c
-+	$(CC) $(CPPFLAGS) -fPIC $(CFLAGS) -c -o $@ $<
-+
-+all: $(SLIBNAME)
-+
-+clean:
-+	rm -f $(OBJS) $(SLIBNAME)
-+
-+$(SLIBNAME): $(OBJS)
-+	$(CC) -shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR) -o $@ $(filter %.o,$^) $(LDFLAGS)
-+
-+install:
-+	mkdir -p $(DESTDIR)$(SLIBDIR)
-+	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-+	install -pm755 $(SLIBNAME) $(DESTDIR)$(SLIBDIR)
-+	ln -s $(SLIBNAME) $(DESTDIR)$(SLIBDIR)/$(SLIBNAME_WITH_MAJOR)
-+	ln -s $(SLIBNAME_WITH_MAJOR) $(DESTDIR)$(SLIBDIR)/$(SLIBNAME_SO)
-+	install -pm644 $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
-diff -up gl2ps-1.3.3/Version.b gl2ps-1.3.3/Version
---- gl2ps-1.3.3/Version.b	2009-08-23 19:58:44.000000000 +0200
-+++ gl2ps-1.3.3/Version	2009-08-23 19:58:01.000000000 +0200
-@@ -0,0 +1,4 @@
-+GL2PS_1.3.3 {
-+    global:
-+        gl2psGetOptions;
-+};
diff --git a/debian/patches/linkGL.diff b/debian/patches/linkGL.diff
deleted file mode 100644
index 9e8d9af..0000000
--- a/debian/patches/linkGL.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gl2ps-1.3.5/Makefile
-===================================================================
---- gl2ps-1.3.5.orig/Makefile	2009-12-18 17:56:55.000000000 +0100
-+++ gl2ps-1.3.5/Makefile	2009-12-18 17:58:19.000000000 +0100
-@@ -2,7 +2,7 @@
- EXTRALIBS = -lGL -lm
- CFLAGS += $(OPTFLAGS) -fPIC
- LDFLAGS += $(EXTRALIBS)
--LDFLAGS += -Wl,--version-script=Version
-+LDFLAGS += -Wl,--version-script=Version -Wl,--no-add-needed
- MAJOR = 0
- MINOR = 0
- MICRO = 0
diff --git a/debian/patches/series b/debian/patches/series
index 345dd3b..b320a7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-buildsys.diff
-linkGL.diff
-undef.patch
 1000_gl2ps_tikz-fix-rotated-text.patch
+2000_FixTestLinkage.patch
diff --git a/debian/patches/undef.patch b/debian/patches/undef.patch
deleted file mode 100644
index 6adb1a7..0000000
--- a/debian/patches/undef.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix undefined symbols
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/775403
-
---- gl2ps-1.3.8.orig/Makefile
-+++ gl2ps-1.3.8/Makefile
-@@ -2,7 +2,7 @@ OPTFLAGS = -O2 -Wall
- EXTRALIBS = -lGL -lm
- CFLAGS += $(OPTFLAGS) -fPIC
- LDFLAGS += $(EXTRALIBS)
--LDFLAGS += -Wl,--version-script=Version -Wl,--no-add-needed
-+EXTRALIBS += -Wl,--version-script=Version -Wl,--no-add-needed
- MAJOR = 0
- MINOR = 0
- MICRO = 0
-@@ -24,7 +24,7 @@ clean:
- 	rm -f $(OBJS) $(SLIBNAME)
- 
- $(SLIBNAME): $(OBJS)
--	$(CC) -shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR) -o $@ $(filter %.o,$^) $(LDFLAGS)
-+	$(CC) -shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR) -o $@ $(filter %.o,$^) $(LDFLAGS) $(EXTRALIBS)
- 
- install:
- 	mkdir -p $(DESTDIR)$(SLIBDIR)

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

