--- gv-3.5.8.orig/README
+++ gv-3.5.8/README
@@ -19,8 +19,6 @@
 
 The most recent version may be obtained from gv's homepage at
    http://wwwthep.physik.uni-mainz.de/~plass/gv/
-or via anonymous ftp from
-   ftp://thep.physik.uni-mainz.de/pub/gv/
 
 Please send suggestions or bug reports to plass@thep.physik.uni-mainz.de.
 
--- gv-3.5.8.orig/config.Unix
+++ gv-3.5.8/config.Unix
@@ -32,10 +32,10 @@
 XCOMM --------------------------------------------------------------------
 XCOMM  Destination directories.
 XCOMM --------------------------------------------------------------------
-      GV_BINDIR    = /usr/local/bin/
-      GV_DOCDIR    = /usr/local/doc/gv/
-      GV_LIBDIR    = /usr/local/lib/gv/
-      GV_MANDIR    = /usr/local/man/man1/
+      GV_BINDIR    = /usr/X11R6/bin/
+      GV_DOCDIR    = /usr/share/doc/gv/
+      GV_LIBDIR    = /usr/X11R6/lib/X11/gv/
+      GV_MANDIR    = /usr/X11R6/man/man1/
 
 XCOMM --------------------------------------------------------------------
 XCOMM --- The name of the Xaw3d library.
@@ -194,7 +194,7 @@
 XCOMM  Your temporary directory.
 XCOMM  Must be terminated with a trailing '/'.
 XCOMM --------------------------------------------------------------------
-      SCRATCH_DIR = ~/
+      SCRATCH_DIR = /tmp/
 
 XCOMM --------------------------------------------------------------------
 XCOMM  The default directory for saving.
--- gv-3.5.8.orig/doc/gv.man
+++ gv-3.5.8/doc/gv.man
@@ -238,7 +238,7 @@
 \fBa system specific resource file\fP.
 The name of this file is as described by the \*QXFILESEARCHPATH\*U
 environment variable, or, if this variable is not defined,
-implementation dependant. In most cases it is  
+implementation dependent. In most cases it is  
 \*Q/usr/X11/lib/X11/app-defaults/GV\*U.
 Administrators may want to modify this file in order
 to set up gv according to the local needs of their system.
@@ -538,7 +538,7 @@
 .nr bi 1
 .Pp
 Defines the paper-size to be used when automatic orientation
-detetction fails.  Valid values are 
+detection fails.  Valid values are 
 \*Qportrait\*U, \*Qlandscape\*U,\*Qseascape\*U 
 and \*Qupside-down\*U.
 .IP "medias"
@@ -552,7 +552,7 @@
 .nr bi 1
 .Pp
 Sets the paper size. 
-Allowd values are as given in the above list of paper-sizes.
+Allowed values are as given in the above list of paper-sizes.
 Specifying
 \*Qautomatic\*U causes gv to attempt
 to derive the correct paper-size from document structuring
@@ -561,7 +561,7 @@
 .nr bi 1
 .Pp
 Defines the paper-size to be used when automatic paper-size 
-detetction fails.  Valid values are as given in the  above
+detection fails.  Valid values are as given in the  above
 list of paper-sizes.
 .if \n(ll>1 .RE
 .nr ll -1
@@ -1172,10 +1172,6 @@
 .nr bi 1
 .Pp
 http://wwwthep.physik.uni-mainz.de/~plass/gv/
-.IP "Anonymous ftp:"
-.nr bi 1
-.Pp
-ftp://thep.physik.uni-mainz.de/pub/gv/
 .if \n(ll>1 .RE
 .nr ll -1
 
@@ -1207,7 +1203,7 @@
 .SH Suggestions and bug reports 
 
 .Pp
-Please send suggestions or bug reports to plass@thep.physik.uni-mainz.de.
+Please send suggestions or bug reports to ckesselh@debian.org.
 .Pp
 .Pp
 .Pp
--- gv-3.5.8.orig/doc/gv-1.html
+++ gv-3.5.8/doc/gv-1.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Synopsis </TITLE>
--- gv-3.5.8.orig/doc/gv-10.html
+++ gv-3.5.8/doc/gv-10.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Copyright </TITLE>
--- gv-3.5.8.orig/doc/gv-11.html
+++ gv-3.5.8/doc/gv-11.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Suggestions and bug reports </TITLE>
@@ -10,7 +11,7 @@
 <H2><A NAME="Suggestions_and_bug_reports"></A> <A NAME="s11">11. Suggestions and bug reports </A></H2>
 
 <P>Please send suggestions or bug reports to 
-<A HREF="mailto:plass@thep.physik.uni-mainz.de">plass@thep.physik.uni-mainz.de</A>.
+<A HREF="mailto:ckesselh@debian.org">ckesselh@debian.org</A>.
 </P>
 
 <HR>
--- gv-3.5.8.orig/doc/gv-12.html
+++ gv-3.5.8/doc/gv-12.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Acknowledgements </TITLE>
--- gv-3.5.8.orig/doc/gv-13.html
+++ gv-3.5.8/doc/gv-13.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: References </TITLE>
--- gv-3.5.8.orig/doc/gv-2.html
+++ gv-3.5.8/doc/gv-2.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Description </TITLE>
--- gv-3.5.8.orig/doc/gv.html
+++ gv-3.5.8/doc/gv.html
@@ -1,20 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997</TITLE>
--- gv-3.5.8.orig/doc/source/gv.doc
+++ gv-3.5.8/doc/source/gv.doc
@@ -757,7 +757,6 @@
 obtained from the following sources:
 <descrip>
 <tag/World Wide Web:/FTP_ANCHOR(http://wwwthep.physik.uni-mainz.de/&tilde;plass/gv/,http://wwwthep.physik.uni-mainz.de/&tilde;plass/gv/)
-<tag/Anonymous ftp:/FTP_ANCHOR(ftp://thep.physik.uni-mainz.de/pub/gv/,ftp://thep.physik.uni-mainz.de/pub/gv/)
 </descrip>
 <!--
 #####################################################
--- gv-3.5.8.orig/doc/gv-3.html
+++ gv-3.5.8/doc/gv-3.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Options </TITLE>
--- gv-3.5.8.orig/doc/gv-4.html
+++ gv-3.5.8/doc/gv-4.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Resources </TITLE>
--- gv-3.5.8.orig/doc/gv-5.html
+++ gv-3.5.8/doc/gv-5.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Mouse and key bindings </TITLE>
--- gv-3.5.8.orig/doc/gv-6.html
+++ gv-3.5.8/doc/gv-6.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Comments about the user interface </TITLE>
--- gv-3.5.8.orig/doc/gv-8.html
+++ gv-3.5.8/doc/gv-8.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Availability </TITLE>
@@ -14,8 +15,6 @@
 <DL>
 <DT><B>World Wide Web:</B><DD><P>
 <A HREF="http://wwwthep.physik.uni-mainz.de/~plass/gv/">http://wwwthep.physik.uni-mainz.de/~plass/gv/</A></P>
-<DT><B>Anonymous ftp:</B><DD><P>
-<A HREF="ftp://thep.physik.uni-mainz.de/pub/gv/">ftp://thep.physik.uni-mainz.de/pub/gv/</A></P>
 </DL>
 
 </P>
--- gv-3.5.8.orig/doc/gv-9.html
+++ gv-3.5.8/doc/gv-9.html
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
 <TITLE> gv 3.5, June 1997: Authors </TITLE>
--- gv-3.5.8.orig/source/Imakefile
+++ gv-3.5.8/source/Imakefile
@@ -63,6 +63,7 @@
  resource.c\
  save.c\
  scale.c\
+ secscanf.c\
  signal.c\
  version.c\
  widgets_misc.c\
@@ -106,6 +107,7 @@
  resource.o\
  save.o\
  scale.o\
+ secscanf.o\
  signal.o\
  version.o\
  widgets_misc.o\
@@ -311,8 +313,8 @@
 	@echo "!########## gv_intern_res.dat (generated by makefile)" >> $(GV_INTERN_RES_DAT)
 	@echo ""							>> $(GV_INTERN_RES_DAT)
 	@echo "GV.gsInterpreter:	gs" >> $(GV_INTERN_RES_DAT)
-	@echo "GV.gsCmdScanPDF:	gs -dNODISPLAY -dQUIET -sPDFname=%s -sDSCname=%s pdf2dsc.ps -c quit" >> $(GV_INTERN_RES_DAT)
-	@echo "GV.gsCmdConvPDF:	gs -dNODISPLAY -dQUIET $(PS_LEVEL) -dNOPAUSE -sPSFile=%s %s -c quit" >> $(GV_INTERN_RES_DAT)
+	@echo "GV.gsCmdScanPDF:	pdf2dsc %pdf %dsc" >> $(GV_INTERN_RES_DAT)
+	@echo "GV.gsCmdConvPDF:	pdf2ps $(PS_LEVEL) %pdf %ps" >> $(GV_INTERN_RES_DAT)
 	@echo "GV.gsX11Device:		-sDEVICE=x11" >> $(GV_INTERN_RES_DAT)
 	@echo "GV.gsX11AlphaDevice:	-dNOPLATFONTS -sDEVICE=x11alpha" >> $(GV_INTERN_RES_DAT)
 	@echo "GV.gsSafer:		True" >> $(GV_INTERN_RES_DAT)
--- gv-3.5.8.orig/source/ps.c
+++ gv-3.5.8/source/ps.c
@@ -93,6 +93,8 @@
 #define memset(a,b,c) bzero(a,c)
 #endif
 
+extern int sec_scanf(const char *, const char *, ...);
+
 /* length calculates string length at compile time */
 /* can only be used with character constants */
 #define length(a)       (sizeof((a))-1)
@@ -417,10 +419,15 @@
       struct document *retval = NULL;
       FILE *tmpfile = (FILE*)NULL;
       char *filename_unc;
+      char *quoted_filename, *quoted_filename_unc;
       char cmd[512];
       char s[512];
       filename_unc=file_getTmpFilename(NULL,filename_raw);
-      sprintf(cmd,cmd_uncompress,filename,filename_unc);
+      quoted_filename = quote_filename(filename);
+      quoted_filename_unc = quote_filename(filename_unc);
+      sprintf(cmd,cmd_uncompress,quoted_filename,quoted_filename_unc);
+      GV_XtFree(quoted_filename);
+      GV_XtFree(quoted_filename_unc);
       INFMESSAGE(is compressed)
       INFSMESSAGE(uncompress command,cmd)
       if (ps_system(cmd) || file_fileIsNotUseful(filename_unc)) {
@@ -478,7 +485,7 @@
       doc = (struct document *) PS_malloc(sizeof(struct document));
       CHECK_MALLOCED(doc);
       memset(doc, 0, sizeof(struct document));
-      sscanf(line, "%*s %s", text);
+      sec_sscanf(line, "%*s %s", text, sizeof(text));
       /*###jp###*/
       /*doc->epsf = iscomment(text, "EPSF-");*/
       doc->epsf = iscomment(text, "EPSF");
@@ -488,10 +495,35 @@
       struct document *retval = NULL;
       FILE *tmpfile = (FILE*)NULL;
       char *filename_dsc;
+      char *quoted_filename, *quoted_filename_dsc;
+      char *pdfpos;
+      char *dscpos;
       char cmd[512];
       char s[512];
-      filename_dsc=file_getTmpFilename(NULL,filename_raw);
-      sprintf(cmd,cmd_scan_pdf,filename,filename_dsc);
+      filename_dsc=file_getTmpFilename(NULL,filename_raw);      
+      quoted_filename = quote_filename(filename);
+      quoted_filename_dsc = quote_filename(filename_dsc);
+      if ((pdfpos = strstr(cmd_scan_pdf,"%pdf")) &&
+	  (dscpos = strstr(cmd_scan_pdf,"%dsc"))) {
+	cmd[0] = '\0';
+	if (pdfpos < dscpos) {
+	  strncat(cmd,cmd_scan_pdf,(pdfpos-cmd_scan_pdf));
+	  strcat(cmd,quoted_filename);
+	  strncat(cmd,pdfpos+4,(dscpos-pdfpos-4));
+	  strcat(cmd,quoted_filename_dsc);
+	  strcat(cmd,dscpos+4);
+	} else {
+	  strncat(cmd,cmd_scan_pdf,(dscpos-cmd_scan_pdf));
+	  strcat(cmd,quoted_filename_dsc);
+	  strncat(cmd,dscpos+4,(pdfpos-dscpos-4));
+	  strcat(cmd,quoted_filename);
+	  strcat(cmd,pdfpos+4);
+	}
+      } else {
+	sprintf(cmd,cmd_scan_pdf,quoted_filename,quoted_filename_dsc);
+      }
+      GV_XtFree(quoted_filename);
+      GV_XtFree(quoted_filename_dsc);
       INFMESSAGE(is PDF)
       INFSMESSAGE(scan command,cmd)
 #ifdef VMS
@@ -546,7 +578,7 @@
 	} else if (doc->date == NULL && iscomment(line+2, "CreationDate:")) {
 	    doc->date = gettextline(line+length("%%CreationDate:"));
 	} else if (bb_set == NONE && iscomment(line+2, "BoundingBox:")) {
-	    sscanf(line+length("%%BoundingBox:"), "%s", text);
+	    sec_sscanf(line+length("%%BoundingBox:"), "%s", text, sizeof(text));
 	    if (strcmp(text, "(atend)") == 0) {
 		bb_set = ATEND;
 	    } else {
@@ -578,7 +610,7 @@
 	    }
 	} else if (orientation_set == NONE &&
 		   iscomment(line+2, "Orientation:")) {
-	    sscanf(line+length("%%Orientation:"), "%s", text);
+	    sec_sscanf(line+length("%%Orientation:"), "%s", text, sizeof(text));
 	    if (strcmp(text, "(atend)") == 0) {
 		orientation_set = ATEND;
 	    } else if (strcmp(text, "Portrait") == 0) {
@@ -589,7 +621,7 @@
 		orientation_set = 1;
 	    }
 	} else if (page_order_set == NONE && iscomment(line+2, "PageOrder:")) {
-	    sscanf(line+length("%%PageOrder:"), "%s", text);
+	    sec_sscanf(line+length("%%PageOrder:"), "%s", text, sizeof(text));
 	    if (strcmp(text, "(atend)") == 0) {
 		page_order_set = ATEND;
 	    } else if (strcmp(text, "Ascend") == 0) {
@@ -603,7 +635,7 @@
 		page_order_set = 1;
 	    }
 	} else if (pages_set == NONE && iscomment(line+2, "Pages:")) {
-	    sscanf(line+length("%%Pages:"), "%s", text);
+	    sec_sscanf(line+length("%%Pages:"), "%s", text, sizeof(text));
 	    if (strcmp(text, "(atend)") == 0) {
 		pages_set = ATEND;
 	    } else {
@@ -823,7 +855,7 @@
 		/* Do nothing */
 	    } else if (doc->default_page_orientation == NONE &&
 		iscomment(line+2, "PageOrientation:")) {
-		sscanf(line+length("%%PageOrientation:"), "%s", text);
+		sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text));
 		if (strcmp(text, "Portrait") == 0) {
 		    doc->default_page_orientation = PORTRAIT;
 		} else if (strcmp(text, "Landscape") == 0) {
@@ -945,7 +977,7 @@
 		/* Do nothing */
 	    } else if (doc->default_page_orientation == NONE &&
 		iscomment(line+2, "PageOrientation:")) {
-		sscanf(line+length("%%PageOrientation:"), "%s", text);
+		sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text));
 		if (strcmp(text, "Portrait") == 0) {
 		    doc->default_page_orientation = PORTRAIT;
 		} else if (strcmp(text, "Landscape") == 0) {
@@ -1082,7 +1114,7 @@
 		/* Do nothing */
 	    } else if (doc->pages[doc->numpages].orientation == NONE &&
 		iscomment(line+2, "PageOrientation:")) {
-		sscanf(line+length("%%PageOrientation:"), "%s", text);
+		sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text));
 		if (strcmp(text, "Portrait") == 0) {
 		    doc->pages[doc->numpages].orientation = PORTRAIT;
 		} else if (strcmp(text, "Landscape") == 0) {
@@ -1114,7 +1146,7 @@
 		PS_free(cp);
 	    } else if ((page_bb_set == NONE || page_bb_set == ATEND) &&
 		       iscomment(line+2, "PageBoundingBox:")) {
-		sscanf(line+length("%%PageBoundingBox:"), "%s", text);
+		sec_sscanf(line+length("%%PageBoundingBox:"), "%s", text, sizeof(text));
 		if (strcmp(text, "(atend)") == 0) {
 		    page_bb_set = ATEND;
 		} else {
@@ -1228,14 +1260,14 @@
 	    }
 	} else if (orientation_set == ATEND &&
 		   iscomment(line+2, "Orientation:")) {
-	    sscanf(line+length("%%Orientation:"), "%s", text);
+	    sec_sscanf(line+length("%%Orientation:"), "%s", text, sizeof(text));
 	    if (strcmp(text, "Portrait") == 0) {
 		doc->orientation = PORTRAIT;
 	    } else if (strcmp(text, "Landscape") == 0) {
 		doc->orientation = LANDSCAPE;
 	    }
 	} else if (page_order_set == ATEND && iscomment(line+2, "PageOrder:")) {
-	    sscanf(line+length("%%PageOrder:"), "%s", text);
+	    sec_sscanf(line+length("%%PageOrder:"), "%s", text, sizeof(text));
 	    if (strcmp(text, "Ascend") == 0) {
 		doc->pageorder = ASCEND;
 	    } else if (strcmp(text, "Descend") == 0) {
@@ -1738,6 +1770,8 @@
            (DSCcomment(line) && iscomment(line+2,(comment)))
 #define IS_BEGIN(comment)				\
            (iscomment(line+7,(comment)))
+#define IS_END(comment)				\
+           (iscomment(line+5,(comment)))
 #define SKIP_WHILE(cond)				\
 	   while (readline(fd, &line, NULL, &nbytes) && (cond)) *line_lenP += nbytes;\
            skipped=1;
@@ -1773,7 +1807,12 @@
    else
 #endif
    if  (!IS_COMMENT("Begin"))     {} /* Do nothing */
-   else if IS_BEGIN("Document:")  SKIP_UNTIL_1("EndDocument")
+   else if IS_BEGIN("Document:")  {  /* Skip the EPS without handling its content */
+            while (line && !IS_END("Document")) {
+               line = ps_io_fgetchars(fd,-1);
+               if (line) *line_lenP += FD_LINE_LEN;
+            }
+   }
    else if IS_BEGIN("Feature:")   SKIP_UNTIL_1("EndFeature")
 #ifdef USE_ACROREAD_WORKAROUND
    else if IS_BEGIN("File")       SKIP_UNTIL_2("EndFile","EOF")
@@ -1789,7 +1828,7 @@
       INFMESSAGE(encountered "BeginData:")
       if (FD_LINE_LEN > 100) FD_BUF[100] = '\0';
       text[0] = '\0';
-      if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) {
+      if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text, sizeof(text)) >= 1) {
          if (strcmp(text, "Lines") == 0) {
             INFIMESSAGE(number of lines to skip:,num)
             while (num) {
@@ -1888,7 +1927,7 @@
          INFMESSAGE(encountered "BeginData:")
          if (FD_LINE_LEN > 100) FD_BUF[100] = '\0';
          text[0] = '\0';
-         if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) {
+         if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text, sizeof(text)) >= 1) {
             if (strcmp(text, "Lines") == 0) {
                INFIMESSAGE(number of lines:,num)
                while (num) {
@@ -1985,7 +2024,7 @@
           PS_free(comment);
           continue;
        }
-       sscanf(comment+length("%%Pages:"), "%s", text);
+       sec_sscanf(comment+length("%%Pages:"), "%s", text, sizeof(text));
        if (strcmp(text, "(atend)") == 0) {
           fputs(comment, dest_file);
           pages_atend = True;
--- gv-3.5.8.orig/source/misc.c
+++ gv-3.5.8/source/misc.c
@@ -301,9 +301,10 @@
 /*############################################################*/
 
 void
-misc_setPageMarker(entry,kind)
+misc_setPageMarker(entry,kind,event)
   int entry;
   int kind; /* 0 = selected, 1 = highlighted , 2 = bring selected in sight*/
+  XEvent *event;
 {
   int x,y,yl,yu,ny=99999;
   Boolean b = False;
@@ -330,9 +331,12 @@
 	ny = (int)newtocClip->core.height - ((int)newtoc->core.y + yl + 14);
         if (y>ny) b = True;
       }
-      if (b) {
+      if (event && b) {
 	INFIMESSAGE(jumping to,ny)
 	ClipWidgetSetCoordinates(newtocClip,x,ny);
+	entry = VlistEntryOfPosition(newtoc,(int)event->xbutton.y+(y-ny));
+	if (entry != VlistHighlighted(newtoc))
+		VlistChangeHighlighted(newtoc,entry,XawVlistSet);
       }
     }
   }
@@ -689,7 +693,7 @@
        }
        if (toc_text) {
 	 INFMESSAGE(marking current_page as current)
-         misc_setPageMarker(current_page,0);
+         misc_setPageMarker(current_page,0,NULL);
        }
     }
 
@@ -1131,7 +1135,10 @@
 	}
 	s[i] = '\0';
 							n=0;
-	XtSetArg(args[n], XtNvlist, s);			n++;
+	if (	(!gv_filename_old)			||
+		(strcmp(gv_filename_old, gv_filename))	||
+		(doc->numpages != olddoc->numpages)	)
+		  XtSetArg(args[n], XtNvlist, s);	n++;
 	XtSetArg(args[n], XtNlabel, toc_text);		n++;
       } else {
 	s = NULL;
@@ -1154,7 +1161,7 @@
     misc_setSensitive(w_printAllPages     , show_printAllPages     , (gv_psfile   != NULL));
     misc_setSensitive(w_checkFile         , show_checkFile         , (gv_filename != NULL));
     misc_setSensitive(w_updateFile        , show_updateFile        , (gv_filename != NULL));
-    misc_setSensitive(w_showThisPage      , show_showThisPage      , (gv_filename != NULL));
+    misc_setSensitive(w_showThisPage      , show_showThisPage      , (gv_psfile   != NULL));
     misc_setSensitive(w_prevPage          , show_prevPage          , (toc_text    != NULL));
     misc_setSensitive(w_nextPage          , show_nextPage          , (gv_filename != NULL));
     misc_setSensitive(w_toggleCurrentPage , show_toggleCurrentPage , (toc_text    != NULL));
@@ -1168,7 +1175,7 @@
     XtSetSensitive(saveAllEntry,     (gv_psfile   != NULL));
     XtSetSensitive(saveMarkedEntry,  (toc_text    != NULL));
     XtSetSensitive(nextEntry,        (gv_filename != NULL));
-    XtSetSensitive(redisplayEntry,   (gv_filename != NULL));
+    XtSetSensitive(redisplayEntry,   (gv_psfile   != NULL));
     XtSetSensitive(prevEntry,        (toc_text    != NULL));
     XtSetSensitive(currentEntry,     (toc_text    != NULL));
     XtSetSensitive(oddEntry,         (toc_text    != NULL));
@@ -1718,3 +1725,51 @@
     ENDMESSAGE(catch_Xerror)
     return 0;
 }
+
+/*############################################################*/
+/* quote_filename */
+/* Quotes special characters in filenames */
+/* (taken from bash sources) */
+/*############################################################*/
+
+char *
+quote_filename (string) 
+     char *string;
+{
+    int c;
+    char *result, *r, *s;
+
+    BEGINMESSAGE(quote_filename)
+
+    result = (char*) GV_XtMalloc((2 * strlen (string) + 1) * sizeof(char));
+
+    for (r = result, s = string; s && (c = *s); s++)
+    {
+      switch (c)
+	{
+	case ' ': case '\t': case '\n':		/* IFS white space */
+	case '\'': case '"': case '\\':		/* quoting chars */
+	case '|': case '&': case ';':		/* shell metacharacters */
+	case '(': case ')': case '<': case '>':
+	case '!': case '{': case '}':		/* reserved words */
+	case '*': case '[': case '?': case ']':	/* globbing chars */
+	case '^':
+	case '$': case '`':			/* expansion chars */
+	  *r++ = '\\';
+	  *r++ = c;
+	  break;
+	case '#':				/* comment char */
+	  if (s == string)
+	    *r++ = '\\';
+	  /* FALLTHROUGH */
+	default:
+	  *r++ = c;
+	  break;
+	}
+    }
+    *r = '\0';
+
+    ENDMESSAGE(quote_filename)
+
+    return (result);
+}
--- gv-3.5.8.orig/source/actions.c
+++ gv-3.5.8/source/actions.c
@@ -94,7 +94,7 @@
   }
   if (new_width && new_height) {
     if (width != new_width || height != new_height) {
-       misc_setPageMarker(0,2); /* bring selected in sight */
+       misc_setPageMarker(0,2,event); /* bring selected in sight */
        width = new_width;
        height=new_height;
     }
@@ -253,7 +253,7 @@
 	}
       }
       h = doc_putPageInRange(doc,h);
-      misc_setPageMarker(h,1);
+      misc_setPageMarker(h,1,event);
     }
 
     nx = x = (int)aaa->core.x;
@@ -428,7 +428,7 @@
     if (!scrolling && toc_text) {
       entry = VlistEntryOfPosition(newtoc,(int)event->xbutton.y);
       if (entry >=0 && entry < doc->numpages) {
-	misc_setPageMarker(entry,0);
+	misc_setPageMarker(entry,0,event);
         show_page(entry,NULL);
       }
     }
--- gv-3.5.8.orig/source/callbacks.c
+++ gv-3.5.8/source/callbacks.c
@@ -870,7 +870,7 @@
   char *s;
 
   BEGINMESSAGE(cb_page)
-  if (gv_psfile && client_data) {
+  if (gv_filename && client_data) {
     s = (char*)client_data;
     if (*s=='-' || *s=='+') {  
       k = 1;
@@ -894,7 +894,7 @@
 	np = np + ((k==1) ? cp : 0);
 	np=doc_putPageInRange(doc,np);
 	IIMESSAGE(np,current_page)
-	misc_setPageMarker(np,0);
+	misc_setPageMarker(np,0,NULL);
 	if (np != current_page) show_page(np,NULL);
       } else {
 	if (k==1 && np > 0) show_page(np,NULL);
--- gv-3.5.8.orig/source/config.h
+++ gv-3.5.8/source/config.h
@@ -40,7 +40,7 @@
 ----------------------------------------------------------
 */
 
-/* #define GV_RESTART_IF_BUSY */
+/*#define GV_RESTART_IF_BUSY*/
 
 /*
 ##########################################################
--- gv-3.5.8.orig/source/descrip.mms
+++ gv-3.5.8/source/descrip.mms
@@ -262,7 +262,7 @@
  @ WRITE_ file ""
  @ WRITE_ file "GV.gsInterpreter:	gs"
  @ WRITE_ file "GV.gsCmdScanPDF:	gs ""-dNODISPLAY"" ""-dQUIET"" ""-sPDFname""=%s ""-sDSCname""=%s pdf2dsc.ps -c quit"
- @ WRITE_ file "GV.gsCmdConvPDF:	gs ""-dNODISPLAY"" ""-dQUIET"" $(PS_LEVEL) ""-dNOPAUSE"" ""-sPSFile""=%s %s -c quit"
+ @ WRITE_ file "GV.gsCmdConvPDF:       gs ""-dNODISPLAY"" ""-dQUIET"" $(PS_LEVEL) ""-dNOPAUSE"" ""-sPSFile""=%s %s -c quit"
  @ WRITE_ file "GV.gsX11Device:	""-sDEVICE=x11"""
  @ WRITE_ file "GV.gsX11AlphaDevice:""-dNOPLATFONTS"" ""-sDEVICE=x11alpha"""
  @ WRITE_ file "GV.gsSafer:	True"
--- gv-3.5.8.orig/source/main.c
+++ gv-3.5.8/source/main.c
@@ -985,9 +985,9 @@
   main_setInternResource(db,&gv_gs_x11_device,"gsX11Device");
   main_setInternResource(db,&gv_gs_x11_alpha_device,"gsX11AlphaDevice");
   main_setInternResource(db,&gv_gs_arguments,"gsArguments");
-  s = resource_getResource(db,gv_class,gv_class,"gsSafer",NULL);
+  s = resource_getResource(db,gv_class,gv_name,"gsSafer",NULL);
   if (!strcasecmp(s,"true"))  gv_gs_safer = 1; else gv_gs_safer = 0;
-  s = resource_getResource(db,gv_class,gv_class,"gsQuiet",NULL);
+  s = resource_getResource(db,gv_class,gv_name,"gsQuiet",NULL);
   if (!strcasecmp(s,"true"))  gv_gs_quiet = 1; else gv_gs_quiet = 0;
   ENDMESSAGE(main_setGhostscriptResources)
 }
--- gv-3.5.8.orig/source/misc.h
+++ gv-3.5.8/source/misc.h
@@ -57,7 +57,8 @@
 extern void			misc_setPageMarker (
 #if NeedFunctionPrototypes
     int, /* entry */
-    int	 /* kind */
+    int, /* kind */
+    XEvent*
 #endif
 );
 
@@ -115,6 +116,12 @@
 #endif
 );
  
+extern char *                   quote_filename (
+#if NeedFunctionPrototypes
+    char*
+#endif
+);
+
 #endif	/* _GV_MISC_H_ */
 
 
--- gv-3.5.8.orig/source/versionp.h
+++ gv-3.5.8/source/versionp.h
@@ -35,8 +35,8 @@
 #define  VERSION_APPLIC_CONTEXT	app_con  			/* the Application Context */
 
 char *versionIdentification[] = {
-        "gv 3.5.8",
-        "June 1997",
+        "gv 3.5.8 (debian)",
+        "February 2002",
 	0
 };
 
@@ -84,7 +84,7 @@
       FAX: (608)262-9777        Madison, WI   53706\
 ",
 "\
- Please send error reports to:  plass@thep.physik.uni-mainz.de \n\
+ Please send error reports to:  ckesselh@debian.org \n\
 ",
 0 
 };
--- gv-3.5.8.orig/source/gv_misc_res.dat
+++ gv-3.5.8/source/gv_misc_res.dat
@@ -11,7 +11,7 @@
 
 !##### Version (do not modify this resource)
 
-GV.version:				gv 3.5.8
+GV.version:				gv 3.5.8 (debian)
 
 !##### Background, Foreground
 
@@ -525,9 +525,9 @@
  <LeaveWindow>:		GV_Toc(unhighlight)	\n\
  <Btn1Down>:		GV_Toc(scrollon)	\n\
  <Btn1Motion>:		GV_Toc(scroll)		\n\
- <Btn1Up>:		GV_Toc(select)		\
+ <Btn1Up>:		GV_Toc(highlight)	\
 			GV_Toc(scrolloff)	\
-			GV_Toc(highlight)	\n\
+			GV_Toc(select)		\n\
  <Btn2Down>:		GV_Toc(toggleon)	\n\
  <Btn2Motion>:		GV_Toc(toggleextend)	\
 			GV_Toc(highlight)	\n\
--- gv-3.5.8.orig/source/Vlist.c
+++ gv-3.5.8/source/Vlist.c
@@ -623,6 +623,8 @@
     if (y < 0) entry = -1;
     else       entry = (vw->vlist.entries*y)/(int)vw->label.label_height;
   }
+  if (entry >= vw->vlist.entries)
+	  entry = vw->vlist.entries-1;
   IMESSAGE(entry)
   ENDMESSAGE(VlistEntryOfPosition)
   return(entry);
--- gv-3.5.8.orig/source/file.c
+++ gv-3.5.8/source/file.c
@@ -145,6 +145,25 @@
 }
 
 /*############################################################*/
+/* file_assureDirectory */
+/*############################################################*/
+
+void
+file_assureDirectory(to,from)
+   char *to;
+   char *from;
+{
+   int len;
+   BEGINMESSAGE(file_assureDirectory)
+   strcpy(to,from);
+#  ifndef VMS
+      len = strlen(to);
+      if (to[len-1] != '/') { to[len] = '/'; to[len+1] = '\0'; }
+#  endif
+   ENDMESSAGE(file_assureDirectory)
+}
+
+/*############################################################*/
 /* file_getTmpFilename */
 /* provide some temporary file name */
 /*############################################################*/
@@ -164,11 +183,13 @@
 
    BEGINMESSAGE(file_getTmpFilename)
 
-   if (!baseDirectory) baseDirectory = app_res.scratch_dir;
-   strcpy(tmpDirBuf,baseDirectory);
-   pos = file_locateFilename(tmpDirBuf);
-   if (pos) { ++pos; *pos='\0'; }
-   else strcpy(tmpDirBuf,app_res.scratch_dir);
+   pos = NULL;
+   if (baseDirectory) {
+     strcpy(tmpDirBuf,baseDirectory); 
+     pos = file_locateFilename(tmpDirBuf);
+   }
+   if (pos) *pos='\0';
+   else file_assureDirectory(tmpDirBuf,app_res.scratch_dir);
 
    if (!baseFilename) baseFilename= ".";
    strcpy(tmpNameBuf,baseFilename);
--- gv-3.5.8.orig/source/save.c
+++ gv-3.5.8/source/save.c
@@ -112,17 +112,19 @@
    String print_filename;
 {
    String error=NULL;
+   char *print_quoted_filename;
    char *c,*p;
    Cardinal m,n;
    String printfail=GV_ERROR_PRINT_FAIL;
 
    BEGINMESSAGE(print_file)
 
+   print_quoted_filename = quote_filename(print_filename);
    p = GV_XtNewString(print_command);
    n=0;
    c=p;
    while ((c=strstr(c,"%s"))) { c+=2; n++; }
-   m = (strlen(p)+(n>0?n:1)*strlen(print_filename)+5)*sizeof(char);
+   m = (strlen(p)+(n>0?n:1)*strlen(print_quoted_filename)+5)*sizeof(char);
    c = (char*) GV_XtMalloc(m);
    if (n>0) {
      char *e,*s;
@@ -133,13 +135,13 @@
        if (s) *s='\0';
        strcat(c,e);
        if (s) {
-	 strcat(c,print_filename);
+	 strcat(c,print_quoted_filename);
          e=s+2;
        } 
        else s=NULL;
      }
    } else {
-     sprintf(c, "%s %s",p,print_filename);
+     sprintf(c, "%s %s",p,print_quoted_filename);
    }
    INFSMESSAGE(printing:,c)
    if (SYSTEM_FAILED_ON(c)) {
@@ -149,6 +151,7 @@
    }
    GV_XtFree(c);
    GV_XtFree(p);
+   GV_XtFree(print_quoted_filename);
    ENDMESSAGE(print_file)
    return(error);
 }
@@ -198,6 +201,9 @@
    char proc_name[256];
    char *error=NULL;
    char *pos;
+   char *pdfpos;
+   char *pspos;
+   char *quoted_src_fn, *quoted_conv_fn;
 
    BEGINMESSAGE(save_forkPDFToPSConversion)
 
@@ -205,7 +211,30 @@
    strcpy(proc_name,pos);
    strcat(proc_name," conversion");
 
-   sprintf(command,gv_gs_cmd_conv_pdf,sd->conv_fn,sd->src_fn);
+   quoted_src_fn = quote_filename(sd->src_fn);
+   quoted_conv_fn = quote_filename(sd->conv_fn);
+   if ((pdfpos = strstr(gv_gs_cmd_conv_pdf,"%pdf")) &&
+       (pspos = strstr(gv_gs_cmd_conv_pdf,"%ps"))) {
+     command[0] = '\0';
+     if (pdfpos < pspos) {
+       strncat(command,gv_gs_cmd_conv_pdf,(pdfpos-gv_gs_cmd_conv_pdf));
+       strcat(command,quoted_src_fn);
+       strncat(command,pdfpos+4,(pspos-pdfpos-4));
+       strcat(command,quoted_conv_fn);
+       strcat(command,pspos+3);
+     } else {
+       strncat(command,gv_gs_cmd_conv_pdf,(pspos-gv_gs_cmd_conv_pdf));
+       strcat(command,quoted_conv_fn);
+       strncat(command,pspos+3,(pdfpos-pspos-3));
+       strcat(command,quoted_src_fn);
+       strcat(command,pdfpos+4);
+     }
+   } else {
+     sprintf(command,gv_gs_cmd_conv_pdf,quoted_conv_fn,quoted_src_fn);
+   }
+   GV_XtFree(quoted_src_fn);
+   GV_XtFree(quoted_conv_fn);
+
    INFSMESSAGE(starting conversion:,command)
    process_fork(proc_name,command,save_forkPDFToPSConversionDone,(XtPointer)sd);
    ENDMESSAGE(save_forkPDFToPSConversion)
--- gv-3.5.8.orig/source/main_resources.h
+++ gv-3.5.8/source/main_resources.h
@@ -285,10 +285,10 @@
  { "-spartan"		, ".style"			, XrmoptionNoArg	, "gv_spartan.dat"},
  { "-pixmap"		, ".useBackingPixmap"		, XrmoptionNoArg	, "True"	},
  { "-nopixmap"		, ".useBackingPixmap"		, XrmoptionNoArg	, "False"	},
- { "-quiet"		, ".quiet"    		        , XrmoptionNoArg	, "True"	},
- { "-noquiet"		, ".quiet"    		        , XrmoptionNoArg	, "False"	},
- { "-safer"		, ".safer"    		        , XrmoptionNoArg	, "True"	},
- { "-nosafer"		, ".safer"    		        , XrmoptionNoArg	, "False"	},
+ { "-quiet"		, ".gsQuiet"   		        , XrmoptionNoArg	, "True"	},
+ { "-noquiet"		, ".gsQuiet"   		        , XrmoptionNoArg	, "False"	},
+ { "-safer"		, ".gsSafer"   		        , XrmoptionNoArg	, "True"	},
+ { "-nosafer"		, ".gsSafer"  		        , XrmoptionNoArg	, "False"	},
  { "-arguments"		, ".arguments"			, XrmoptionSepArg	, NULL		},
  { "-h"		        , ".help"			, XrmoptionNoArg	, "?"		},
  { "-?"		        , ".help"			, XrmoptionNoArg	, "?"		},
--- gv-3.5.8.orig/source/process.c
+++ gv-3.5.8/source/process.c
@@ -272,8 +272,7 @@
    pid = fork();
 
    if (pid == 0) { /* child */
-      int  argc=0;
-      char *argv[20];
+      char *argv[3];
       char *c;
 
       INFMESSAGE(child process)
@@ -286,15 +285,10 @@
        */
       system(c);
 #else
-      while (isspace(*c)) c++;
-      while (*c) {
-         argv[argc++] = c;
-         while (*c && !isspace(*c)) c++;
-         if (*c) *c++ = '\0';
-         while (isspace(*c)) c++;
-         SMESSAGE(argv[argc-1])
-      }
-      argv[argc] = NULL;
+      argv[0] = "sh";
+      argv[1] = "-c";
+      argv[2] = c;
+      argv[3] = NULL;
 
       INFMESSAGE(spawning conversion process)
 /*
--- gv-3.5.8.orig/source/miscmenu.c
+++ gv-3.5.8/source/miscmenu.c
@@ -60,7 +60,7 @@
 
 static MiscMenuEntryStruct miscmenu_entries[] = {
   { "update",cb_checkFile,(XtPointer)CHECK_FILE_DATE,2 },
-  { "redisplay",cb_redisplay,NULL,2 },
+  { "redisplay",cb_redisplay,NULL,3 },
   { "toggle_current" , cb_setPageMark, (XtPointer)(SPM_CURRENT|SPM_TOGGLE),1 },
   { "toggle_even"    , cb_setPageMark, (XtPointer)(SPM_EVEN|SPM_TOGGLE),1 },
   { "toggle_odd"     , cb_setPageMark, (XtPointer)(SPM_ODD|SPM_TOGGLE),1 },
--- gv-3.5.8.orig/source/gv_user_res.dat
+++ gv-3.5.8/source/gv_user_res.dat
@@ -8,7 +8,7 @@
 GV.fallbackOrientation:	portrait
 GV.swapLandscape:	False
 GV.autoCenter:		True
-GV.antialias:		False
+GV.antialias:		True
 GV.respectDSC:		True
 GV.ignoreEOF:		True
 GV.confirmPrint:	True
--- gv-3.5.8.orig/source/options_fs.c
+++ gv-3.5.8/source/options_fs.c
@@ -105,7 +105,6 @@
    Widget	w;
    XtPointer	client_data, call_data;
 {
-   BEGINMESSAGE(options_fs_cb_apply)
    Arg args[5];
    Cardinal n;
    static Boolean s_scratch_dir = False;
--- gv-3.5.8.orig/source/secscanf.c
+++ gv-3.5.8/source/secscanf.c
@@ -0,0 +1,540 @@
+/*
+ * Secure sscanf - sscanf with an additional size argument for string
+ * arguments. All format specifiers should work as in the standard
+ * scanf - except for those writing to a string buffer provided by the
+ * caller. These specifiers take an additional argument of type size_t
+ * that specifies the size of the buffer.
+ *
+ * Copyright (C) 2002, Olaf Kirch <okir@suse.de>
+ */
+
+#define _GNU_SOURCE
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+
+enum {
+	CONV_ANY,
+	CONV_STR,
+	CONV_NUM,
+	CONV_INTEGER,
+	CONV_FLOAT,
+	CONV_POINTER,
+};
+
+enum {
+	SIZE_ANY,
+	SIZE_SHORT,
+	SIZE_LONG,
+	SIZE_QUAD,
+};
+
+union scan_value {
+	const char *		v_string;
+	long long		v_signed;
+	unsigned long long	v_integer;
+	long double		v_double;
+	void *			v_pointer;
+};
+
+
+static int	process_number(union scan_value *vp, const char **sp, char fmt);
+static int	process_char_class(const char **, const char **, int);
+
+static inline int
+set_conv_type(int *type, int new_type)
+{
+	switch (*type) {
+	case CONV_ANY:
+		break;
+	case CONV_NUM:
+		if (new_type == CONV_INTEGER
+		 || new_type == CONV_FLOAT
+		 || new_type == CONV_POINTER)
+		 	break;
+		/* fallthru */
+	default:
+		if (*type != new_type)
+			return 0;
+		break;
+	}
+
+	*type = new_type;
+	return 1;
+}
+
+int
+sec_sscanf(const char *s, const char *fmt, ...)
+{
+	const char	*begin = s;
+	int		num_fields = 0, fmt_empty = 1;
+	va_list		ap;
+
+	va_start(ap, fmt);
+	while (*fmt) {
+		union scan_value value;
+		const char	*pre_space_skip,
+				*value_begin;
+		int		assign = 1, allocate = 0,
+				conv_type = CONV_ANY,
+				conv_size = SIZE_ANY,
+				field_width = -1,
+				nul_terminated = 1;
+		char		c;
+
+		c = *fmt++;
+		if (isspace(c)) {
+			while (isspace(*s))
+				s++;
+			continue;
+		}
+
+		fmt_empty = 0;
+		if (c != '%') {
+			if (c != *s)
+				goto stop;
+			s++;
+			continue;
+		}
+
+		/* Each % directive implicitly skips white space
+		 * except for the %c case */
+		pre_space_skip = s;
+		while (isspace(*s))
+			s++;
+
+		while (1) {
+			int	type = CONV_ANY, size = SIZE_ANY;
+
+			switch (*fmt) {
+			case '*':
+				assign = 0;
+				break;
+			case 'a':
+				type = CONV_STR;
+				allocate = 1;
+				break;
+			case 'h':
+				type = CONV_INTEGER;
+				size = SIZE_SHORT;
+				break;
+			case 'l':
+				type = CONV_NUM;
+				size = SIZE_LONG;
+				break;
+			case 'L':
+			case 'q':
+				type = CONV_NUM;
+				size = SIZE_QUAD;
+				break;
+			case '0': case '1': case '2': case '3': case '4':
+			case '5': case '6': case '7': case '8': case '9':
+				field_width = strtol(fmt, (char **) &fmt, 10);
+				fmt--;
+				break;
+			default:
+				goto flags_done;
+			}
+
+			if (!set_conv_type(&conv_type, type))
+				goto stop;
+
+			if (size != SIZE_ANY) {
+				if (size == SIZE_LONG && conv_size == SIZE_LONG)
+					conv_size = SIZE_QUAD;
+				else
+					conv_size = size;
+			}
+
+			fmt++;
+		}
+
+	flags_done:
+		value_begin = s;
+
+		switch (*fmt++) {
+		case '%':
+			if (*s == '\0')
+				goto eof;
+			if (*s != '%')
+				goto stop;
+			continue;
+		case '[':
+			value.v_string = s;
+			if (!set_conv_type(&conv_type, CONV_STR)
+			 || !process_char_class(&fmt, &s, field_width))
+				goto stop;
+			break;
+		case 's':
+			value.v_string = s;
+			if (!set_conv_type(&conv_type, CONV_STR))
+				goto stop;
+			while (*s && !isspace(*s) && field_width-- != 0)
+				s++;
+			break;
+		case 'c':
+			if (!set_conv_type(&conv_type, CONV_STR))
+				goto stop;
+			value.v_string = s = value_begin = pre_space_skip;
+
+			if (field_width < 0)
+				s++;
+			else while (*s && field_width--)
+				s++;
+			nul_terminated = 0;
+			break;
+		case 'd':
+		case 'i':
+		case 'o':
+		case 'u':
+		case 'x':
+		case 'X':
+			if (!set_conv_type(&conv_type, CONV_INTEGER)
+			 || !process_number(&value, &s, fmt[-1]))
+				goto stop;
+			break;
+		case 'p':
+			if (!set_conv_type(&conv_type, CONV_POINTER)
+			 || !process_number(&value, &s, fmt[-1]))
+				goto stop;
+			break;
+		case 'f':
+		case 'g':
+		case 'e':
+		case 'E':
+			if (!set_conv_type(&conv_type, CONV_FLOAT)
+			 || !process_number(&value, &s, fmt[-1]))
+				goto stop;
+			break;
+		case 'n':
+			if (!set_conv_type(&conv_type, CONV_INTEGER))
+				goto stop;
+			value.v_signed = (s - begin);
+			break;
+		default:
+			goto stop;
+		}
+
+		/* We've consumed what we need to consume. Now copy */
+		if (!assign)
+			continue;
+
+		/* Make sure we've consumed at least *something* */
+		if (s == value_begin)
+			goto eof;
+
+		/* Deal with a conversion flag */
+		if (conv_type == CONV_STR && allocate) {
+			value.v_pointer = strndup(value.v_string, s - value.v_string);
+			conv_type = CONV_POINTER;
+			allocate = 0;
+		}
+
+		switch (conv_type) {
+		case CONV_STR:
+			{
+				const char *string = value.v_string;
+				char	*buf;
+				size_t	size;
+
+				if (string == NULL)
+					goto stop;
+				buf = va_arg(ap, char *);
+				size = va_arg(ap, size_t) - nul_terminated;
+				if (size > s - string)
+					size = s - string;
+				strncpy(buf, string, size);
+				if (nul_terminated)
+					buf[size] = '\0';
+			}
+			break;
+
+		case CONV_POINTER:
+			{
+				void	**ptr;
+
+				ptr = va_arg(ap, void **);
+				*ptr = value.v_pointer;
+			}
+			break;
+		case CONV_INTEGER:
+			{
+				void	*ptr;
+
+				ptr = va_arg(ap, void *);
+				switch (conv_size) {
+				case SIZE_SHORT:
+					*(short *) ptr = value.v_integer;
+					break;
+				case SIZE_ANY:
+					*(int *) ptr = value.v_integer;
+					break;
+				case SIZE_LONG:
+					*(long *) ptr = value.v_integer;
+					break;
+				case SIZE_QUAD:
+					*(long long *) ptr = value.v_integer;
+					break;
+				default:
+					goto stop;
+				}
+			}
+			break;
+		case CONV_FLOAT:
+			{
+				void	*ptr;
+
+				ptr = va_arg(ap, void *);
+				switch (conv_size) {
+				case SIZE_ANY:
+					*(float *) ptr = value.v_double;
+					break;
+				case SIZE_LONG:
+					*(double *) ptr = value.v_double;
+					break;
+				case SIZE_QUAD:
+					*(long double *) ptr = value.v_double;
+					break;
+				default:
+					goto stop;
+				}
+			}
+			break;
+		default:
+			goto stop;
+		}
+
+		num_fields++;
+	}
+
+stop:	return num_fields;
+
+eof:	if (num_fields)
+		return num_fields;
+	return EOF;
+}
+
+static int
+process_number(union scan_value *vp, const char **sp, char fmt)
+{
+	const char	*s = *sp;
+
+	switch (fmt) {
+	case 'd':
+		vp->v_signed = strtoll(s, (char **) sp, 10);
+		break;
+	case 'i':
+		vp->v_signed = strtoll(s, (char **) sp, 0);
+		break;
+	case 'o':
+		vp->v_integer = strtoull(s, (char **) sp, 8);
+		break;
+	case 'u':
+		vp->v_integer = strtoull(s, (char **) sp, 10);
+		break;
+	case 'x':
+	case 'X':
+		vp->v_integer = strtoull(s, (char **) sp, 16);
+		break;
+	case 'p':
+		vp->v_pointer = (void *) strtoull(s, (char **) sp, 0);
+		break;
+	case 'f':
+	case 'g':
+	case 'e':
+	case 'E':
+		vp->v_double = strtold(s, (char **) sp);
+		break;
+	default:
+		return 0;
+	}
+
+	return 1;
+}
+
+static int
+process_char_class(const char **fmt, const char **sp, int width)
+{
+	unsigned char	*s, c, prev_char = 0;
+	unsigned char	table[255];
+	int		val = 1;
+
+	s = (unsigned char *) *fmt;
+	if (*s == '^') {
+		memset(table, 1, sizeof(table));
+		val = 0;
+		s++;
+	} else {
+		memset(table, 0, sizeof(table));
+		val = 1;
+	}
+	/* First character in set is closing bracket means add it to the
+	 * set of characters */
+	if ((c = *s) == ']') {
+		table[c] = val;
+		prev_char = c;
+		s++;
+	}
+
+	/* Any other closing bracket finishes off the set */
+	while ((c = *s++) != ']') {
+		if (prev_char) {
+			if (c == '-' && *s != '\0' && *s != ']') {
+				c = *s++;
+			} else {
+				//table[prev_char] = val;
+				prev_char = '\0';
+			}
+		}
+
+		if (c == '\0')
+			return 0;
+
+		if (prev_char) {
+			while (prev_char < c)
+				table[prev_char++] = val;
+		}
+		table[c] = val;
+		prev_char = c;
+	}
+	*fmt = (char *) s;
+
+#if 0
+	{
+		int	n;
+
+		printf("char class=");
+		for (n = 0; n < 255; n++)
+			if (table[n])
+				printf(isprint(n)? "%c" : "\\%03o", n);
+		printf("\n");
+	}
+#endif
+
+	s = (unsigned char *) *sp;
+	while ((c = *s) != '\0' && table[c] && width--)
+		s++;
+
+	*sp = (char *) s;
+	return 1;
+}
+
+#ifdef TEST
+static int	verify(const char *fmt, const char *s);
+static int	verify_s(const char *fmt, const char *s);
+
+
+
+int
+main(int argc, char **argv)
+{
+	verify("%d %d", "12 13");
+	verify("%d-%d", "12 13");
+	verify("%d-%d", "12-13");
+	verify("%u %u", "12 13");
+	verify("%o %o", "12 13");
+	verify("%x %x", "12 13");
+	verify("%X %X", "12 13");
+	verify("%hd %hd", "12 13");
+	verify("%ld %ld", "12 13");
+	verify("%lld %lld", "12 13");
+	verify("%Ld %Ld", "12 13");
+	verify("%qd %qd", "12 13");
+	verify("%f %f", "12 13");
+	verify("%lf %lf", "12 13");
+	verify("%Lf %Lf", "12 13");
+	verify("%qf %qf", "12 13");
+	verify("%*d-%d", "12-13");
+	verify("%*s %d", "12 13");
+	verify("%p", "0xdeadbeef");
+	verify("%*[a-e] %x", "deadbeef feeb");
+	verify("%*[a-f] %x", "deadbeef feeb");
+	verify("%*[^g-z] %x", "deadbeef feeb");
+	verify("%*[^ g-z] %x", "deadbeef feeb");
+	verify("%*[^ g-z-] %x", "dead-beef feeb");
+	verify("%*5s %d", "toast123 456");
+	verify("", "lalla");
+	verify("%u", "");
+
+	verify_s("%s", "aa bb");
+	verify_s("%s %s", "aa bb");
+	verify_s("%[a-z] %s", "aa bb");
+	verify_s("%c %s", "aa bb");
+	verify_s("%2c %s", " aa bb");
+	verify_s("%20c %s", " aa bb");
+
+	return 0;
+}
+
+static int
+verify(const char *fmt, const char *s)
+{
+	union scan_value vals[5], vals_ref[5], *v;
+	int	n, m;
+
+	memset(vals, 0xe5, sizeof(vals));
+	memset(vals_ref, 0xe5, sizeof(vals_ref));
+
+	v = vals;
+	n = sec_sscanf(s, fmt, v + 0, v + 1, v + 2, v + 3, v + 4);
+
+	v = vals_ref;
+	m = sscanf(s, fmt, v + 0, v + 1, v + 2, v + 3, v + 4);
+
+	if (m != n) {
+		printf("FAILED: fmt=\"%s\"\n"
+		       "        str=\"%s\"\n"
+		       "        sec_scanf returns %d, sscanf returns %d\n",
+		       fmt, s, n, m);
+		return 0;
+	}
+
+	if (memcmp(vals, vals_ref, sizeof(vals))) {
+		printf("FAILED: fmt=\"%s\"\n"
+		       "        str=\"%s\"\n"
+		       "        data differs!\n",
+		       fmt, s);
+		printf("0x%Lx != 0x%Lx\n", vals[0].v_integer, vals_ref[0].v_integer);
+		return 0;
+	}
+
+	return 1;
+}
+
+static int
+verify_s(const char *fmt, const char *s)
+{
+	char	buf[3][256], buf_ref[3][256];
+	int	n, m;
+
+	memset(buf, 0xe5, sizeof(buf));
+	memset(buf_ref, 0xe5, sizeof(buf_ref));
+
+	n = sec_sscanf(s, fmt, buf, sizeof(buf[0]), buf + 1, sizeof(buf[1]), buf + 2, sizeof(buf[2]));
+
+	m = sscanf(s, fmt, buf_ref, buf_ref + 1, buf_ref + 2);
+
+	if (m != n) {
+		printf("FAILED: fmt=\"%s\"\n"
+		       "        str=\"%s\"\n"
+		       "        sec_scanf returns %d, sscanf returns %d\n",
+		       fmt, s, n, m);
+		return 0;
+	}
+
+	if (memcmp(buf, buf_ref, sizeof(buf))) {
+		printf("FAILED: fmt=\"%s\"\n"
+		       "        str=\"%s\"\n"
+		       "        data differs!\n",
+		       fmt, s);
+		printf("%s != %s\n", buf[0], buf_ref[0]);
+		return 0;
+	}
+
+	return 1;
+}
+#endif
--- gv-3.5.8.orig/debian/control
+++ gv-3.5.8/debian/control
@@ -0,0 +1,20 @@
+Source: gv
+Section: text
+Priority: optional
+Maintainer: Christian Kesselheim <ckesselh@debian.org>
+Build-Depends: xaw3dg-dev, xutils
+Standards-Version: 3.5.6.0
+
+Package: gv
+Architecture: any
+Provides: postscript-viewer, pdf-viewer
+Replaces: gv-2d, gv-3d, fvwm-common (<< 2.0.46-BETA-2)
+Conflicts: gv-2d, gv-3d
+Depends: gs, ${shlibs:Depends}
+Description: A PostScript and PDF viewer for X using 3d Athena Widgets
+ `gv' is a comfortable viewer of PostScript and PDF files for the X
+ Window System.
+ .
+ It uses the `ghostscript' PostScript(tm) interpreter and is based 
+ on the classic X front-end for `gs', `ghostview'. It is more 
+ comfortable and more powerful than `ghostview'.
--- gv-3.5.8.orig/debian/prerm
+++ gv-3.5.8/debian/prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -x /usr/sbin/install-docs ]; then
+	install-docs -r gv
+fi
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) \
+  -a -L /usr/doc/gv ]; then
+    rm -f /usr/doc/gv
+fi
+
+exit 0
+
--- gv-3.5.8.orig/debian/rules
+++ gv-3.5.8/debian/rules
@@ -0,0 +1,77 @@
+#!/usr/bin/make -f
+# X?Emacs, -*- makefile -*- mode, please.  Thank you.
+
+INSTALL=install
+INSTDATA=$(INSTALL) -o root -g root -m 644 -c
+INSTDIR=$(INSTALL) -d 
+INSTPROG=$(INSTALL) -o root -g root -m 755 -c
+
+package=gv
+version=3.5.8
+
+define checkdir
+   test -f config.Unix -a -f debian/rules
+endef
+
+build:
+	$(checkdir)
+	-rm -f build
+	xmkmf -a
+	cp doc/gv.man source
+	make
+	touch build
+
+clean:	checkroot
+	$(checkdir)
+	-rm -f build 
+	-make clean
+	-rm -rf debian/tmp
+	-rm -f `find . -name Makefile -print`
+	-rm -f debian/files debian/substvars
+	-rm -f `find . \( -name \*~ -o -name \*.bak \) -print`
+	-rm -f source/gv.man
+
+binary-indep: 	checkroot build
+	$(checkdir)
+
+binary-arch: 	checkroot build
+	$(checkdir)
+	$(INSTDIR) debian/tmp/DEBIAN
+	$(INSTPROG) debian/preinst debian/tmp/DEBIAN
+	$(INSTPROG) debian/postinst debian/tmp/DEBIAN
+	$(INSTPROG) debian/prerm debian/tmp/DEBIAN
+	$(INSTPROG) debian/postrm debian/tmp/DEBIAN
+	$(INSTDATA) debian/conffiles debian/tmp/DEBIAN
+	$(INSTDIR) debian/tmp/usr/share/doc/gv
+	make install install.man INSTMANFLAGS="-m 644" DESTDIR=$(shell pwd)/debian/tmp
+	$(INSTDATA) debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
+	$(INSTDATA) CHANGES debian/tmp/usr/share/doc/$(package)/changelog
+	gzip -9v debian/tmp/usr/share/doc/$(package)/* debian/tmp/usr/X11R6/man/man1/*
+	make install.doc INSTMANFLAGS="-m 644" GV_DOCDIR=$(shell pwd)/debian/tmp/usr/share/doc/$(package)
+	$(INSTDATA) debian/copyright debian/tmp/usr/share/doc/$(package)
+	$(INSTDIR) debian/tmp/usr/X11R6/include/X11/pixmaps
+	$(INSTDATA) debian/gv_icon.xpm debian/mini-gv.xpm debian/tmp/usr/X11R6/include/X11/pixmaps
+	$(INSTDIR) debian/tmp/usr/lib/menu
+	$(INSTDATA) debian/gv.menu debian/tmp/usr/lib/menu/gv
+	$(INSTDIR) debian/tmp/usr/share debian/tmp/usr/share/doc-base
+	$(INSTDATA) debian/gv.doc-base debian/tmp/usr/share/doc-base/gv
+	$(INSTDIR) debian/tmp/usr/lib/mime debian/tmp/usr/lib/mime/packages
+	$(INSTDATA) debian/gv.mime debian/tmp/usr/lib/mime/packages/gv
+	strip --remove-section=.comment --remove-section=.note debian/tmp/usr/X11R6/bin/gv
+	dpkg-shlibdeps source/gv
+	dpkg-gencontrol -isp
+	chown -R root.root debian/tmp
+	chmod -R g-ws debian/tmp
+	dpkg --build debian/tmp ..
+
+# generic targets:
+binary:     binary-indep binary-arch
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
--- gv-3.5.8.orig/debian/conffiles
+++ gv-3.5.8/debian/conffiles
@@ -0,0 +1 @@
+/etc/X11/app-defaults/GV
--- gv-3.5.8.orig/debian/gv.doc-base
+++ gv-3.5.8/debian/gv.doc-base
@@ -0,0 +1,9 @@
+Document: gv
+Title: GV Manual - A PostScript and PDF viewer
+Author: Johannes Plass
+Abstract: Users manual for GV, a PostScript and PDF viewer.
+Section: Apps/Viewers
+
+Format: HTML
+Index: /usr/share/doc/gv/gv.html
+Files: /usr/share/doc/gv/*.html
--- gv-3.5.8.orig/debian/changelog
+++ gv-3.5.8/debian/changelog
@@ -0,0 +1,340 @@
+gv (1:3.5.8-26.1) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply patch from Olaf Kirch to fix buffer overflows
+
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 22 Sep 2002 23:45:55 -0400
+
+gv (1:3.5.8-26) unstable; urgency=low
+
+  * Upgraded to standards version 3.5.6.0
+  * Maintainer's email address exchanged
+  * Minor spelling mistakes in manpage fixed
+
+ -- Christian Kesselheim <ckesselh@debian.org>  Thu, 21 Mar 2002 14:58:18 +0100
+
+gv (1:3.5.8-25) unstable; urgency=high
+
+  * New maintainer
+  * Keep page markers in ToC when toggeling 'antialiasing' 
+    or some of the other flags (closes: #111039)
+  * Corrected handling of '-nosafer' and '-noquiet' (closes: #63223)
+  * Broken handling of malformed EPS files fixed (closes: #66059)
+  * Update ToC after auto-scrolling (closes: #46607)
+  * Replaced email address in "send error reports to" field
+    by maintainer's address, because upstream is dead
+  * Bashism in debian/rules fixed
+
+ -- Christian Kesselheim <ckesselh@infeurope.lu>  Mon, 11 Feb 2002 13:38:12 +0100
+
+gv (1:3.5.8-24) unstable; urgency=low
+
+  * Orphaned this package.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 25 Jan 2002 12:50:51 +0100
+
+gv (1:3.5.8-23) unstable; urgency=high
+
+  * Added a "Documents" menu hint. (closes: #121035)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 11 Jan 2002 01:12:57 +0100
+
+gv (1:3.5.8-22) unstable; urgency=high
+
+  * Make gv build again (patch by Jeff Licquia
+    <jlicquia@progeny.com>). (closes: #109902)
+  * Corrected some URLs in the documentation. (closes: #101630)
+  * Use the full path for the menu icon. (closes: #96346)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Thu, 30 Aug 2001 21:19:07 +0200
+
+gv (1:3.5.8-21) unstable; urgency=low
+
+  * Removed the outdated debian/shlibs.local.
+  * Strip gv better.
+  * Added a menu hint. (closes: #82334)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Wed, 14 Feb 2001 19:52:19 +0100
+
+gv (1:3.5.8-20) unstable; urgency=low
+
+  * Added missing build dependency on xutils. (closes: #80186)
+  * Enable antialiasing by default. (closes: #79913)
+  * Make /etc/X11/app-defaults/GV a conffile.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Tue, 16 Jan 2001 00:40:35 +0100
+
+gv (1:3.5.8-19) unstable; urgency=low
+
+  * Moved app-defaults from /usr/X11R6/lib/X11 to /etc/X11.
+    (closes: #77601)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Fri, 15 Dec 2000 00:42:46 +0100
+
+gv (1:3.5.8-18) unstable; urgency=low
+
+  * New maintainer.
+  * This upload goes to unstable. (closes: #68810)
+  * Added "-isp" to dpkg-gencontrol in debian/rules.
+  * Added Build-Depends.
+  * Updated the package description.
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Mon, 18 Sep 2000 12:35:57 +0200
+
+gv (1:3.5.8-17) frozen; urgency=low
+
+  * Corrected wrong link from /usr/doc/gv to
+    ../share/doc/gv (previously it pointed to ../share/doc/gv#).
+    The only file affected is debian/postinst (closes: Bug#61140)
+
+ -- Marco Pistore <pistore@debian.org>  Mon, 27 Mar 2000 10:36:00 +0200
+
+gv (1:3.5.8-16) unstable; urgency=low
+
+  * Removed empty lines from the top of file doc/gv.html,
+    so that it is correctly recognized as a html file
+    by dwww (closed: Bug#58977)
+  * Added DOCTYPE header to the doc/gv*.html files
+  * Documentation moved to /usr/share/doc/gv and link in /usr/doc
+    created.
+  * Moved to a recent debian-policy (3.1.1.1).
+
+ -- Marco Pistore <pistore@debian.org>  Fri,  3 Mar 2000 08:38:47 +0100
+
+gv (1:3.5.8-15) unstable; urgency=low
+
+  * Corrected weird error in preinst (closes: Bug#47044)
+
+ -- Marco Pistore <pistore@debian.org>  Tue,  12 Oct 1999 02:01:30 +0200
+
+gv (1:3.5.8-14) unstable; urgency=low
+
+  * Corrected the upstream URL in the copyright file (closes: Bug#41667)
+  * Now mime informations are handled via the update-mime approach
+    (closes: Bug#43331)
+  * Changed my email address to pistore@debian.org
+
+ -- Marco Pistore <pistore@debian.org>  Wed,  6 Oct 1999 23:12:30 +0200
+
+gv (1:3.5.8-13) unstable; urgency=low
+
+  * Readded menu entry (closes: Bug#41216)
+
+ -- Marco Pistore <pistore@di.unipi.it>  Fri, 16 Jul 1999 02:03:04 +0200
+
+gv (1:3.5.8-12) unstable; urgency=low
+
+  * Corrected the doc-base control file (closes: Bug#31771)
+  * Removed explicit dwww support: doc-base supplies it 
+    (closes: Bug#31772)
+
+ -- Marco Pistore <pistore@di.unipi.it>  Tue,  6 Jul 1999 22:38:32 +0200
+
+gv (1:3.5.8-11) unstable; urgency=low
+
+  * Special characters of filenames are now quoted in the commands that 
+    print, decompress and deal with PDF files (added function 
+    quote_filename to file misc.c; modified files source/save.c and 
+    source/ps.c) (closes: Bug#30738)
+  * Removed double quotes from commands that print, decompress and deal
+    with PDF files: they are no more needed (modified files config.Unix
+    and source/Imakefile)
+  * Added support for doc-base (closes Bug#31152)
+
+ -- Marco Pistore <pistore@di.unipi.it>  Sat,  2 Jan 1999 22:08:25 +0100
+
+gv (1:3.5.8-10) unstable; urgency=low
+
+  * Changed scratch dir from ~ to /tmp in file config.Unix 
+    (closes: Bug#30520).
+  * Changed print command in file config.Unix: the file name is
+    now quoted and gv prints also files with spaces (closes: Bug#30738).
+  * Changed command for uncompressing .gz files and for managing
+    PDF files in source/Imakefile so that the involved file names 
+    are quoted (closes: Bug#30514).
+  * Modified ps.c, so that strings %dsc and %pdf can appear in the command
+    that extract the structure from PDF files. Changed the default command to
+    'pdf2dsc "%pdf" "%dsc"'. 
+  * Changed the default command that converts PDF files into PS files
+    to 'pdf2ps "%pdf" "%ps"'.
+  * Added support for quoted strings in function process_fork in file
+    process.c.
+  * Now forward scrolling is allowed also when gv is called from a pipe:
+    modified file callbacks.c (closes: Bug#28382, Bug#29706).
+  * Redisplay is disabled for non-(gv_psfile) execution: modified
+    files misc.c and miscmenu.c.
+
+ -- Marco Pistore <pistore@di.unipi.it>  Sat, 19 Dec 1998 23:36:13 +0100
+
+gv (1:3.5.8-9) unstable frozen; urgency=low
+
+  * Rewritten description in control file (now PDF support is
+    provided also by GNU gs, not only by Aladdin gs). For the same
+    reason, removed Suggests: gs-aladdin. 
+  * Modified save.c, so that strings %ps and %pdf can appear in the command
+    that converts PDF files into PS files. Changed the default command to
+    "pdf2ps %pdf %ps" that works both with gs 4 and with gs 5.
+    (Closes: Bug:#30255)
+
+ -- Marco Pistore <pistore@di.unipi.it>  Mon,  7 Dec 1998 18:43:45 +0100
+
+gv (1:3.5.8-8) unstable; urgency=low
+
+  * Scratch dir back to ~/
+  * Now a "/" is automatically added to the end of the default scratch dir
+    if it is not present (so, if you set the scartch directory to
+    /tmp, the scratch files are saved into "/tmp/", not into "/"):
+    modified "source/file.c".  (Closes: Bug#23055)
+
+ -- Marco Pistore <pistore@di.unipi.it>  Wed, 17 Jun 1998 00:08:51 +0200
+
+gv (1:3.5.8-7) unstable frozen; urgency=low
+
+  * I forgot to upload previous version also to FROZEN!
+    BRIAN, please include this in HAMM, since it avoids a conflict 
+    the BO version of fvwm-common.
+
+ -- Marco Pistore <pistore@di.unipi.it>  Sun,  5 Apr 1998 19:17:58 +0200
+
+gv (1:3.5.8-6) unstable; urgency=low
+
+  * Added "Replaces: fvwm-common (<< 2.0.46-BETA-2)".
+    File /usr/X11R6/include/X11/pixmaps/mini-gv.xpm is present both in gv 
+    and in old versions of package fvwm-common (for instance, the one in 
+    debian 1.3). The "Replaces: fvwm-common" allows to install the package
+    without the --force-overwrite flag. See Packaging 8.5.1 (thanks James).
+
+ -- Marco Pistore <pistore@di.unipi.it>  Fri,  3 Apr 1998 22:11:04 +0200
+
+gv (1:3.5.8-5) unstable frozen; urgency=low
+
+  * New maintainer
+  * Typos in package description fixed (closes Bug#18925)
+  * Scartch dir is now /tmp (closes Bug#18728)
+  * Address of FSF corrected (lintian bug)
+  * Man and doc files have now mode 644 (lintian bug)
+  * -rpath (for xaw3d) has been removed: all works perfectly well also
+    without it
+  * Small changes in the rules file
+
+ -- Marco Pistore <pistore@di.unipi.it>  Wed, 25 Mar 1998 11:20:51 +0100
+
+gv (1:3.5.8-4) unstable; urgency=low
+
+  * Hech. I forgot the epock so dpkg will replace the `.1' version.  One more go.
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com>  Tue,  9 Dec 1997 03:36:49 -0800
+
+gv (3.5.8-3) unstable; urgency=low
+
+  * Really fix the depends on xaw3dg using a shlibs.local file.
+    fixes bug #15514
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com>  Tue,  9 Dec 1997 02:42:19 -0800
+
+gv (3.5.8-2) unstable; urgency=low
+
+  * Increment version number so that it will upgrade the non-maintainer version
+  `-.1' that should have been `-0.1'.
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com>  Mon, 24 Nov 1997 12:51:57 -0800
+
+gv (3.5.8-1) unstable; urgency=low
+
+  * I've closed a bunch of outstanding bug reports, many of which should
+    have been closed earlier.
+  * Depend on `xaw3dg' (several bugs, merged, 13986)
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com>  Sat, 22 Nov 1997 22:59:39 -0800
+
+gv (3.5.8-.1) unstable; urgency=low
+
+  * Non-maintainer release
+  * Latest version - Pristine sources.
+  * compiled with xlib6g, and libc6
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com>  Wed,  1 Oct 1997 11:02:22 -0700
+
+gv (3.4.3-1.1) unstable; urgency=low
+
+  * Non-maintainer release, compiled with xlib6g.
+
+ -- Karl M. Hegbloom <karlheg@inetarena.com>  Tue, 30 Sep 1997 17:06:16 -0700
+
+gv (3.4.3-1) unstable; urgency=low
+
+  * new upstream release including heavy improvements in look and feel as
+    well as several major improvements of the PostScript preprocessor and
+    several new features.  
+  * this version can no longer be used with standard Athena Widgets. This
+    release uses (and depends on) the shared Xaw3d library. By using the
+    -rpath option, the library has to be installed, but doesn't have to be
+    used as replacement for Xaw. It would be possible to link it
+    statically against Xaw3d (still dynamically linking all the rest).
+    If there are enough requests for this, I'll change the package to do
+    this. 
+    For people compiling from source, simply use the other definition of 
+    XAWLIB in config.Unix for the static version. 
+    Note that the standard symlinks in /usr/X11R6/lib/Xaw3d may be
+    incorrect. You should check them first if you want to compile gv with
+    shared libXaw3d.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Sun, 27 Apr 1997 02:05:17 +0200
+
+gv (2.9.4-2) frozen unstable; urgency=low
+
+  * fixed typo
+  * uploaded to frozen
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Fri, 18 Apr 1997 01:01:13 +0200
+
+gv (2.9.4-1) unstable; urgency=low
+
+  * new upstream release
+  * fixed prerm script (Bug# 7857)
+  * added menu entries
+  * added direct access to HTML docs according to Webstandard via menu.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Sat, 5 Apr 1997 13:06:04 +020
+0
+
+gv (2.7b6-1) unstable; urgency=low
+
+  * fixed bug 6718 (wrong MIME viewer installation)
+  * fixed bug 7228 (app-default problem)
+  * converted to new debian standard version 2.1.2.2
+  * new upstream release
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Thu, 20 Feb 1997 01:04:29 +0100
+
+gv (2.7b5-3) unstable; urgency=low
+
+  * fixed bug 4700 (gv not stripped)
+  * added mime type application/ghostview
+  * added Provides: postscript-viewer, pdf-viewer
+  * finally found all functions using private Xaw code and eliminated
+    them. Now there is just one gv package for both standard and 3D Athena
+    Widgets. fixed control files for this.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Thu, 17 Oct 1996 22:56:53 +0200
+
+gv (2.7b5-2) unstable; urgency=low
+
+  * fixed install-mime entry in postinst
+  * fixed app-defaults file for 2d gv
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Sat, 5 Oct 1996 10:48:54 +0200
+
+gv (2.7b5-1) unstable; urgency=LOW
+
+  * First Debian release of the gv PostScript/PDF viewer.
+    several changes had to be made in order to support
+    standard Athena Widgets as well as Xaw3d. 
+  * Regretfully there is currently no way to make a binary supporting
+    both kinds at the same time.
+
+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de>  Sat, 5 Oct 1996 10:48:08 +0200
+
+Local Variables:
+mode: debian-changelog
+End:
--- gv-3.5.8.orig/debian/postinst
+++ gv-3.5.8/debian/postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then
+  if [ -d /usr/doc -a ! -e /usr/doc/gv \
+    -a -d /usr/share/doc/gv ]; then
+      ln -sf ../share/doc/gv /usr/doc/gv
+  fi
+fi
+
+if [ -x /usr/sbin/update-mime ]; then
+  update-mime
+fi
+
+if [ -x /usr/bin/update-menus ] ; then
+  update-menus
+fi
+
+if [ -x /usr/sbin/install-docs ]; then
+  install-docs -i /usr/share/doc-base/gv
+fi
+
+exit 0
+
+
--- gv-3.5.8.orig/debian/mini-gv.xpm
+++ gv-3.5.8/debian/mini-gv.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * mini_gv_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"16 14 3 1",
+/* colors */
+" 	s None	c None",
+".	c black",
+"X	c White",
+/* pixels */
+"     ....       ",
+"    .XXXX.      ",
+"   .XXXXXX.     ",
+"   .XXXXXX.     ",
+"  ..X.XX.X...   ",
+" .XXX.XX.X.XX.  ",
+" .XXXXXXXXXXX.  ",
+"  .XXXXXXXXX.   ",
+"   .XXXXXXX.    ",
+"   .XXXXXXX.    ",
+"   .XXXXXXX.    ",
+"  .XXXXXXXXX.   ",
+" .XXX.XXX.XXX.  ",
+"  .... ... ..   "};
--- gv-3.5.8.orig/debian/postrm
+++ gv-3.5.8/debian/postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/bin/update-menus ] ; then
+  update-menus 
+fi
+
+if [ -x /usr/sbin/update-mime ]; then
+  update-mime
+fi
--- gv-3.5.8.orig/debian/gv.menu
+++ gv-3.5.8/debian/gv.menu
@@ -0,0 +1,3 @@
+?package(gv):needs="x11" section="Apps/Viewers" title="GV" \
+        icon="/usr/X11R6/include/X11/pixmaps/mini-gv.xpm" \
+	command="/usr/bin/X11/gv" hints="PostScript,Documents"
--- gv-3.5.8.orig/debian/gv.mime
+++ gv-3.5.8/debian/gv.mime
@@ -0,0 +1,5 @@
+application/postscript; /usr/bin/X11/gv %s; test=test -n "$DISPLAY"; description=postscript
+application/ghostview; /usr/bin/X11/gv %s; test=test -n "$DISPLAY"
+application/pdf; /usr/bin/X11/gv %s; test=test -n "$DISPLAY"
+
+
--- gv-3.5.8.orig/debian/copyright
+++ gv-3.5.8/debian/copyright
@@ -0,0 +1,32 @@
+This package was put together by Christian Kesselheim <ckesselh@debian.org> 
+using sources obtained from
+
+ http://wwwthep.physik.uni-mainz.de/~plass/gv/
+
+
+!
+!** Copyright (C) 1995, 1996, 1997 Johannes Plass
+! 
+! This program 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.
+! 
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with this program; if not, write to the Free Software
+! Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+! MA 02111-1307, USA.
+! 
+! Author:   Johannes Plass (plass@thep.physik.uni-mainz.de)
+!           Department of Physics
+!           Johannes Gutenberg-University
+!           Mainz, Germany
+!
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL.
--- gv-3.5.8.orig/debian/gv_icon.xpm
+++ gv-3.5.8/debian/gv_icon.xpm
@@ -0,0 +1,59 @@
+/* XPM */
+static char * gv_icon_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"50 50 3 1",
+/* colors */
+" 	c None",
+".	c black",
+"X	c white",
+/* pixels */
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                     ......                       ",
+"                    ..XXXX...                     ",
+"                   ..XXXXXXX..                    ",
+"                  ..XXXXXXXXX.                    ",
+"                  ..XXXXXXXXXX.                   ",
+"                  ..XXXXXXXXXX.                   ",
+"                  ..XXXXXXXXX..                   ",
+"                  ...XXXXXXX..                    ",
+"         ....      ..XXXXXX..                     ",
+"         ..X..     ...XXXXX.      ....            ",
+"        ...XX.      ..XXXXX.     ..XX..           ",
+"        ...XX...    .XXXXXX.    ..XXXX.           ",
+"         ...XXX.....XXXXXXX..  ..XXX...           ",
+"          ...XXXXXXXXXXXXXXX....XXX..             ",
+"           ....XXXXXXXXXXXXXXXXXXX..              ",
+"             ...XXXXXXXXXXXXXXXXX..               ",
+"              ...XXXXXXXXXXXXXXX..                ",
+"               ...XXXXXXXXXXXXX..                 ",
+"                ..XXXXXXXXXXXXX..                 ",
+"                ...XXXXXXXXXXX..                  ",
+"                ...XXXXXXXXXX..                   ",
+"                 ..XXXXXXXXXX.                    ",
+"                 ...XXXXXXXX..                    ",
+"                  ...XXXXXXX.                     ",
+"                   ..XXXXXXX..                    ",
+"                   ...XXXXXX..                    ",
+"                    ...XXXXXX.                    ",
+"                    ...XXXXXX..   ..              ",
+"                     ...XXXXX.......              ",
+"                     ...XXXXXX....X.              ",
+"                      ...XXXXXXXXX..              ",
+"                       ....XXXXXX..               ",
+"                        ..........                ",
+"                          .......                 ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  ",
+"                                                  "};
--- gv-3.5.8.orig/debian/preinst
+++ gv-3.5.8/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -x /usr/sbin/install-mime ] && [ "$1" = "upgrade" ] && \
+   `dpkg --compare-versions $2 lt 1:3.5.8-14` ; then
+	echo "Removing old MIME information..."
+	install-mime --remove --package=gv
+fi
+
+exit 0
