debian/0000775000000000000000000000000012216602042007163 5ustar debian/patches/0000755000000000000000000000000012216602042010610 5ustar debian/patches/debian-changes0000644000000000000000000021535612216602042013377 0ustar Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . xgraph (12.1-17) unstable; urgency=low . * prevent use of the Hdcpy button from segfaulting by defining NE as the right kind of null pointer (closes: #706636) * bump policy version * tweak debian git repo urls to current debian repo url naming scheme Author: Barak A. Pearlmutter Bug-Debian: http://bugs.debian.org/706636 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- /dev/null +++ xgraph-12.1/draw.h @@ -0,0 +1,2 @@ +void DrawWindow(LocalWin *); +void EraseData(LocalWin *); --- xgraph-12.1.orig/copyright.h +++ xgraph-12.1/copyright.h @@ -5,9 +5,6 @@ * University of California, Berkeley * 1989 * - * Animation, Differentiation by Paul Walker - * NCSA and University of Illinois at Urbana Champaign Dept. of Physics - * * Copyright (c) 1988, 1989, Regents of the University of California. * All rights reserved. * @@ -20,41 +17,6 @@ * Research Laboratory or the University of California make any * warranty about the software, its performance or its conformity to * any specification. - * - -Animation and differentiation routines were added by Paul Walker, -NCSA and UIUC Dept of Physics. The following copyright and disclaimer -applies to these parts of the code only. - -UNIVERSITY OF ILLINOIS (UI), NATIONAL CENTER FOR SUPERCOMPUTING -APPLICATIONS (NCSA), Software Distribution Policy for Copyrighted Software - -The above mentioned modifications to XGraph made with the authors consent are -copyrighted, but available without fee for education, academic research -and non-commercial purposes. The modifications are copyrighted in the name of -the UI, and ownership of the modifications remains with the UI. Users may -distribute the binary and source code to third parties provided that the -copyright notice and this statement appears on all copies and that no -charge is made for such copies. Any entity wishing to integrate all or -part of the source code into a product for commercial use or resale, -should contact the University of Illinois, c/o NCSA, to negotiate an -appropriate license for such commercial use. - -UI MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY -PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. THE -UI SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY THE USER OF THIS -SOFTWARE. The software may have been developed under agreements between -the UI and the Federal Government which entitle the Government to certain -rights. - -By copying this program, you, the user, agree to abide by the copyright -conditions and understandings with respect to any software which is marked -with a copyright notice. - -Send all comments about the modifications to Paul Walker, -pwalker@ncsa.uiuc.edu - - * */ #ifndef _RIGHTS_ @@ -62,4 +24,4 @@ pwalker@ncsa.uiuc.edu static char copyright[] = "Copyright (c) 1989, Regents of the University of California. All rights reserved."; -#endif /* _RIGHTS_ */ +#endif /* _RIGHTS_ */ --- xgraph-12.1.orig/xgraph.c +++ xgraph-12.1/xgraph.c @@ -1,4 +1,4 @@ -/* $Header: /usr/src/mash/repository/vint/xgraph/xgraph.c,v 1.3 1999/12/19 00:52:07 heideman Exp $ */ +/* $Header$ */ /* * xgraph - A Simple Plotter for X * @@ -9,7 +9,10 @@ * Please see copyright.h concerning the formal reproduction rights * of this software. * - * $Log: xgraph.c,v $ + * $Log$ + * Revision 1.4 2007-12-06 11:55:13 bap + * flush compiler warnings of various levels of severity + * * Revision 1.3 1999/12/19 00:52:07 heideman * warning suppresion, slightly different flot ahndling * @@ -20,9 +23,6 @@ * xgraph-12.0 * */ -#ifndef lint -static char rcsid[] = "$Id: xgraph.c,v 1.3 1999/12/19 00:52:07 heideman Exp $"; -#endif #include "copyright.h" #include @@ -34,7 +34,10 @@ static char rcsid[] = "$Id: xgraph.c,v 1 #include "hard_devices.h" #include "params.h" - +extern void DelWindow(Window, LocalWin *); +extern void PrintWindow(Window,LocalWin *); +extern int HandleZoom(char *, XButtonPressedEvent *, LocalWin *, Cursor); + extern void init_X(); extern void do_error(); @@ -79,8 +82,13 @@ char *Prog_Name; char *disp_name; +extern Window +NewWindow(char *progname, + double lowX, double lowY, + double upX, double upY, + double asp, int DO); -main(argc, argv) +int main(argc, argv) int argc; char *argv[]; @@ -89,8 +97,7 @@ char *argv[]; * The command line format is: xgraph [host:display]. */ { - Window primary, - NewWindow(); + Window primary; XEvent theEvent; LocalWin *win_info; Cursor zoomCursor; @@ -376,15 +383,6 @@ int flags; /* Options */ PointList *spot; PointList *pspot; - static char *paramstr[] = - { - "Cannot plot negative %s values\n", - "when the logarithmic option is selected.\n", - "Number of points in %d and %d don't match for stacking.\n", - "Point %d in %d and %d doesn't match for stacking.\n", - "Set %d has 0 %s.\n" - }; - if (flags & (FITX|FITY)) for (i = 0; i < MAXSETS; i++) for (spot = PlotData[i].list; spot; spot = spot->next) { @@ -400,11 +398,11 @@ int flags; /* Options */ maxx = maxx - minx; maxy = maxy - miny; if (maxx == 0.0) { - (void) fprintf(stderr, paramstr[3], i, "width"); + (void) fprintf(stderr, "Set %d has 0 %s.\n", i, "width"); maxx = 1.0; } if (maxy == 0.0) { - (void) fprintf(stderr, paramstr[3], i, "height"); + (void) fprintf(stderr, "Set %d has 0 %s.\n", i, "height"); maxy = 1.0; } switch (flags & (FITX|FITY)) { @@ -432,12 +430,12 @@ int flags; /* Options */ for (spot = PlotData[i].list, pspot = PlotData[i - 1].list; spot && pspot; spot = spot->next, pspot = pspot->next) { if (spot->numPoints != pspot->numPoints) { - (void) fprintf(stderr, paramstr[2], i - 1, i); + (void) fprintf(stderr, "Point count mismatch, sets %d and %d\n", i - 1, i); exit(1); } for (j = 0; j < spot->numPoints; j++) { if (spot->xvec[j] != pspot->xvec[j]) { - (void) fprintf(stderr, paramstr[3], j, i - 1, i); + (void) fprintf(stderr, "Point %d in %d and %d doesn't match for stacking.\n", j, i - 1, i); exit(1); } spot->yvec[j] += pspot->yvec[j]; @@ -456,8 +454,8 @@ int flags; /* Options */ else if (spot->yvec[j] == 0) spot->yvec[j] = 0.0; else { - (void) fprintf(stderr, paramstr[0], "Y"); - (void) fprintf(stderr, paramstr[1]); + (void) fprintf(stderr, "Cannot plot negative %s values\n", "Y"); + (void) fprintf(stderr, "when the logarithmic option is selected.\n"); exit(1); } } @@ -468,8 +466,8 @@ int flags; /* Options */ else if (spot->xvec[j] == 0) spot->xvec[j] = 0.0; else { - (void) fprintf(stderr, paramstr[0], "X"); - (void) fprintf(stderr, paramstr[1]); + (void) fprintf(stderr, "Cannot plot negative %s values\n", "X"); + (void) fprintf(stderr, "when the logarithmic option is selected.\n"); exit(1); } } @@ -919,7 +917,7 @@ int DO; /* Deriv } -DelWindow(win, win_info) +void DelWindow(win, win_info) Window win; /* Window */ LocalWin *win_info; /* Local Info */ @@ -939,7 +937,7 @@ LocalWin *win_info; /* Local Info */ Num_Windows -= 1; } -PrintWindow(win, win_info) +void PrintWindow(win, win_info) Window win; /* Window */ LocalWin *win_info; /* Local Info */ --- xgraph-12.1.orig/init.c +++ xgraph-12.1/init.c @@ -1,4 +1,4 @@ -/* $Header: /usr/src/mash/repository/vint/xgraph/init.c,v 1.2 1999/12/19 00:52:06 heideman Exp $ */ +/* $Header$ */ /* * init.c: xgraph initialization code * @@ -7,7 +7,10 @@ * ParseArgs(); * ReadDefaults(); * - * $Log: init.c,v $ + * $Log$ + * Revision 1.2 2001-10-08 08:33:31 bap + * flush some warnings + * * Revision 1.2 1999/12/19 00:52:06 heideman * warning suppresion, slightly different flot ahndling * @@ -15,9 +18,6 @@ * xgraph-12.0 * */ -#ifndef lint -static char rcsid[] = "$Id: init.c,v 1.2 1999/12/19 00:52:06 heideman Exp $"; -#endif #include "copyright.h" #include @@ -251,8 +251,8 @@ int o; static char *def_str; #define DEF(name, type) \ -if (def_str = XGetDefault(disp, Prog_Name, name)) { \ - param_set(name, type, def_str); \ +if ((def_str = XGetDefault(disp, Prog_Name, (name)))) { \ + param_set((name), (type), def_str); \ } void @@ -448,7 +448,7 @@ int do_it; if (idx + 1 >= argc) argerror("missing coordinate(s)", argv[idx]); - if (hi = index(argv[idx + 1], ',')) { + if ((hi = index(argv[idx + 1], ','))) { char low[MAXLO]; (void) strncpy(low, argv[idx + 1], hi - argv[idx + 1]); @@ -471,7 +471,7 @@ int do_it; if (idx + 1 >= argc) argerror("missing coordinate(s)", argv[idx]); - if (hi = index(argv[idx + 1], ',')) { + if ((hi = index(argv[idx + 1], ','))) { char low[MAXLO]; (void) strncpy(low, argv[idx + 1], hi - argv[idx + 1]); --- xgraph-12.1.orig/tgif.c +++ xgraph-12.1/tgif.c @@ -8,6 +8,7 @@ #include #include "hard_devices.h" #include "xgout.h" +#include "xgraph.h" #define COLOR "DarkSlateGray" --- xgraph-12.1.orig/draw.c +++ xgraph-12.1/draw.c @@ -1,18 +1,18 @@ -/* $Header: /usr/src/mash/repository/vint/xgraph/draw.c,v 1.1.1.1 1999/12/03 23:15:53 heideman Exp $ */ +/* $Header$ */ /* * draw.c: xgraph drawing code * * Routines: * void DrawWindow(); * - * $Log: draw.c,v $ + * $Log$ + * Revision 1.1 2001-10-08 05:53:12 bap + * Initial revision + * * Revision 1.1.1.1 1999/12/03 23:15:53 heideman * xgraph-12.0 * */ -#ifndef lint -static char rcsid[] = "$Id: draw.c,v 1.1.1.1 1999/12/03 23:15:53 heideman Exp $"; -#endif #include "copyright.h" #include --- xgraph-12.1.orig/xgraph.man +++ xgraph-12.1/xgraph.man @@ -3,7 +3,7 @@ xgraph \- Draw a graph on an X11 Display .SH SYNOPSIS .B xgraph -[ options ] [[-geometry |=]WxH+X+Y ] [ -display host:display.screen ] [ file ... ] +[ options ] [[\-geometry |=]WxH+X+Y ] [ \-display host:display.screen ] [ file ... ] .SH DESCRIPTION The .I xgraph @@ -43,7 +43,7 @@ Overall graphing options for the graph c files by writing lines of the form "