diff -Nru epstool-3.08+repack/debian/changelog epstool-3.09/debian/changelog --- epstool-3.08+repack/debian/changelog 2014-09-13 14:56:09.000000000 +0000 +++ epstool-3.09/debian/changelog 2020-08-31 19:32:12.000000000 +0000 @@ -1,3 +1,55 @@ +epstool (3.09-2~16.04.sav0) xenial; urgency=medium + + * Backport to Xenial + * debian/compat,control: Set compat level to 10 and debhelper BD to (>= 11~) + + -- Rob Savoury Mon, 31 Aug 2020 12:32:12 -0700 + +epstool (3.09-2) unstable; urgency=medium + + * Don't use parallel builds as the makefile is buggy (closes: #932940): + - the underlying problem is unlikely to be fixed soon as upstream is _slow_. + * Bump Standards-Version to 4.3.0 (no changes necessary) + * Bump debhelper compat from 11 to 12 + + -- Philip Rinn Thu, 25 Jul 2019 17:49:17 +0200 + +epstool (3.09-1) unstable; urgency=medium + + * New upstream version: + - I repacked the source as all files hat permission 400. I took the chance + to keep the delta small by converting all files with 'dos2unix'. + * Drop patch 01_fix_open_calls.patch as it's applied upstream + * Add patch 03_cross_buildable.patch to fix FTCBFS (closes: #901237): + - Thanks Helmut Grohne for the patch + * Bump Standards-Version to 4.2.1 (no changes necessary) + + -- Philip Rinn Thu, 13 Sep 2018 21:01:44 +0200 + +epstool (3.08+repack-7) unstable; urgency=medium + + * Fix FTBFS on ia64 (Thanks Adrian Bunk for the patch) (closes: #890348) + * Bump Standards-Version to 4.1.3 (no changes necessary) + * Bump debhelper compat from 10 to 11 + * Update VCS-* URIs to point to salsa.debian.org + + -- Philip Rinn Wed, 14 Feb 2018 10:56:19 +0100 + +epstool (3.08+repack-6) unstable; urgency=medium + + * Mark package as Multi-Arch: foreign (closes: #870840) + * Bump Standards-Version to 4.0.0 (no changes necessary). + + -- Philip Rinn Sun, 06 Aug 2017 13:58:16 +0200 + +epstool (3.08+repack-5) unstable; urgency=medium + + * Use secure URIs for vcs-* in debian/control + * Bump Standards-Version to 3.9.8 (no changes necessary). + * Bump debhelper compat from 9 to 10. + + -- Philip Rinn Mon, 28 Nov 2016 17:52:15 +0100 + epstool (3.08+repack-4) unstable; urgency=medium * Bump Standards-Version to 3.9.5 (no changes necessary). diff -Nru epstool-3.08+repack/debian/compat epstool-3.09/debian/compat --- epstool-3.08+repack/debian/compat 2014-03-13 17:37:25.000000000 +0000 +++ epstool-3.09/debian/compat 2020-08-31 19:32:05.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru epstool-3.08+repack/debian/control epstool-3.09/debian/control --- epstool-3.08+repack/debian/control 2014-03-24 16:52:20.000000000 +0000 +++ epstool-3.09/debian/control 2020-08-31 19:32:03.000000000 +0000 @@ -2,14 +2,15 @@ Section: graphics Priority: optional Maintainer: Philip Rinn -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 -Homepage: http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm -Vcs-Git: git://anonscm.debian.org/collab-maint/epstool.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/epstool.git;a=summary +Build-Depends: debhelper (>= 11~) +Standards-Version: 4.3.0 +Homepage: http://www.ghostgum.com.au/software/epstool.htm +Vcs-Git: https://salsa.debian.org/debian/epstool.git +Vcs-Browser: https://salsa.debian.org/debian/epstool Package: epstool Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, ghostscript Description: edit preview images and fix bounding boxes in EPS files Encapsulated PostScript (EPS) files may contain a preview to be used diff -Nru epstool-3.08+repack/debian/copyright epstool-3.09/debian/copyright --- epstool-3.08+repack/debian/copyright 2014-03-24 16:52:49.000000000 +0000 +++ epstool-3.09/debian/copyright 2018-09-13 18:48:56.000000000 +0000 @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: epstool Upstream-Contact: Russell Lang -Source: http://www.cs.wisc.edu/~ghost/gsview/epstool.htm +Source: http://www.ghostgum.com.au/software/epstool.htm Files: * Copyright: 1993-2005, Ghostgum Software Pty Ltd. diff -Nru epstool-3.08+repack/debian/patches/01_fix_open_calls.patch epstool-3.09/debian/patches/01_fix_open_calls.patch --- epstool-3.08+repack/debian/patches/01_fix_open_calls.patch 2014-03-13 17:37:19.000000000 +0000 +++ epstool-3.09/debian/patches/01_fix_open_calls.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -# Description: open() with O_CREAT needs to get a third "mode" argument. ---- a/src/epstool.c -+++ b/src/epstool.c -@@ -2824,7 +2824,7 @@ - code = -1; - } - if ((code==0) && stdout_name && (hChildStdoutWr == -1)) { -- handle = open(stdout_name, O_WRONLY | O_CREAT); -+ handle = open(stdout_name, O_WRONLY | O_CREAT, 0666); - hChildStdoutWr = dup2(handle, 1); - if (handle != -1) - close(handle); -@@ -2832,7 +2832,7 @@ - code = -1; - } - if ((code==0) && stderr_name && (hChildStderrWr == -1)) { -- handle = open(stderr_name, O_WRONLY | O_CREAT); -+ handle = open(stderr_name, O_WRONLY | O_CREAT, 0666); - hChildStderrWr = dup2(handle, 2); - if (handle != -1) - close(handle); diff -Nru epstool-3.08+repack/debian/patches/02_no_use_gnu.patch epstool-3.09/debian/patches/02_no_use_gnu.patch --- epstool-3.08+repack/debian/patches/02_no_use_gnu.patch 1970-01-01 00:00:00.000000000 +0000 +++ epstool-3.09/debian/patches/02_no_use_gnu.patch 2018-09-13 18:59:13.000000000 +0000 @@ -0,0 +1,22 @@ +Description: src/cplat.h: Don't define __USE_GNU + There were two things wrong with it: + - __USE_GNU is glibc-internal, the external + define is _GNU_SOURCE + - defining such macros after the first include + is wrong, in this case it caused FTBFS on ia64 + . + An option would be to pass -D_GNU_SOURCE + when building, but as far as I can see the + define was not (anymore?) needed at all. +Author: Adrian Bunk + +--- a/src/cplat.h ++++ b/src/cplat.h +@@ -109,7 +109,6 @@ + typedef struct _GdkRgbCmap GdkRgbCmap; + # endif + # include +-# define __USE_GNU /* we might need recursive mutex */ + # include + # include + # define ZLIBNAME "libz.so" diff -Nru epstool-3.08+repack/debian/patches/03_cross_buildable.patch epstool-3.09/debian/patches/03_cross_buildable.patch --- epstool-3.08+repack/debian/patches/03_cross_buildable.patch 1970-01-01 00:00:00.000000000 +0000 +++ epstool-3.09/debian/patches/03_cross_buildable.patch 2018-09-13 19:01:18.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Make epstool cross buildable by not hardcoding gcc as linker +Author: Helmut Grohne +--- a/src/unixcom.mak ++++ b/src/unixcom.mak +@@ -22,8 +22,8 @@ + CCAUX=gcc + CC=gcc + LFLAGS=$(PLINK) $(LIBPNGLIBS) $(GTKLIBS) +-CLINK=gcc $(LDFLAGS) +-LINK=gcc $(LDFLAGS) ++CLINK=$(CC) $(LDFLAGS) ++LINK=$(CC) $(LDFLAGS) + + + COMP=$(CC) -I$(SRCDIR) -I$(OBJDIR) $(CFLAGS) $(GSCFLAGS) diff -Nru epstool-3.08+repack/debian/patches/series epstool-3.09/debian/patches/series --- epstool-3.08+repack/debian/patches/series 2014-03-13 17:37:19.000000000 +0000 +++ epstool-3.09/debian/patches/series 2018-09-13 18:58:33.000000000 +0000 @@ -1,2 +1,2 @@ -01_fix_open_calls.patch - +02_no_use_gnu.patch +03_cross_buildable.patch diff -Nru epstool-3.08+repack/debian/rules epstool-3.09/debian/rules --- epstool-3.08+repack/debian/rules 2014-03-13 17:37:30.000000000 +0000 +++ epstool-3.09/debian/rules 2019-07-25 15:16:47.000000000 +0000 @@ -8,11 +8,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ + dh $@ --no-parallel override_dh_auto_install: override_dh_clean: dh_clean rm -rf bin - diff -Nru epstool-3.08+repack/debian/salsa-ci.yml epstool-3.09/debian/salsa-ci.yml --- epstool-3.08+repack/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ epstool-3.09/debian/salsa-ci.yml 2019-06-18 21:08:39.000000000 +0000 @@ -0,0 +1,5 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + diff -Nru epstool-3.08+repack/debian/watch epstool-3.09/debian/watch --- epstool-3.08+repack/debian/watch 2014-03-13 17:37:19.000000000 +0000 +++ epstool-3.09/debian/watch 2018-09-13 18:48:56.000000000 +0000 @@ -1,4 +1,4 @@ version=3 opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$//i,dversionmangle=s/[-.+~]?(cvs|svn|git|snapshot|pre|hg|repack)(.*)$//i,pasv \ -http://www.cs.wisc.edu/~ghost/gsview/epstool.htm (?:.*/)?epstool-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian uupdate +http://www.ghostgum.com.au/software/epstool.htm (?:.*/)?epstool-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2|) debian uupdate diff -Nru epstool-3.08+repack/doc/cygwin.README epstool-3.09/doc/cygwin.README --- epstool-3.08+repack/doc/cygwin.README 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/doc/cygwin.README 2018-09-13 18:40:35.000000000 +0000 @@ -1,27 +1,27 @@ -Cygwin Release: 3.08-1 -Cygwin package maintainer: James R. Phillips -email: antiskid56_cygwin@yahoo.com +Cygwin Release: 3.09-1 +Cygwin package maintainer: Unknown +email: Unknown To create the binary and source distributions from packaged source: ==== -tar -xjf epstool-3.08-1-src.tar.bz2 -cd epstool-3.08-1 +tar -xjf epstool-3.09-1-src.tar.bz2 +cd epstool-3.09-1 make cygwin ==== Source archive, binary archive and setup.hint will now appear in ./dist To create the binary and source distributions from upstream source: ==== -tar -xzf epstool-3.08.tar.gz -cd epstool-3.08 +tar -xzf epstool-3.09.tar.gz +cd epstool-3.09 make cygwin ==== Source archive, binary archive and setup.hint will now appear in ./dist To recreate the upstream source distribution from packaged source: ===== -tar -xjf epstool-3.08-1-src.tar.bz2 -cd epstool-3.08-1 +tar -xjf epstool-3.09-1-src.tar.bz2 +cd epstool-3.09-1 make epstar ====== diff -Nru epstool-3.08+repack/doc/epstool.htm epstool-3.09/doc/epstool.htm --- epstool-3.08+repack/doc/epstool.htm 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/doc/epstool.htm 2018-09-13 18:40:35.000000000 +0000 @@ -12,7 +12,7 @@

EPSTOOL - Create or extract preview images in EPS files.
-Release date: 2005-06-10 +Release date: 2015-03-15

Table of contents @@ -795,7 +795,7 @@

For more information about licensing, please refer to http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, + 25 Kennedy St, Glen Waverley VIC 3150, AUSTRALIA, Fax +61 3 9886 6616.

@@ -846,6 +846,15 @@

+3.09 2015-03-15 +

+

+Windows makefile update for recent compilers. +
+Bug fix. +

+ +

3.08 2005-06-10

@@ -1090,7 +1099,7 @@ Added #pragma pack(1) needed by MSVC++.
Modified BMP reading so it works even if byte packing not used. -
, +
BMP reading might now work with big-endian architectures, so might be able to use BMP devices on Unix (if compiled into Ghostscript). (Untested). diff -Nru epstool-3.08+repack/epstool.txt epstool-3.09/epstool.txt --- epstool-3.08+repack/epstool.txt 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/epstool.txt 2018-09-13 18:40:35.000000000 +0000 @@ -1 +1 @@ -Documentation for epstool is in doc/epstool.htm +"Documentation for epstool is in doc/epstool.htm" diff -Nru epstool-3.08+repack/makefile epstool-3.09/makefile --- epstool-3.08+repack/makefile 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/makefile 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: epstool.mak,v 1.9 2005/03/25 03:37:59 ghostgum Exp $ # Make epstool for GNU/Linux diff -Nru epstool-3.08+repack/src/calloc.c epstool-3.09/src/calloc.c --- epstool-3.08+repack/src/calloc.c 2005-06-10 09:40:59.000000000 +0000 +++ epstool-3.09/src/calloc.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: calloc.c,v 1.10 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/capp.c epstool-3.09/src/capp.c --- epstool-3.08+repack/src/capp.c 2005-06-10 09:40:59.000000000 +0000 +++ epstool-3.09/src/capp.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: capp.c,v 1.20 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/capp.h epstool-3.09/src/capp.h --- epstool-3.08+repack/src/capp.h 2005-06-10 09:40:59.000000000 +0000 +++ epstool-3.09/src/capp.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: capp.h,v 1.7 2003/01/18 02:36:40 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cargs.h epstool-3.09/src/cargs.h --- epstool-3.08+repack/src/cargs.h 2005-06-10 09:40:59.000000000 +0000 +++ epstool-3.09/src/cargs.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cargs.h,v 1.1 2002/04/17 11:39:07 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cbmp.c epstool-3.09/src/cbmp.c --- epstool-3.08+repack/src/cbmp.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cbmp.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cbmp.c,v 1.17 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cbmp.h epstool-3.09/src/cbmp.h --- epstool-3.08+repack/src/cbmp.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cbmp.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cbmp.h,v 1.5 2003/08/08 23:58:14 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cdll.h epstool-3.09/src/cdll.h --- epstool-3.08+repack/src/cdll.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cdll.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cdll.h,v 1.2 2002/05/27 09:40:10 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cdoc.c epstool-3.09/src/cdoc.c --- epstool-3.08+repack/src/cdoc.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cdoc.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cdoc.c,v 1.19 2005/06/10 08:45:36 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cdoc.h epstool-3.09/src/cdoc.h --- epstool-3.08+repack/src/cdoc.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cdoc.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cdoc.h,v 1.9 2005/01/14 08:15:52 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/ceps.c epstool-3.09/src/ceps.c --- epstool-3.08+repack/src/ceps.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/ceps.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: ceps.c,v 1.43 2005/06/10 08:45:36 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/ceps.h epstool-3.09/src/ceps.h --- epstool-3.08+repack/src/ceps.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/ceps.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: ceps.h,v 1.13 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cfile.c epstool-3.09/src/cfile.c --- epstool-3.08+repack/src/cfile.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cfile.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cfile.c,v 1.5 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cfile.h epstool-3.09/src/cfile.h --- epstool-3.08+repack/src/cfile.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cfile.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cfile.h,v 1.4 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cgssrv.h epstool-3.09/src/cgssrv.h --- epstool-3.08+repack/src/cgssrv.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cgssrv.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cgssrv.h,v 1.6 2003/01/18 02:36:40 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cimg.c epstool-3.09/src/cimg.c --- epstool-3.08+repack/src/cimg.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cimg.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cimg.c,v 1.21 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cimg.h epstool-3.09/src/cimg.h --- epstool-3.08+repack/src/cimg.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cimg.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cimg.h,v 1.16 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/clfile.c epstool-3.09/src/clfile.c --- epstool-3.08+repack/src/clfile.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/clfile.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: clfile.c,v 1.5 2004/01/16 08:55:37 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/clzw.c epstool-3.09/src/clzw.c --- epstool-3.08+repack/src/clzw.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/clzw.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: clzw.c,v 1.2 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/clzw.h epstool-3.09/src/clzw.h --- epstool-3.08+repack/src/clzw.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/clzw.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: clzw.h,v 1.1 2004/07/08 09:14:34 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cmac.c epstool-3.09/src/cmac.c --- epstool-3.08+repack/src/cmac.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cmac.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cmac.c,v 1.11 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cmac.h epstool-3.09/src/cmac.h --- epstool-3.08+repack/src/cmac.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cmac.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cmac.h,v 1.3 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cmbcs.c epstool-3.09/src/cmbcs.c --- epstool-3.08+repack/src/cmbcs.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cmbcs.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cmbcs.c,v 1.6 2002/08/01 08:27:52 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/common.h epstool-3.09/src/common.h --- epstool-3.08+repack/src/common.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/common.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: common.h,v 1.15 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/common.mak epstool-3.09/src/common.mak --- epstool-3.08+repack/src/common.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/common.mak 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: common.mak,v 1.34 2005/06/10 09:39:24 ghostgum Exp $ # Common makefile for GSview @@ -36,8 +31,8 @@ OBJS=$(OBJCOM1) $(OBJCOM2) $(OBJCOM3) $(OBJPLAT) -EPSTOOL_VERSION=3.08 -EPSTOOL_DATE=2005-06-10 +EPSTOOL_VERSION=3.09 +EPSTOOL_DATE=2015-03-15 EPSOBJS=$(EPSOBJPLAT) \ $(OD)epstool$(OBJ) \ $(OBJCOM1) diff -Nru epstool-3.08+repack/src/copt.h epstool-3.09/src/copt.h --- epstool-3.08+repack/src/copt.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/copt.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: copt.h,v 1.10 2003/01/29 06:55:17 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cpagec.h epstool-3.09/src/cpagec.h --- epstool-3.08+repack/src/cpagec.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cpagec.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cpagec.h,v 1.1 2002/04/17 11:39:07 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cpdfscan.c epstool-3.09/src/cpdfscan.c --- epstool-3.08+repack/src/cpdfscan.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cpdfscan.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cpdfscan.c,v 1.7 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cpdfscan.h epstool-3.09/src/cpdfscan.h --- epstool-3.08+repack/src/cpdfscan.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cpdfscan.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cpdfscan.h,v 1.2 2002/07/26 12:09:06 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cplat.h epstool-3.09/src/cplat.h --- epstool-3.08+repack/src/cplat.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cplat.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cplat.h,v 1.17 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cprofile.h epstool-3.09/src/cprofile.h --- epstool-3.08+repack/src/cprofile.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cprofile.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cprofile.h,v 1.2 2002/05/27 09:43:38 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cps.c epstool-3.09/src/cps.c --- epstool-3.08+repack/src/cps.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cps.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cps.c,v 1.7 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cps.h epstool-3.09/src/cps.h --- epstool-3.08+repack/src/cps.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cps.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cps.h,v 1.2 2003/01/12 06:32:44 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/cres.h epstool-3.09/src/cres.h --- epstool-3.08+repack/src/cres.h 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/cres.h 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: cres.h,v 1.4 2003/01/30 09:38:01 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/dscparse.c epstool-3.09/src/dscparse.c --- epstool-3.08+repack/src/dscparse.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/dscparse.c 2018-09-13 18:40:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2005, Ghostgum Software Pty Ltd. All rights reserved. +/* Copyright (C) 2000-2015, Ghostgum Software Pty Ltd. All rights reserved. This file is part of GSview. @@ -2278,29 +2278,39 @@ dsc_save_line(dsc); if (IS_DSC(line, "%%Pages:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_PAGES; if (dsc_parse_pages(dsc) != 0) return CDSC_ERROR; } else if (IS_DSC(line, "%%Creator:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_CREATOR; dsc->dsc_creator = dsc_add_line(dsc, dsc->line+10, dsc->line_length-10); if (dsc->dsc_creator==NULL) return CDSC_ERROR; } else if (IS_DSC(line, "%%CreationDate:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_CREATIONDATE; dsc->dsc_date = dsc_add_line(dsc, dsc->line+15, dsc->line_length-15); if (dsc->dsc_date==NULL) return CDSC_ERROR; } else if (IS_DSC(line, "%%Title:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_TITLE; dsc->dsc_title = dsc_add_line(dsc, dsc->line+8, dsc->line_length-8); if (dsc->dsc_title==NULL) return CDSC_ERROR; } else if (IS_DSC(line, "%%For:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_FOR; dsc->dsc_for = dsc_add_line(dsc, dsc->line+6, dsc->line_length-6); if (dsc->dsc_for==NULL) @@ -2346,11 +2356,15 @@ return CDSC_ERROR; } else if (IS_DSC(line, "%%PageOrder:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_PAGEORDER; if (dsc_parse_order(dsc)) return CDSC_ERROR; } else if (IS_DSC(line, "%%DocumentMedia:")) { + if (continued) + return CDSC_ERROR; dsc->id = CDSC_DOCUMENTMEDIA; if (dsc_parse_document_media(dsc)) return CDSC_ERROR; @@ -3504,6 +3518,8 @@ dsc_alloc_string(CDSC *dsc, const char *str, int len) { char *p; + if (len < 0) + return NULL; if (dsc->string_head == NULL) { dsc->string_head = (CDSCSTRING *)dsc_memalloc(dsc, sizeof(CDSCSTRING)); if (dsc->string_head == NULL) @@ -3553,6 +3569,8 @@ { char *newline; unsigned int i; + if (len > CDSC_STRING_CHUNK - 1) + return NULL; while (len && (IS_WHITE(*line))) { len--; line++; diff -Nru epstool-3.08+repack/src/epstool.c epstool-3.09/src/epstool.c --- epstool-3.08+repack/src/epstool.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/epstool.c 2018-09-13 18:40:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2005 Ghostgum Software Pty Ltd. All rights reserved. +/* Copyright (C) 1995-2015 Ghostgum Software Pty Ltd. All rights reserved. This software is provided AS-IS with no warranty, either express or implied. @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: epstool.c,v 1.69 2005/06/10 08:45:36 ghostgum Exp $ */ @@ -44,9 +39,9 @@ #endif const char *epstool_name = "epstool"; -const char *epstool_version = "3.08"; /* should be EPSTOOL_VERSION */ -const char *epstool_date = "2005-06-06"; /* should be EPSTOOL_DATE */ -const char *copyright = "Copyright 1995-2005 Ghostgum Software Pty Ltd"; +const char *epstool_version = "3.09"; /* should be EPSTOOL_VERSION */ +const char *epstool_date = "2015-03-13"; /* should be EPSTOOL_DATE */ +const char *copyright = "Copyright 1995-2015 Ghostgum Software Pty Ltd"; const char *cmd_help = "\ Commands (one only):\n\ @@ -2824,7 +2819,7 @@ code = -1; } if ((code==0) && stdout_name && (hChildStdoutWr == -1)) { - handle = open(stdout_name, O_WRONLY | O_CREAT); + handle = open(stdout_name, O_WRONLY | O_CREAT, 0666); hChildStdoutWr = dup2(handle, 1); if (handle != -1) close(handle); @@ -2832,7 +2827,7 @@ code = -1; } if ((code==0) && stderr_name && (hChildStderrWr == -1)) { - handle = open(stderr_name, O_WRONLY | O_CREAT); + handle = open(stderr_name, O_WRONLY | O_CREAT, 0666); hChildStderrWr = dup2(handle, 2); if (handle != -1) close(handle); diff -Nru epstool-3.08+repack/src/epstool.mak epstool-3.09/src/epstool.mak --- epstool-3.08+repack/src/epstool.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/epstool.mak 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: epstool.mak,v 1.9 2005/03/25 03:37:59 ghostgum Exp $ # Make epstool for GNU/Linux diff -Nru epstool-3.08+repack/src/os2.mak epstool-3.09/src/os2.mak --- epstool-3.08+repack/src/os2.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/os2.mak 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: os2.mak,v 1.1 2005/06/09 23:02:02 ghostgum Exp $ # Make epstool for OS/2 diff -Nru epstool-3.08+repack/src/unixcom.mak epstool-3.09/src/unixcom.mak --- epstool-3.08+repack/src/unixcom.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/unixcom.mak 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: unixcom.mak,v 1.2 2005/01/11 11:40:19 ghostgum Exp $ # Unix common makefile diff -Nru epstool-3.08+repack/src/unix.mak epstool-3.09/src/unix.mak --- epstool-3.08+repack/src/unix.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/unix.mak 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: unix.mak,v 1.24 2005/06/10 09:39:24 ghostgum Exp $ # Unix makefile for GSview diff -Nru epstool-3.08+repack/src/xdll.c epstool-3.09/src/xdll.c --- epstool-3.08+repack/src/xdll.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/xdll.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: xdll.c,v 1.3 2003/05/06 13:17:40 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/src/xnodll.c epstool-3.09/src/xnodll.c --- epstool-3.08+repack/src/xnodll.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/src/xnodll.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: xnodll.c,v 1.2 2004/11/29 08:09:33 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/srcwin/epstool.mak epstool-3.09/srcwin/epstool.mak --- epstool-3.08+repack/srcwin/epstool.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/srcwin/epstool.mak 2018-09-13 18:40:35.000000000 +0000 @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: epstool.mak,v 1.1.2.1 2004/11/28 01:02:47 ghostgum Exp $ # Make epstool for MS-Windows diff -Nru epstool-3.08+repack/srcwin/wdll.c epstool-3.09/srcwin/wdll.c --- epstool-3.08+repack/srcwin/wdll.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/srcwin/wdll.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ /* $Id: wdll.c,v 1.1.2.6 2005/06/10 09:39:24 ghostgum Exp $ */ diff -Nru epstool-3.08+repack/srcwin/wfile.c epstool-3.09/srcwin/wfile.c --- epstool-3.08+repack/srcwin/wfile.c 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/srcwin/wfile.c 2018-09-13 18:40:35.000000000 +0000 @@ -6,11 +6,6 @@ This software is distributed under licence and may not be copied, modified or distributed except as expressly authorised under the terms of the licence contained in the file LICENCE in this distribution. - - For more information about licensing, please refer to - http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, - 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, - Fax +61 3 9886 6616. */ diff -Nru epstool-3.08+repack/srcwin/windows.mak epstool-3.09/srcwin/windows.mak --- epstool-3.08+repack/srcwin/windows.mak 2005-06-10 09:41:00.000000000 +0000 +++ epstool-3.09/srcwin/windows.mak 2018-09-13 18:40:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2005 Ghostgum Software Pty Ltd. All rights reserved. +# Copyright (C) 2002-2015 Ghostgum Software Pty Ltd. All rights reserved. # # This software is provided AS-IS with no warranty, either express or # implied. @@ -7,11 +7,6 @@ # modified or distributed except as expressly authorised under the terms # of the licence contained in the file LICENCE in this distribution. # -# For more information about licensing, please refer to -# http://www.ghostgum.com.au/ or contact Ghostsgum Software Pty Ltd, -# 218 Gallaghers Rd, Glen Waverley VIC 3150, AUSTRALIA, -# Fax +61 3 9886 6616. -# # $Id: windows.mak,v 1.1.2.25 2005/06/10 09:39:24 ghostgum Exp $ # Windows makefile for MSVC @@ -33,6 +28,15 @@ !if "$(_NMAKE_VER)" == "8.00.40607.16" VCVER=8 !endif +!if "$(_NMAKE_VER)" == "9.00.21022.08" +VCVER=9 +!endif +!if "$(_NMAKE_VER)" == "9.00.30729.01" +VCVER=9 +!endif +!if "$(_NMAKE_VER)" == "10.00.30319.01" +VCVER=10 +!endif !endif # Edit VCVER and DEVBASE as required @@ -79,6 +83,14 @@ !if $(VCVER) == 8 DEVBASE=$(VCDRIVE)\$(PROGFILESX86)\Microsoft Visual Studio 8 !endif +!if $(VCVER) == 9 +DEVBASE=$(PROGRAMFILES)\Microsoft Visual Studio 9.0 +COMMONBASE=$(PROGRAMFILES)\Microsoft SDKs\Windows\v6.0A +!endif +!if $(VCVER) == 10 +DEVBASE=$(PROGRAMFILES)\Microsoft Visual Studio 10.0 +COMMONBASE=$(PROGRAMFILES)\Microsoft SDKs\Windows\v6.0A +!endif # DEBUG=1 for Debugging options DEBUG=1 @@ -108,6 +120,16 @@ COMPBASE = $(DEVBASE)\VC PLATLIBDIR=$(COMPBASE)\PlatformSDK\lib !endif +!if ($(VCVER) == 9) +COMPBASE = $(DEVBASE)\VC +PLATLIBDIR=$(COMMONBASE)\lib +INCPLAT=-I"$(COMMONBASE)\Include" +!endif +!if ($(VCVER) == 10) +COMPBASE = $(DEVBASE)\VC +PLATLIBDIR=$(COMMONBASE)\lib +INCPLAT=-I"$(COMMONBASE)\Include" +!endif # MSVC 8 (2005) warns about deprecated common functions like fopen. !if $(VCVER) == 8 @@ -127,7 +149,7 @@ UNICODEDEF=-DUNICODE !endif -CDEFS=-D_Windows -D__WIN32__ -I"$(INCDIR)" $(UNICODEDEF) $(LIBPNGCFLAGS) $(LARGEFILES) +CDEFS=-D_Windows -D__WIN32__ $(INCPLAT) -I"$(INCDIR)" $(UNICODEDEF) $(LIBPNGCFLAGS) $(LARGEFILES) WINEXT=32 CFLAGS=$(CDEFS) /MT /nologo /W4 $(VC8WARN) @@ -183,6 +205,20 @@ HC="$(DEVBASE)\VC\bin\hcw" /C /E RCOMP="$(DEVBASE)\VC\bin\rc" -D_MSC_VER $(CDEFS) $(RIFLAGS) !endif +!if $(VCVER) == 9 +# Help Compiler is no longer included in the SDK. +# Search on the Internet for hcw403_setup.zip +HC="$(PROGRAMFILES)\Help Workshop\hcw" /C /E +HTMLHELP="C:\Program Files\HTML Help Workshop\hhc.exe" +RCOMP="$(COMMONBASE)\bin\rc" -D_MSC_VER $(CDEFS) $(RIFLAGS) +!endif +!if $(VCVER) == 10 +# Help Compiler is no longer included in the SDK. +# Search on the Internet for hcw403_setup.zip +HC="$(PROGRAMFILES)\Help Workshop\hcw" /C /E +HTMLHELP="C:\Program Files\HTML Help Workshop\hhc.exe" +RCOMP="$(COMMONBASE)\bin\rc" -D_MSC_VER $(CDEFS) $(RIFLAGS) +!endif COMP=$(CC) -I$(SRCDIR) -I$(SRCWINDIR) -I$(OBJDIR) $(CFLAGS)