--- ./scheduler/file.c	Thu Apr 10 08:57:44 2003
+++ ../cups-1.1.19/./scheduler/file.c	Wed Jun 18 13:23:35 2003
@@ -830,7 +830,7 @@
     * Decompress data from the buffer...
     */
 
-    fp->stream.next_out  = fp->buf;
+    fp->stream.next_out  = (Bytef *) fp->buf;
     fp->stream.avail_out = sizeof(fp->buf);
 
     if (inflate(&(fp->stream), Z_NO_FLUSH) == Z_STREAM_END)
--- ./pdftops/PSOutputDev.cxx	Wed May 14 14:22:24 2003
+++ ../cups-1.1.19/./pdftops/PSOutputDev.cxx	Wed Jun 18 13:40:16 2003
@@ -1707,8 +1707,7 @@
     x2 = (int)(state->getX2() + 0.5);
     y2 = (int)(state->getY2() + 0.5);
     writePSFmt("%%%%PageBoundingBox: %d %d %d %d\n",
-	       (int)floor(x1), (int)floor(y1),
-	       (int)ceil(x2), (int)ceil(y2));
+	       x1, y1, x2, y2);
     writePS("%%BeginPageSetup\n");
     width = x2 - x1;
     height = y2 - y1;
--- ./templates/fr/Makefile	Tue Dec 17 14:00:23 2002
+++ ../cups-1.1.19/./templates/fr/Makefile	Wed Jun 18 13:23:35 2003
@@ -56,6 +56,7 @@
 		modify-class.tmpl \
 		modify-printer.tmpl \
 		option-boolean.tmpl \
+		option-conflict.tmpl \
 		option-header.tmpl \
 		option-pickmany.tmpl \
 		option-pickone.tmpl \