--- xpaint-2.7.8.1.orig/misc.h +++ xpaint-2.7.8.1/misc.h @@ -24,7 +24,7 @@ long random(void); #endif -#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) +#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) & !defined(__CYGWIN__) & !defined(__GLIBC__) #if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) || defined(_AIX) || defined(_SCO_DS) void srandom(unsigned int); #else --- xpaint-2.7.8.1.orig/Local.config +++ xpaint-2.7.8.1/Local.config @@ -24,7 +24,7 @@ XCOMM PRINTCAP = /etc/printcap:/etc/printcap.cups XCOMM #define PRINTCAP -EDITOR = emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black +EDITOR = x-terminal-emulator -e sensible-editor POSTSCRIPT_VIEWER = gv EXTERN_VIEWER = xv @@ -132,11 +132,11 @@ XCOMM You must have the XPM library. XCOMM Make sure the path name to the library is correct. -XPM_LIB = -L/usr/X11R6/lib -lXpm +XPM_LIB = -lXpm XCOMM Make sure this points to the location of the 'xpm.h' file. -XPM_INCLUDE = -I/usr/X11R6/include/X11 +XPM_INCLUDE = -I/usr/include/X11 DEPENDFLAGS = -I./bitmaps --- xpaint-2.7.8.1.orig/configure +++ xpaint-2.7.8.1/configure @@ -7,7 +7,7 @@ echo "(looking for Xaw, Xaw3d, Xaw95, neXtaw)" echo "" else - WIDGETS=`echo $1 | tr [a:z] [A:Z]` + WIDGETS=`echo $1` fi if test "$WIDGETS" = "" ; then @@ -54,7 +54,7 @@ fi fi -if test "$WIDGETS" = "XAW3DG" ; then +if test "$WIDGETS" = "xaw3dg" ; then ln -sf /usr/include/X11/Xaw3d xaw_incdir echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG" echo "XAWLIB_DEFINES = -DXAW3D -DXAW3DG" > Local.xawdefs --- xpaint-2.7.8.1.orig/debian/changelog +++ xpaint-2.7.8.1/debian/changelog @@ -1,3 +1,35 @@ +xpaint (2.7.8.1-1.2) unstable; urgency=low + + * Porter NMU. + * Added support for GNU/kFreeBSD (closes: bug#332999). + + -- Aurelien Jarno Sun, 10 Dec 2006 23:06:51 +0100 + +xpaint (2.7.8.1-1.1) unstable; urgency=low + + * Non-maintainer upload during bug-squashing party. + * Local.config: adjust paths after the X migration (Closes: #364080). + + -- Guilherme de S. Pastore Sun, 23 Apr 2006 09:36:04 -0300 + +xpaint (2.7.8.1-1) unstable; urgency=low + + * New upstream release + - incorporates debian/ directory + - also incorporates previous manpage patch + - as well as incorporates previous errno patch + - compiler options changed (Closes: #327105) + * debian/rules was changed + - get the lintian overrides in the .deb + * debian/watch was changed with another URL + * configure script was changed to eliminate warning that + the xaw3dg library was incompletely installed + * Suggests: gs changed to gs-gpl + * Standards Version changed to 3.6.2 + * Free Software Foundation address corrected in copyright + + -- Hugo Vanwoerkom Wed, 14 Sep 2005 08:23:01 -0500 + xpaint (2.7.6-1) unstable; urgency=low * New upstream release --- xpaint-2.7.8.1.orig/debian/control +++ xpaint-2.7.8.1/debian/control @@ -3,13 +3,13 @@ Priority: optional Maintainer: Hugo Vanwoerkom Uploaders: Florian Ernst -Build-Depends: debhelper (>= 4), libxaw7-dev, libtiff4-dev, libpng12-dev, xutils, xaw3dg-dev -Standards-Version: 3.6.1 +Build-Depends: debhelper (>= 4), libxaw7-dev, libtiff4-dev, libpng12-dev, xutils, xaw3dg-dev, libxpm-dev +Standards-Version: 3.6.2 Package: xpaint Architecture: any Depends: ${shlibs:Depends} -Suggests: gs, netpbm, lpr, x-terminal-emulator, editor +Suggests: gs-gpl, netpbm, lpr, x-terminal-emulator, editor Description: simple paint program for X XPaint is suitable for producing simple graphics. It does offer some advanced features such as image processing functions and gradient @@ -18,7 +18,7 @@ In the C Script Editor of XPaint, the External editor in the File menu will invoke x-terminal-emulator -e sensible-editor. . - The gs package will be needed for PDF/PS reading, netpbm will be needed + The gs-gpl package will be needed for PDF/PS reading, netpbm will be needed for external conversion, lpr for printing. . Homepage: https://sourceforge.net/projects/sf-xpaint/ --- xpaint-2.7.8.1.orig/debian/copyright +++ xpaint-2.7.8.1/debian/copyright @@ -99,8 +99,8 @@ You should have received a copy of the GNU General Public License with your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the Debian GNU/Linux xpaint source package as the file COPYING. If not, - write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - Boston, MA 02111-1307, USA. + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston,N: MA 02110-1301, USA. same license applies to rw/writeJPEG.c which is Copyright (C) 1996, Torsten Martinsen --- xpaint-2.7.8.1.orig/debian/rules +++ xpaint-2.7.8.1/debian/rules @@ -42,6 +42,8 @@ BINDIR=/usr/bin/ \ MANPATH=/usr/share/man/ \ PROJECTMANSUFFIX='' + install -D -m 644 $(CURDIR)/debian/lintian-overrides \ + $(CURDIR)/debian/xpaint/usr/share/lintian/overrides/xpaint binary-indep: build install # We have nothing to do by default. --- xpaint-2.7.8.1.orig/debian/lintian-overrides +++ xpaint-2.7.8.1/debian/lintian-overrides @@ -0,0 +1 @@ +xpaint: syntax-error-in-debian-changelog --- xpaint-2.7.8.1.orig/debian/watch +++ xpaint-2.7.8.1/debian/watch @@ -1,6 +1,5 @@ # format version number, currently 2; this line is compulsory! version=2 -ftp://ftp2.sf.net/pub/sourceforge/s/sf/sf-xpaint/xpaint-(.*)\.tar\.bz2 -#ftp://prdownload.sf.net/pub/sourceforge/s/sf/sf-xpaint/xpaint-(.*)\.tar\.bz2 +http://prdownloads.sourceforge.net/sf-xpaint/xpaint-(.*)\.tar\.bz2