--- xpaint-2.6.2.orig/XPaint.ad.in +++ xpaint-2.6.2/XPaint.ad.in @@ -114,7 +114,7 @@ XPaint*toolbox*text.popup-menu.label: Text XPaint*toolbox*text.popup-menu.select.label: Select Font... XPaint*toolbox*selectBox.popup-menu.label: Select Box/Ellipse -XPaint*toolbox*Lasso.popup-menu.label: Lasso +XPaint*toolbox*lasso.popup-menu.label: Lasso XPaint*toolbox*selectPoly.popup-menu.label: Select Polygon ! Next 3 lines are common for all select operators XPaint*toolbox*popup-menu.shape.label: All Colors @@ -151,7 +151,7 @@ Canvas*menu*file*saveconfig.label: Save Palette... Canvas*menu*file*loadconfig.label: Load Palette... Canvas*menu*file*revert.label: Revert... -Canvas*menu*file*print.label: Print & XV...|xv -iconic -cmap & +Canvas*menu*file*print.label: Print & Preview...|eeyes & Canvas*menu*file*close.label: Close Canvas*menu*edit.label: Edit --- xpaint-2.6.2.orig/Local.config +++ xpaint-2.6.2/Local.config @@ -65,8 +65,8 @@ #define HaveTIFF #ifdef HaveTIFF -TIFF_LIB = -L/usr/lib -ltiff -TIFF_INCLUDE = -I/usr/include/tiff +TIFF_LIB = -ltiff +TIFF_INCLUDE = #endif XCOMM If you have the JPEG library, make HaveJPEG defined @@ -76,8 +76,8 @@ #define HaveJPEG #ifdef HaveJPEG -JPEG_LIB = -L/usr/lib -ljpeg -JPEG_INCLUDE = -I/usr/include/jpeg +JPEG_LIB = -ljpeg +JPEG_INCLUDE = #endif XCOMM If you have the PNG library, make HavePNG defined @@ -87,8 +87,8 @@ #define HavePNG #ifdef HavePNG -PNG_LIB = -L/usr/lib -lpng -lz -PNG_INCLUDE = -I/usr/include/png +PNG_LIB = -lpng -lz +PNG_INCLUDE = #endif XCOMM If you are running SunOS and get an error with the following undefined @@ -130,7 +130,7 @@ XCOMM I have been told that compilation on AIX 3.2.5/IBM RS/6000 requires XCOMM that you use the 'qlanglvl=ansi' flag. -XCOMM CDEBUGFLAGS = +CDEBUGFLAGS = -g -O2 -Wall #define PassCDebugFlags CDEBUGFLAGS='$(CDEBUGFLAGS)' XCOMM This should take care of everything needed for BSD. --- xpaint-2.6.2.orig/readRC.c +++ xpaint-2.6.2/readRC.c @@ -66,17 +66,20 @@ { char *n; char xx[256]; + int fd; if ((n = getenv("TMPDIR")) == NULL) n = "/tmp"; - strcpy(xx, n); - strcat(xx, "/XPaintXXXXXXX"); - n = mktemp(xx); + memset(xx, 0, sizeof(xx)); + strncpy(xx, n, sizeof(xx) - strlen("/XPaintXXXXXXX") - 1); + strncat(xx, "/XPaintXXXXXXX", sizeof(xx) - 1); + fd = mkstemp(xx); + if (!fd) return NULL; tempName[++tempIndex] = XtNewString(n); if (np != NULL) *np = tempName[tempIndex]; - return fopen(tempName[tempIndex], "w"); + return fdopen(fd, "w"); /* and the fclose will take care of it */ } static void --- xpaint-2.6.2.orig/rw/rwTable.c +++ xpaint-2.6.2/rw/rwTable.c @@ -122,7 +122,6 @@ static Image * readMagic(char *file) { - extern int errno; int i; errno = 0; @@ -244,7 +243,6 @@ #endif #endif #endif - extern int errno; if (RWtableMsg[0] == '\0') { if (errno == 0) --- xpaint-2.6.2.orig/rw/writePS.c +++ xpaint-2.6.2/rw/writePS.c @@ -19,6 +19,7 @@ #if defined(sco) || defined(__CYGWIN__) #include #else +#include /* Let's include this here, too: ctime(3) */ #include #endif #include --- xpaint-2.6.2.orig/rw/writeGIF.c +++ xpaint-2.6.2/rw/writeGIF.c @@ -40,9 +40,7 @@ #include #include "image.h" #include "rwTable.h" -#ifdef __EMX__ #include -#endif #define MAXCOLORS 256 @@ -84,9 +82,6 @@ int WriteGIF(char *file, Image * outImage) { -#ifndef __EMX__ - extern int errno; -#endif int r[MAXCOLORS], g[MAXCOLORS], b[MAXCOLORS]; int i, bpp; FILE *fp; --- xpaint-2.6.2.orig/rw/libpnmrw.c +++ xpaint-2.6.2/rw/libpnmrw.c @@ -46,9 +46,7 @@ void *malloc(int); void free(void *); -#if defined(__EMX__) || defined(__CYGWIN__) #include -#endif /* Definitions. */ @@ -144,9 +142,6 @@ #endif #endif #endif -#if !defined(__EMX__) || defined(__CYGWIN__) - extern int errno; -#endif char *e; e = sys_errlist[errno]; --- xpaint-2.6.2.orig/debian/dirs +++ xpaint-2.6.2/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- xpaint-2.6.2.orig/debian/copyright +++ xpaint-2.6.2/debian/copyright @@ -0,0 +1,73 @@ +This package was debianized by Mark W. Eichin eichin@kitten.gen.ma.us on +Wed, 26 Feb 1997 12:37:58 -0500. + +As of 2001-03-17 it is available from + http://home.worldonline.dk/~torsten/xpaint/ +(Torsten Martinsen is the current maintainer, do *not* send bug reports +to David Koblas about this version.) + +Note that parts of this are GPL and parts are redistributable as-is. + +Copyright: + +Copyright (C) 1990, 1991, 1992, 1993, David Koblas +Copyright (C) 1995, 1996, 1997, 1998, Torsten Martinsen +Copyright (C) 1996-2000, Greg Roelofs +Copyright (C) 1997, Scott D. Nelson + +Permission to use, copy, modify, and to distribute this software and +its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. There are no representations about the +suitability of this software for any purpose. This software is +provided "as is" without express or implied warranty. + +Also, misc.c AutoCrop() is: + +Copyright (C) 1988 by Jef Poskanzer. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. This software is provided "as is" without express or +implied warranty. + +likewise: +rw/libpnmrw.c: Copyright (C) 1988, 1989, 1991, 1992 by Jef Poskanzer. +rw/libpnmrw.h: Copyright (C) 1988, 1989, 1991 by Jef Poskanzer. +rw/readWriteXWD.c: Copyright (C) 1989, 1991 by Jef Poskanzer. + +also, snapshot.c has code taken from xsnap.c by: + +Copyright 1989 Clauss Strauch + cbs@cad.cs.cmu.edu + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted. +This software is provided "as is", without express or implied warranty. + +also, splineOp.c is: + +Copyright 2000, J.-P. Demailly (demailly@fourier.ujf-grenoble.fr) + +Permission to use, copy, modify, and to distribute this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all +copies and that both that copyright notice and this permission +notice appear in supporting documentation. There is no +representations about the suitability of this software for +any purpose. this software is provided "as is" without express +or implied warranty. + +texture.c is: + +Copyright 1996 by Torsten Martinsen +Copyright 1994 by Jer Johnson + +This is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + --- xpaint-2.6.2.orig/debian/control +++ xpaint-2.6.2/debian/control @@ -0,0 +1,14 @@ +Source: xpaint +Section: graphics +Priority: optional +Maintainer: Mark W. Eichin +Build-Depends: debhelper (>> 2.0), libxaw6-dev, xlibs-dev, xutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff4-dev +Standards-Version: 3.5.2 + +Package: xpaint +Architecture: any +Depends: ${shlibs:Depends} +Suggests: netpbm, eeyes +Description: reasonably versatile X-based image editing tool + In addition to the traditional X bitmap and X pixmap image file formats, + xpaint also supports JPEGs and PNGs. --- xpaint-2.6.2.orig/debian/changelog +++ xpaint-2.6.2/debian/changelog @@ -0,0 +1,122 @@ +xpaint (2.6.2-2.2ubuntu1) warty; urgency=low + + * Build-depend: libtiff4-dev + + -- LaMont Jones Tue, 24 Aug 2004 07:14:21 -0600 + +xpaint (2.6.2-2.2) unstable; urgency=low + + * remove declarations of "extern int errno;" as required by ansi-C + (Closes: #237032) + + -- Goswin von Brederlow Sat, 17 Apr 2004 19:00:15 +0100 + +xpaint (2.6.2-2.1) unstable; urgency=low + + * NMU (but maybe this package should be orphaned) + - Fixed FTBFS by changing Build-Depends to libxaw6-dev (Closes: #170000) + + -- Javier Fernandez-Sanguino Pen~a Thu, 8 Jan 2004 23:06:15 +0100 + +xpaint (2.6.2-2) unstable; urgency=low, closes=90050 + + * readRC.c (openTemp): use mkstemp and fdopen instead of mktemp and + fopen. (We're still reopening by name later, when readRC passes the + resulting pattern or brush to ReadMagic, but that's ok; mkstemp's use + of O_EXCL has nailed it down already.) (Closes: #90050) + + -- Mark W. Eichin Wed, 30 Jan 2002 03:23:57 -0500 + +xpaint (2.6.2-1) unstable; urgency=low, closes=71411 126618 61059 + + * New upstream release. (Closes: #71411 #61059) + * rw/writePS.c: use time.h to get ctime declaration (from + jdaily@progeny.com, noticed in ia64 porting.) (Closes: #126618) + * XPaint.ad.in: use eeyes instead of (non-free) xv as preview and print + tool (in a user-overridable resource.) + * debian/control: Suggests eeyes. + + -- Mark W. Eichin Wed, 30 Jan 2002 01:41:27 -0500 + +xpaint (2.6.1-1) unstable; urgency=low, closes=80915 80058 86325 86030 67976 71411 + + * New upstream version. Thanks for all the NMU's. + (Closes: #80915 #80058 #86325 #86030 #67976 #71411) + * debian/copyright: update with all copyright references. Note the one + GPL'ed file, and the new download location. + * debian/control: update my email address. + * debian/menu: Added bitmap hint (Closes: #80058). + + -- Mark W. Eichin Sat, 17 Mar 2001 19:07:23 -0500 + +xpaint (2.5.1-4.2) unstable; urgency=low + + * NMU + * recompiled with modern xlibs-dev and xutils to migrate app-defaults file + (Closes: #86030) + * got rid of build-dependency on debstd; partial migration to debhelper + * lintian 1.20.9 clean + * tweaked descriptions in control and menu files + * debian/control: + - added Build-Depends + - bumped Standards-Version to 3.5.2 (Closes: #80915) + + -- Branden Robinson Fri, 16 Mar 2001 21:22:27 -0500 + +xpaint (2.5.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Recompiled against modern xpm4g-dev to get proper dependency. + * debian/rules: add -isp to dpkg-gencontrol + + -- Branden Robinson Fri, 8 Sep 2000 01:54:51 -0500 + +xpaint (2.5.1-4) unstable; urgency=low, closes=43638 + + * Rebuild with libjpeg62. [#43638] + + -- Mark W. Eichin Mon, 20 Sep 1999 03:38:05 -0400 + +xpaint (2.5.1-3) unstable; urgency=low, closes=11833 9263 11817 26929 + + * Pull in changes from Vincent Renardias NMU. (Thanks!) + * XPaint.ad.in: downcase "lasso" resource. [#11833] + * Bugs #9263 & #11817 are already fixed. + * Rebuild with libpng2-dev. [#26929] + * debian/changelog, debian/README.debian: Update mailing address. + + -- Mark W. Eichin Sun, 17 Jan 1999 02:23:48 -0500 + +xpaint (2.5.1-2) unstable; urgency=low + + * rebuild with libpng0g + * debian/shlibs.local: delete, since it refers to old libc5 versions of + those libraries anyhow. + + -- Mark W. Eichin Sat, 8 Nov 1997 00:24:06 -0500 + +xpaint (2.5.1-1) unstable; urgency=low + + * new upstream release. + + -- Mark W. Eichin Tue, 4 Nov 1997 14:17:34 -0500 + +xpaint (2.4.8-2) unstable; urgency=low + + * debian/menu: new-style entry from joost, seperate title/longtitle. + * rebuild with libpng1. + * debian/control: only "suggest" netpbm since it's in non-free. + * misc.h: fix declaration of random(). + * rw/rwTable.c (RWGetMsg): fix sys_errlist declaration. + * rw/libpnmrw.c (pm_perror): ditto. + + -- Mark W. Eichin Tue, 4 Nov 1997 02:22:11 -0500 + +xpaint (2.4.8-1) unstable; urgency=low + + * New upstream release by new author; new packaging standards. + * includes shlibs.local values for missing/broken libjpeg, libtiff. + + -- Mark W. Eichin Wed, 26 Feb 1997 12:37:58 -0500 + + --- xpaint-2.6.2.orig/debian/README.debian +++ xpaint-2.6.2/debian/README.debian @@ -0,0 +1,12 @@ +xpaint for DEBIAN +---------------------- + +XPaint is a color image-editing tool that features most standard paint +program options. It allows for the editing of multiple images +simultaneously and supports various formats, including PPM, XBM, TIFF, +etc. + +Originally written by David Koblas. +Rewritten by Torsten Martinsen. + +Mark W. Eichin , Wed, 26 Feb 1997 12:37:58 -0500 --- xpaint-2.6.2.orig/debian/conffiles +++ xpaint-2.6.2/debian/conffiles @@ -0,0 +1 @@ +/etc/X11/app-defaults/XPaint --- xpaint-2.6.2.orig/debian/rules +++ xpaint-2.6.2/debian/rules @@ -0,0 +1,63 @@ +#!/usr/bin/make -f +# Made with the aid of debhelper, by Joey Hess +# based on the sample debian/rules file for GNU hello by Ian Jackson. + +export DH_COMPAT=2 + +package=xpaint + +build: + $(checkdir) + + xmkmf + make Makefiles + make + + touch build + +clean: + $(checkdir) + -rm -f build + -xmkmf + -make Makefiles + -make clean + -rm -f `find . -name "*~"` Makefile */Makefile XPaint.ad xpaint.man + -rm -rf debian/$(package) debian/files* core debian/substvars + dh_clean + +binary-indep: checkroot build + $(checkdir) +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: checkroot build + $(checkdir) + -rm -rf debian/$(package) + install -d debian/$(package) + cd debian/$(package) && install -d `cat ../dirs` + make install install.man DESTDIR=`pwd`/debian/$(package)/ + dh_installdocs README README.PNG README.old TODO + dh_installmenu + dh_installchangelogs ChangeLog + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_builddeb + +define checkdir + test -f debian/rules +endef + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot --- xpaint-2.6.2.orig/debian/menu +++ xpaint-2.6.2/debian/menu @@ -0,0 +1,4 @@ +?package(xpaint):needs=X11 section=Apps/Graphics \ + title="Xpaint" hints="Bitmap" \ + longtitle="Xpaint: JPEG/TIFF/PNG/etc. editor" \ + command=/usr/bin/X11/xpaint