rpms/cups/devel cups-1.1.15-initscript.patch, 1.5, 1.6 cups-svn.patch, 1.8, 1.9 cups.spec, 1.195, 1.196 cups-str1670.patch, 1.1, NONE cups-str1705.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat May 20 16:35:33 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26564
Modified Files:
cups-1.1.15-initscript.patch cups-svn.patch cups.spec
Removed Files:
cups-str1670.patch cups-str1705.patch
Log Message:
* Sat May 20 2006 Tim Waugh <twaugh at redhat.com>
- Sync to svn5555. No longer need str1670 or str1705 patches.
cups-1.1.15-initscript.patch:
Makefile | 29 -----------------------------
1 files changed, 29 deletions(-)
Index: cups-1.1.15-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.15-initscript.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-1.1.15-initscript.patch 23 Mar 2006 12:33:24 -0000 1.5
+++ cups-1.1.15-initscript.patch 20 May 2006 16:35:10 -0000 1.6
@@ -1,11 +1,11 @@
---- cups-1.2b2/Makefile.noinit 2006-03-23 11:39:33.000000000 +0000
-+++ cups-1.2b2/Makefile 2006-03-23 11:40:22.000000000 +0000
-@@ -80,32 +80,6 @@
+--- cups-1.2.0/Makefile.noinit 2006-05-20 17:21:22.000000000 +0100
++++ cups-1.2.0/Makefile 2006-05-20 17:27:01.000000000 +0100
+@@ -99,35 +99,6 @@
echo Installing cups-config script...
$(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-- echo Installing startup script...
- if test "x$(INITDIR)" != x; then \
+- echo Installing init scripts...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -20,13 +20,16 @@
- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+- echo Installing StartupItems files...; \
- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
- $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+- echo Installing LaunchDaemons configuration file...; \
- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- else \
+- echo Installing RC script...; \
- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
- fi \
- fi
cups-svn.patch:
0 files changed
Index: cups-svn.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-svn.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cups-svn.patch 19 May 2006 08:44:01 -0000 1.8
+++ cups-svn.patch 20 May 2006 16:35:11 -0000 1.9
@@ -1,5 +1,5 @@
--- cups-config.in (revision 5500)
-+++ cups-config.in (working copy)
++++ cups-config.in (revision 5555)
@@ -33,0 +34 @@
+imagelibdir=@libdir@
@@ -47,3 +48,15 @@
@@ -33,30 +33,58 @@
- echo $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+ echo $imagelibdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
--- ppd/zebracpl.ppd (revision 5500)
-+++ ppd/zebracpl.ppd (working copy)
++++ ppd/zebracpl.ppd (revision 5555)
@@ -163 +163 @@
-*zePrintRate Default/PrinterDefault: Default
+*zePrintRate Default/PrinterDefault: ""
--- ppd/zebra.ppd (revision 5500)
-+++ ppd/zebra.ppd (working copy)
++++ ppd/zebra.ppd (revision 5555)
@@ -258 +258 @@
-*CloseUI: *zeMediaType
+*CloseUI: *MediaType
--- ppd/zebraep1.ppd (revision 5500)
-+++ ppd/zebraep1.ppd (working copy)
++++ ppd/zebraep1.ppd (revision 5555)
@@ -284 +284 @@
-*zePrintRate Default/PrinterDefault: Default
+*zePrintRate Default/PrinterDefault: ""
--- ppd/zebraep2.ppd (revision 5500)
-+++ ppd/zebraep2.ppd (working copy)
++++ ppd/zebraep2.ppd (revision 5555)
@@ -250 +250 @@
-*CloseUI: *zeMediaType
+*CloseUI: *MediaType
@@ -292 +292 @@
-*zePrintRate Default/PrinterDefault: Default
+*zePrintRate Default/PrinterDefault: ""
+--- backend/usb-unix.c (revision 5500)
++++ backend/usb-unix.c (revision 5555)
+@@ -62,0 +63 @@
++ int usebc; /* Use backchannel path? */
+@@ -85,0 +87,8 @@
++ * Disable backchannel data when printing to Canon USB printers - apparently
++ * Canon printers will return the IEEE-1284 device ID over and over and over
++ * when they get a read request...
++ */
++
++ usebc = strcasecmp(hostname, "Canon") != 0;
++
++ /*
+@@ -241 +250,3 @@
+- FD_SET(fd, &input);
++ if (usebc)
++ FD_SET(fd, &input);
++
+--- backend/serial.c (revision 5500)
++++ backend/serial.c (revision 5555)
+@@ -313 +313 @@
+- if (*options == '+')
++ if (*options == '+' || *options == '&')
+--- backend/ipp.c (revision 5500)
++++ backend/ipp.c (revision 5555)
+@@ -279 +279 @@
+- if (*optptr == '+')
++ if (*optptr == '+' || *optptr == '&')
--- config-scripts/cups-ssl.m4 (revision 5500)
-+++ config-scripts/cups-ssl.m4 (working copy)
++++ config-scripts/cups-ssl.m4 (revision 5555)
@@ -58,12 +58,8 @@
- AC_CHECK_HEADER(gnutls/gnutls.h,
- dnl Save the current libraries so the crypto stuff isn't always
@@ -84,8 +112,19 @@
+ AC_MSG_RESULT([ Using SSLFLAGS="$SSLFLAGS"])
+fi
+
+--- config-scripts/cups-directories.m4 (revision 5500)
++++ config-scripts/cups-directories.m4 (revision 5555)
+@@ -133,3 +133,5 @@
+- AC_CHECK_PROG(INITDDIR, launchd,
+- "/System/Library/LaunchDaemons",
+- "/System/Library/StartupItems/PrintingServices")
++ if test -x /sbin/launchd; then
++ INITDDIR="/System/Library/LaunchDaemons"
++ else
++ INITDDIR="/System/Library/StartupItems/PrintingServices"
++ fi
--- locale/cups_pl.po (revision 0)
-+++ locale/cups_pl.po (revision 5545)
++++ locale/cups_pl.po (revision 5555)
@@ -0,0 +1,2812 @@
+#
+# "$Id$"
@@ -2900,7 +2939,7 @@
+# End of "$Id$".
+#
--- doc/help/spec-raster.html (revision 5500)
-+++ doc/help/spec-raster.html (working copy)
++++ doc/help/spec-raster.html (revision 5555)
@@ -4,0 +5 @@
+ <LINK REL="STYLESHEET" TYPE="test/css" HREF="../cups.css">
@@ -40 +41,2 @@
@@ -3162,7 +3201,7 @@
+
+
--- doc/pl/index.html.in (revision 5500)
-+++ doc/pl/index.html.in (working copy)
++++ doc/pl/index.html.in (revision 5555)
@@ -5 +5 @@
- <TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
+ <TITLE>Strona domowa - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
@@ -3246,8 +3285,13 @@
+zarejestrowanymi znakami towarowymi <A HREF="http://www.easysw.com">Easy Software
+Products</A>. Copyright 1997-2006 Easy Software Products,
+wszelkie prawa zastrzeżone.</SMALL></P>
+--- cups/backchannel.c (revision 5500)
++++ cups/backchannel.c (revision 5555)
+@@ -164 +164 @@
+- if (errno != EINTR && errno != EAGAIN)
++ if (errno != EINTR)
--- cups/mark.c (revision 5500)
-+++ cups/mark.c (working copy)
++++ cups/mark.c (revision 5555)
@@ -244,3 +243,0 @@
- ppd_option_t key; /* Option search key */
-
@@ -3292,13 +3336,31 @@
- return ((ppd_option_t *)cupsArrayFind(ppd->options, &key));
+ return (NULL);
+ }
+--- cups/request.c (revision 5500)
++++ cups/request.c (revision 5555)
+@@ -72,0 +73 @@
++ http_status_t expect; /* Expect: header to use */
+@@ -148,0 +150 @@
++ expect = HTTP_CONTINUE;
+@@ -166 +168 @@
+- httpSetExpect(http, HTTP_CONTINUE);
++ httpSetExpect(http, expect);
+@@ -314,0 +317,8 @@
++ else if (status == HTTP_EXPECTATION_FAILED)
++ {
++ /*
++ * Don't try using the Expect: header the next time around...
++ */
++
++ expect = (http_status_t)0;
++ }
--- cups/encode.c (revision 5500)
-+++ cups/encode.c (working copy)
++++ cups/encode.c (revision 5555)
@@ -135,0 +136,2 @@
+ { "requesting-user-name-allowed", IPP_TAG_NAME, IPP_TAG_PRINTER },
+ { "requesting-user-name-denied", IPP_TAG_NAME, IPP_TAG_PRINTER },
--- cups/snprintf.c (revision 5500)
-+++ cups/snprintf.c (working copy)
++++ cups/snprintf.c (revision 5555)
@@ -99 +99,4 @@
- // Get width from argument...
+ /*
@@ -3311,8 +3373,13 @@
+ * Get precision from argument...
+ */
+
+--- cups/page.c (revision 5500)
++++ cups/page.c (revision 5555)
+@@ -90 +90 @@
+- l = _cupsStrScand(nameptr, &nameptr, loc);
++ l = _cupsStrScand(nameptr + 1, &nameptr, loc);
--- cups/getifaddrs.c (revision 5500)
-+++ cups/getifaddrs.c (working copy)
++++ cups/getifaddrs.c (revision 5555)
@@ -185,2 +185,3 @@
- if ((temp->ifa_dstaddr = calloc(1, sizeof(request.ifr_broadaddr))) != NULL)
- memcpy(temp->ifa_dstaddr, &(request.ifr_broadaddr),
@@ -3320,7 +3387,7 @@
+ calloc(1, sizeof(request.ifr_broadaddr))) != NULL)
+ memcpy(temp->ifa_broadaddr, &(request.ifr_broadaddr),
--- cups/http-private.h (revision 5500)
-+++ cups/http-private.h (working copy)
++++ cups/http-private.h (revision 5555)
@@ -164,2 +164,7 @@
- *ifa_netmask, /* Address mask */
- *ifa_dstaddr; /* Broadcast or destination address */
@@ -3339,8 +3406,14 @@
+# define ifa_dstaddr ifa_ifu.ifu_dstaddr
+# endif /* !ifa_dstaddr */
+
+--- systemv/cupstestppd.c (revision 5500)
++++ systemv/cupstestppd.c (revision 5555)
+@@ -1179 +1179,2 @@
+- if (ppdFindAttr(ppd, "1284DeviceId", NULL))
++ if ((attr = ppdFindAttr(ppd, "1284DeviceID", NULL)) &&
++ strcmp(attr->name, "1284DeviceID"))
--- systemv/lpadmin.c (revision 5500)
-+++ systemv/lpadmin.c (working copy)
++++ systemv/lpadmin.c (revision 5555)
@@ -468,0 +469,19 @@
+ case 'U' : /* Username */
+ if (argv[i][2] != '\0')
@@ -3362,7 +3435,7 @@
+ break;
+
--- systemv/lpstat.c (revision 5500)
-+++ systemv/lpstat.c (working copy)
++++ systemv/lpstat.c (revision 5555)
@@ -238,4 +238,4 @@
- _cupsLangPuts(stderr,
- _("%s: Error - expected destination after "
@@ -3372,8 +3445,20 @@
+ _("%s: Error - expected destination after "
+ "\'-b\' option!\n"),
+ argv[0]);
+--- Makefile (revision 5500)
++++ Makefile (revision 5555)
+@@ -102 +101,0 @@
+- echo Installing startup script...
+@@ -103,0 +103 @@
++ echo Installing init scripts...; \
+@@ -117,0 +118 @@
++ echo Installing StartupItems files...; \
+@@ -122,0 +124 @@
++ echo Installing LaunchDaemons configuration file...; \
+@@ -124,0 +127 @@
++ echo Installing RC script...; \
--- filter/image-bmp.c (revision 5500)
-+++ filter/image-bmp.c (working copy)
++++ filter/image-bmp.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -3437,7 +3522,7 @@
+ cupsImageRGBToCMYK(in, out, img->xsize);
+ break;
--- filter/image-sgi.c (revision 5500)
-+++ filter/image-sgi.c (working copy)
++++ filter/image-sgi.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -3506,7 +3591,7 @@
- }
+ _cupsImagePutRow(img, 0, y, img->xsize, out);
--- filter/imagetoraster.c (revision 5500)
-+++ filter/imagetoraster.c (working copy)
++++ filter/imagetoraster.c (revision 5555)
@@ -28,0 +29 @@
+ * blank_line() - Clear a line buffer to the blank value...
@@ -62 +63 @@
@@ -4723,7 +4808,7 @@
- bitmask = 0x0;
+ bitmask = 0xc0;
--- filter/image-tiff.c (revision 5500)
-+++ filter/image-tiff.c (working copy)
++++ filter/image-tiff.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5062,7 +5147,7 @@
- }
+ _cupsImagePutCol(img, x, 0, img->ysize, out);
--- filter/image-colorspace.c (revision 5500)
-+++ filter/image-colorspace.c (working copy)
++++ filter/image-colorspace.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5157,7 +5242,7 @@
+ else if (ciez < 1.1f)
+ val[2] = (int)(231.8181f * ciez + 0.5);
--- filter/image-pix.c (revision 5500)
-+++ filter/image-pix.c (working copy)
++++ filter/image-pix.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5218,7 +5303,7 @@
+ cupsImageRGBToCMYK(in, out, img->xsize);
+ break;
--- filter/image-sun.c (revision 5500)
-+++ filter/image-sun.c (working copy)
++++ filter/image-sun.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5284,7 +5369,7 @@
- }
+ _cupsImagePutRow(img, 0, y, img->xsize, out);
--- filter/raster.c (revision 5500)
-+++ filter/raster.c (working copy)
++++ filter/raster.c (revision 5555)
@@ -73,0 +74,18 @@
+ * Private structures...
+ */
@@ -5444,12 +5529,12 @@
@@ -828,0 +896 @@
+ }
--- filter/image-png.c (revision 5500)
-+++ filter/image-png.c (working copy)
++++ filter/image-png.c (revision 5555)
@@ -219 +219 @@
- memcpy(out, inptr, img->xsize * 3);
+ cupsImageRGBToRGB(inptr, out, img->xsize);
--- filter/image-jpeg.c (revision 5500)
-+++ filter/image-jpeg.c (working copy)
++++ filter/image-jpeg.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5460,7 +5545,7 @@
+ cupsImageRGBToRGB(in, out, img->xsize);
+ break;
--- filter/raster.h (revision 5500)
-+++ filter/raster.h (working copy)
++++ filter/raster.h (revision 5555)
@@ -306,13 +306,2 @@
-typedef struct _cups_raster_s /**** Raster stream data ****/
-{
@@ -5478,7 +5563,7 @@
+typedef struct _cups_raster_s cups_raster_t;
+ /**** Raster stream data ****/
--- filter/image-pnm.c (revision 5500)
-+++ filter/image-pnm.c (working copy)
++++ filter/image-pnm.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5538,12 +5623,12 @@
- }
+ _cupsImagePutRow(img, 0, y, img->xsize, out);
--- filter/interpret.c (revision 5500)
-+++ filter/interpret.c (working copy)
++++ filter/interpret.c (revision 5555)
@@ -299 +299 @@
- if (h->cupsBitsPerPixel == 1)
+ if (h->cupsBitsPerColor == 1)
--- filter/image-photocd.c (revision 5500)
-+++ filter/image-photocd.c (working copy)
++++ filter/image-photocd.c (revision 5555)
@@ -10 +10 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5600,7 +5685,7 @@
+ else
+ _cupsImagePutRow(img, 0, y + pass, 768, out);
--- filter/image-gif.c (revision 5500)
-+++ filter/image-gif.c (working copy)
++++ filter/image-gif.c (revision 5555)
@@ -6 +6 @@
- * Copyright 1993-2005 by Easy Software Products.
+ * Copyright 1993-2006 by Easy Software Products.
@@ -5608,7 +5693,7 @@
+ for (i = ncolors - 1; i >= 0; i --)
+ cupsImageRGBToRGB(cmap[i], cmap[i], 1);
--- filter/pstops.c (revision 5500)
-+++ filter/pstops.c (working copy)
++++ filter/pstops.c (revision 5555)
@@ -187 +187,5 @@
-static void doc_printf(pstops_doc_t *doc, const char *format, ...);
+static void doc_printf(pstops_doc_t *doc, const char *format, ...)
@@ -5655,13 +5740,23 @@
+ tx + w * x, ty + l * y, w / bboxw, l / bboxl);
+
--- CHANGES.txt (revision 5500)
-+++ CHANGES.txt (working copy)
++++ CHANGES.txt (revision 5555)
@@ -1 +1 @@
-CHANGES.txt - 2006-05-08
-+CHANGES.txt - 2006-05-18
-@@ -3,0 +4,51 @@
++CHANGES.txt - 2006-05-20
+@@ -3,0 +4,61 @@
+CHANGES IN CUPS V1.2.1
+
++ - The IPP backend did not work reliably with some Xerox
++ printers (STR #1704)
++ - Trailing banners were not added when printing a single
++ file (STR #1698)
++ - The web interface support programs crashed on Solaris
++ (STR #1699)
++ - cupstestppd incorrectly reported problems with
++ *1284DeviceID attributes (STR #1710)
++ - Browsing could get disabled after a restart (STR #1670)
++ - Custom page sizes were not parsed properly (STR #1709)
+ - The -U option wasn't supported by lpadmin (STR #1702)
+ - The -u option didn't work with lpadmin (STR #1703)
+ - The scheduler did not create non-blocking back-channel
@@ -5712,27 +5807,27 @@
+
+
--- templates/ja/jobs.tmpl (revision 5500)
-+++ templates/ja/jobs.tmpl (working copy)
++++ templates/ja/jobs.tmpl (revision 5555)
@@ -21 +21 @@
-{job_state=5?{time_at_processing}<BR>ã‹ã‚‰å‡¦ç†ä¸:{job_state=6?{time_at_completed}<BR>ã«åœæ¢:
+{job_state=5?{time_at_processing}<BR>ã‹ã‚‰å‡¦ç†ä¸:{job_state=6?ã«åœæ¢:
--- templates/sv/jobs.tmpl (revision 5500)
-+++ templates/sv/jobs.tmpl (working copy)
++++ templates/sv/jobs.tmpl (revision 5555)
@@ -21 +21 @@
-{job_state=5?behandlas sedan<BR>{time_at_processing}:{job_state=6?stoppad kl<BR>{time_at_completed}:
+{job_state=5?behandlas sedan<BR>{time_at_processing}:{job_state=6?stoppad:
--- templates/jobs.tmpl (revision 5500)
-+++ templates/jobs.tmpl (working copy)
++++ templates/jobs.tmpl (revision 5555)
@@ -21 +21 @@
-{job_state=5?processing since<BR>{time_at_processing}:{job_state=6?stopped at<BR>{time_at_completed}:
+{job_state=5?processing since<BR>{time_at_processing}:{job_state=6?stopped:
--- templates/pl/printer-jobs-header.tmpl (revision 5500)
-+++ templates/pl/printer-jobs-header.tmpl (working copy)
++++ templates/pl/printer-jobs-header.tmpl (revision 5555)
@@ -1 +1 @@
-<H3 CLASS="title">Wydruki</H3>
+<H3 CLASS="title">Zadania</H3>
--- templates/pl/printer-default.tmpl (revision 5500)
-+++ templates/pl/printer-default.tmpl (working copy)
++++ templates/pl/printer-default.tmpl (revision 5555)
@@ -1,3 +1,3 @@
-<P>{is_class?Grupa:Drukarka} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
@@ -5746,7 +5841,7 @@
+polecenie <TT>lpoptions</TT> zastąpi te domyślne
+ustawienie.</BLOCKQUOTE>
--- templates/pl/search.tmpl (revision 5500)
-+++ templates/pl/search.tmpl (working copy)
++++ templates/pl/search.tmpl (revision 5555)
@@ -5,2 +5,2 @@
-<P ALIGN="CENTER"><B>Przeszukaj
-{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?Grupy:{SECTION=jobs?Wydruki:Drukarki}}}:</B>
@@ -5756,7 +5851,7 @@
-TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Szukaj">
+TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Wyszukaj">
--- templates/pl/add-printer.tmpl (revision 5500)
-+++ templates/pl/add-printer.tmpl (working copy)
++++ templates/pl/add-printer.tmpl (revision 5555)
@@ -4 +4 @@
-<H2 CLASS="title">Dodaj NowÄ… DrukarkÄ™</H2>
+<H2 CLASS="title">Dodaj nowÄ… drukarkÄ™</H2>
@@ -5773,7 +5868,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
--- templates/pl/job-move.tmpl (revision 5500)
-+++ templates/pl/job-move.tmpl (working copy)
++++ templates/pl/job-move.tmpl (revision 5555)
@@ -5 +5 @@
-<H2 CLASS="title">{job_id?PrzenieÅ› Wydruk {job_id}:PrzenieÅ› Wszystkie Wydruki}</H2>
+<H2 CLASS="title">{job_id?PrzenieÅ› zadanie {job_id}:PrzenieÅ› wszystkie zadania}</H2>
@@ -5784,7 +5879,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="{job_id?PrzenieÅ› Wydruk:PrzenieÅ› Wszystkie Wydruki}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="PrzenieÅ› zadania{job_id?:}"></TD>
--- templates/pl/choose-model.tmpl (revision 5500)
-+++ templates/pl/choose-model.tmpl (working copy)
++++ templates/pl/choose-model.tmpl (revision 5555)
@@ -12 +12 @@
-<H2 CLASS="title">Typ/Sterownik urzÄ…dzenia {printer_name}</H2>
+<H2 CLASS="title">Model/sterownik {printer_name}</H2>
@@ -5798,7 +5893,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj DrukarkÄ™:Modyfikuj DrukarkÄ™}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkÄ™:Zmodyfikuj drukarkÄ™}"></TD>
--- templates/pl/printer-confirm.tmpl (revision 5500)
-+++ templates/pl/printer-confirm.tmpl (working copy)
++++ templates/pl/printer-confirm.tmpl (revision 5555)
@@ -1 +1 @@
-<P><B>Ostrzeżenie:</B> Czy napewno chcesz usunąć drukarkę
+<P><B>Ostrzeżenie:</B> Czy jesteś pewny, że chcesz usunąć drukarkę
@@ -5806,7 +5901,7 @@
-SRC="/images/button-delete-printer.gif" ALT="Usuń Drukarkę"
+SRC="/images/button-delete-printer.gif" ALT="Usuń drukarkę"
--- templates/pl/printer-accept.tmpl (revision 5500)
-+++ templates/pl/printer-accept.tmpl (working copy)
++++ templates/pl/printer-accept.tmpl (revision 5555)
@@ -1,3 +1,3 @@
-<P>{is_class?Grupa:Drukarka} <A
-HREF="/{is_class?Grupa:Drukarka}/{printer_name}">{printer_name}</A>
@@ -5815,27 +5910,27 @@
+HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
+teraz akceptuje zadania.</P>
--- templates/pl/maintenance.tmpl (revision 5500)
-+++ templates/pl/maintenance.tmpl (working copy)
++++ templates/pl/maintenance.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Komendy administracyjne wysłane; ID wydruku to <A HREF="/printers/{printer_name}">
+<P>Polecenia utrzymywania zostały wysłane; ID zadania to <A HREF="/printers/{printer_name}">
--- templates/pl/job-moved.tmpl (revision 5500)
-+++ templates/pl/job-moved.tmpl (working copy)
++++ templates/pl/job-moved.tmpl (revision 5555)
@@ -1 +1 @@
-<P>{job_id?Wydruk <A HREF="/jobs/{job_id}">{job_id}</A> przeniesiony :Wydruki przeniesione} do
+<P>{job_id?<A HREF="/jobs/{job_id}">Zadanie {job_id}</A>:Wszystkie zadania} zostało przeniesione do
--- templates/pl/class-modified.tmpl (revision 5500)
-+++ templates/pl/class-modified.tmpl (working copy)
++++ templates/pl/class-modified.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Grupa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.
+<P>Klasa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.
--- templates/pl/class-jobs-header.tmpl (revision 5500)
-+++ templates/pl/class-jobs-header.tmpl (working copy)
++++ templates/pl/class-jobs-header.tmpl (revision 5555)
@@ -1 +1 @@
-<H3 CLASS="title">Wydruki</H3>
+<H3 CLASS="title">Zadania</H3>
--- templates/pl/add-class.tmpl (revision 5500)
-+++ templates/pl/add-class.tmpl (working copy)
++++ templates/pl/add-class.tmpl (revision 5555)
@@ -4 +4 @@
-<H2 CLASS="title">Utwórz Grupę</H2>
+<H2 CLASS="title">Dodaj klasÄ™</H2>
@@ -5846,17 +5941,17 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Dodaj KlasÄ™"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Dodaj klasÄ™"></TD>
--- templates/pl/job-restart.tmpl (revision 5500)
-+++ templates/pl/job-restart.tmpl (working copy)
++++ templates/pl/job-restart.tmpl (revision 5555)
@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został powtórzony.
+<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało ponownie uruchomione.
--- templates/pl/printers-header.tmpl (revision 5500)
-+++ templates/pl/printers-header.tmpl (working copy)
++++ templates/pl/printers-header.tmpl (revision 5555)
@@ -1 +1 @@
-<P ALIGN="CENTER">{total=0?Brak drukarek:Wyświetlam {#printer_name} z {total}{total=1?drukarkę:drukarek}}.</P>
+<P ALIGN="CENTER">{total=0?Brak drukarek:Wyświetlanie {#printer_name} z {total} drukarek{total=1?:}}.</P>
--- templates/pl/jobs.tmpl (revision 5500)
-+++ templates/pl/jobs.tmpl (working copy)
++++ templates/pl/jobs.tmpl (revision 5555)
@@ -2 +2 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Job List">
+<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Lista zadań">
@@ -5901,7 +5996,7 @@
-SRC="/images/button-move-job.gif" ALT="PrzenieÅ› Wydruk" CLASS="button"></A>:}
+SRC="/images/button-move-job.gif" ALT="PrzenieÅ› zadanie" CLASS="button"></A>:}
--- templates/pl/choose-serial.tmpl (revision 5500)
-+++ templates/pl/choose-serial.tmpl (working copy)
++++ templates/pl/choose-serial.tmpl (revision 5555)
@@ -8 +8 @@
-<H2 CLASS="title">Ustawienia Portu Szeregowego dla UrzÄ…dzenia {printer_name}</H2>
+<H2 CLASS="title">Ustawienia portu szeregowego {printer_name}</H2>
@@ -5928,7 +6023,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
--- templates/pl/classes.tmpl (revision 5500)
-+++ templates/pl/classes.tmpl (working copy)
++++ templates/pl/classes.tmpl (revision 5555)
@@ -3 +3 @@
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Default Printer):}
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Domyślna drukarka):}
@@ -5995,7 +6090,7 @@
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}&is_class=Y">
+<IMG SRC="/images/button-set-allowed-users.gif" ALT="Pozwól zezwolonym użytkownikom" CLASS="button"></A>
--- templates/pl/printer-reject.tmpl (revision 5500)
-+++ templates/pl/printer-reject.tmpl (working copy)
++++ templates/pl/printer-reject.tmpl (revision 5555)
@@ -1,3 +1,3 @@
-<P>{is_class?Grupa:Drukarka} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
@@ -6004,12 +6099,12 @@
+HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
+już nie akceptuje zadań.</P>
--- templates/pl/job-hold.tmpl (revision 5500)
-+++ templates/pl/job-hold.tmpl (working copy)
++++ templates/pl/job-hold.tmpl (revision 5555)
@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został wstrzymany.
+<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało wstrzymane od drukowania.
--- templates/pl/pager.tmpl (revision 5500)
-+++ templates/pl/pager.tmpl (working copy)
++++ templates/pl/pager.tmpl (revision 5555)
@@ -1 +1 @@
-<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Paging Bar">
+<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Pasek stronowania">
@@ -6021,7 +6116,7 @@
+ <TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A HREF="{THISURL}&ORDER=asc"><IMG SRC="/images/button-sort-ascending.gif" ALT="Posortuj rosnÄ…co" CLASS="button"></A>:<A HREF="{THISURL}&ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Posortuj malejÄ…co" CLASS="button"></A>}</TD>
+ <TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG SRC="/images/button-show-next.gif" ALT="Wyświetl następne" CLASS="button"></A>: }</TD>
--- templates/pl/class-confirm.tmpl (revision 5500)
-+++ templates/pl/class-confirm.tmpl (working copy)
++++ templates/pl/class-confirm.tmpl (revision 5555)
@@ -1 +1 @@
-<P><B>Ostrzeżenie:</B> Czy napewno chcesz usunąć grupę
+<P><B>Ostrzeżenie:</B> Czy jesteś pewny, że chcesz usunąć klasę
@@ -6029,7 +6124,7 @@
-SRC="/images/button-delete-class.gif" ALT="Usuń Grupę"
+SRC="/images/button-delete-class.gif" ALT="Usuń klasę"
--- templates/pl/samba-export.tmpl (revision 5500)
-+++ templates/pl/samba-export.tmpl (working copy)
++++ templates/pl/samba-export.tmpl (revision 5555)
@@ -15 +15 @@
-<H2 CLASS="title">Eksportuj do Samby</H2>
+<H2 CLASS="title">Wyeksportuj drukarki do Samby</H2>
@@ -6069,19 +6164,19 @@
-ALT="Export Printers to Samba"></TD>
+ALT="Wyeksportuj drukarki do Samby"></TD>
--- templates/pl/class-added.tmpl (revision 5500)
-+++ templates/pl/class-added.tmpl (working copy)
++++ templates/pl/class-added.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Grupa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie dodana.
+<P>Klasa <A HREF="/classes/{printer_name}">{printer_name}</A> została pomyślnie dodana.
--- templates/pl/printer-stop.tmpl (revision 5500)
-+++ templates/pl/printer-stop.tmpl (working copy)
++++ templates/pl/printer-stop.tmpl (revision 5555)
@@ -1,2 +1,2 @@
-<P>{is_class?Grupa:Drukarka} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+<P>{is_class?Klasa:Drukarka} <A
+HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
--- templates/pl/printers.tmpl (revision 5500)
-+++ templates/pl/printers.tmpl (working copy)
++++ templates/pl/printers.tmpl (revision 5555)
@@ -3 +3 @@
-<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Drukarka Domyślna):}
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (Domyślna drukarka):}
@@ -6167,7 +6262,7 @@
+<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
+<IMG SRC="/images/button-set-allowed-users.gif" ALT="Ustaw zezwolonych użytkowników" CLASS="button"></A>
--- templates/pl/option-conflict.tmpl (revision 5500)
-+++ templates/pl/option-conflict.tmpl (working copy)
++++ templates/pl/option-conflict.tmpl (revision 5555)
@@ -1 +1 @@
-<P><B>Error:</B> Poniższe opcje powodują konflikt:</P>
+<P><B>Błąd:</B> Następujące opcje są w konflikcie:</P>
@@ -6175,7 +6270,7 @@
-<P>Proszę zmienić jedną lub więcej z tych opcji aby rozwiązać konflikty.</P>
+<P>Zmień jedną lub więcej opcji, aby rozwiązań konflikty.</P>
--- templates/pl/modify-printer.tmpl (revision 5500)
-+++ templates/pl/modify-printer.tmpl (working copy)
++++ templates/pl/modify-printer.tmpl (revision 5555)
@@ -6 +6 @@
-<H2 CLASS="title">Modyfikuj DrukarkÄ™ {printer_name}</H2>
+<H2 CLASS="title">Zmodyfikuj drukarkÄ™ {printer_name}</H2>
@@ -6192,22 +6287,22 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
--- templates/pl/option-trailer.tmpl (revision 5500)
-+++ templates/pl/option-trailer.tmpl (working copy)
++++ templates/pl/option-trailer.tmpl (revision 5555)
@@ -3 +3 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Ustaw Opcje Drukarki"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif" ALT="Ustaw opcje drukarki"></TD>
--- templates/pl/class-deleted.tmpl (revision 5500)
-+++ templates/pl/class-deleted.tmpl (working copy)
++++ templates/pl/class-deleted.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Grupa {printer_name} została pomyślnie usunięta.
+<P>Klasa {printer_name} została pomyślnie usunięta.
--- templates/pl/samba-exported.tmpl (revision 5500)
-+++ templates/pl/samba-exported.tmpl (working copy)
++++ templates/pl/samba-exported.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Eksport do Samby zakończył się powodzeniem.</P>
+<P>Drukarki zostały pomyślnie wyeksportowane do Samby.</P>
--- templates/pl/choose-device.tmpl (revision 5500)
-+++ templates/pl/choose-device.tmpl (working copy)
++++ templates/pl/choose-device.tmpl (revision 5555)
@@ -8 +8 @@
-<H2 CLASS="title">Komunikacja z urzÄ…dzeniem {printer_name}</H2>
+<H2 CLASS="title">UrzÄ…dzenie {printer_name}</H2>
@@ -6218,7 +6313,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
--- templates/pl/choose-uri.tmpl (revision 5500)
-+++ templates/pl/choose-uri.tmpl (working copy)
++++ templates/pl/choose-uri.tmpl (revision 5555)
@@ -19,2 +19,2 @@
- http://hostname:631/ipp/
- http://hostname:631/ipp/port1
@@ -6244,7 +6339,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Dalej"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Kontynuuj"></TD>
--- templates/pl/help-header.tmpl (revision 5500)
-+++ templates/pl/help-header.tmpl (working copy)
++++ templates/pl/help-header.tmpl (revision 5555)
@@ -4,2 +4,2 @@
-<P ALIGN="CENTER"><B>Przeszukaj
-{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Wszystkie Dokumenty}}:</B> <INPUT
@@ -6291,14 +6386,14 @@
+odpowiedzi na najczęściej zadawane pytania oraz formularz do
+wysyłania raportów błędów i żądań funkcji.</P>}
--- templates/pl/printer-start.tmpl (revision 5500)
-+++ templates/pl/printer-start.tmpl (working copy)
++++ templates/pl/printer-start.tmpl (revision 5555)
@@ -1,2 +1,2 @@
-<P>{is_class?Grupa:Drukarka} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+<P>{is_class?Klasa:Drukarka} <A
+HREF="/{is_class?klasy:drukarki}/{printer_name}">{printer_name}</A>
--- templates/pl/jobs-header.tmpl (revision 5500)
-+++ templates/pl/jobs-header.tmpl (working copy)
++++ templates/pl/jobs-header.tmpl (revision 5555)
@@ -2,12 +2,12 @@
-HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
-SRC="/images/button-show-completed.gif" CLASS="button" ALT="Pokaż Zakończone Wydruki"></A>
@@ -6328,22 +6423,22 @@
-<P ALIGN="CENTER">{total=0?Brak wydruków:Wyświetlam {#job_id} z {total} {?which_jobs=?aktywny{total=1?:ch}:{which_jobs=all?:zakończony{total=1?:ch}}} wydruk{total=1?:ów}}.</P>
+<P ALIGN="CENTER">{total=0?Brak zadań:Wyświetlanie {#job_id} z {total} {?which_jobs=?active:{which_jobs=all?:zakończonych}} zadań{total=1?:}}.</P>
--- templates/pl/classes-header.tmpl (revision 5500)
-+++ templates/pl/classes-header.tmpl (working copy)
++++ templates/pl/classes-header.tmpl (revision 5555)
@@ -1 +1 @@
-<P ALIGN="CENTER">{total=0?Brak grup:Wyświetlam {#printer_name} z {total} grup{total=1?y:}}.</P>
+<P ALIGN="CENTER">{total=0?Brak klas:Wyświetlanie {#printer_name} z {total} klas{total=1?:}}.</P>
--- templates/pl/restart.tmpl (revision 5500)
-+++ templates/pl/restart.tmpl (working copy)
++++ templates/pl/restart.tmpl (revision 5555)
@@ -1 +1 @@
-<p>Proszę czekać - ponowne uruchomienie serwera wydruków...</p>
+<p>Proszę chwilę poczekać podczas ponownego uruchamiania serwera...</p>
--- templates/pl/job-release.tmpl (revision 5500)
-+++ templates/pl/job-release.tmpl (working copy)
++++ templates/pl/job-release.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Wydruk <A HREF="{job_printer_uri}">{job_id}</A> został wznowiony.
+<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało zwolnione od drukowania.
--- templates/pl/admin.tmpl (revision 5500)
-+++ templates/pl/admin.tmpl (working copy)
++++ templates/pl/admin.tmpl (revision 5555)
@@ -1 +1 @@
-<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Administration Tasks">
+<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Zadania administracyjne">
@@ -6412,12 +6507,12 @@
-<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Zmień Ustawienia"></P>
+<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Zmień ustawienia"></P>
--- templates/pl/test-page.tmpl (revision 5500)
-+++ templates/pl/test-page.tmpl (working copy)
++++ templates/pl/test-page.tmpl (revision 5555)
@@ -1 +1 @@
-<P>Strona testowa wysłana na drukarkę; ID wydruku to <A HREF="/{SECTION}/{printer_name}">
+<P>Strona próbna została wysłana; ID zadania to <A HREF="/{SECTION}/{printer_name}">
--- templates/pl/modify-class.tmpl (revision 5500)
-+++ templates/pl/modify-class.tmpl (working copy)
++++ templates/pl/modify-class.tmpl (revision 5555)
@@ -4 +4 @@
-<H2 CLASS="title">Modyfikuj GrupÄ™ {printer_name}</H2>
+<H2 CLASS="title">Zmodyfikuj klasÄ™ {printer_name}</H2>
@@ -6428,7 +6523,7 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modyfikuj GrupÄ™"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Zmodyfikuj klasÄ™"></TD>
--- templates/pl/choose-make.tmpl (revision 5500)
-+++ templates/pl/choose-make.tmpl (working copy)
++++ templates/pl/choose-make.tmpl (revision 5555)
@@ -12 +12 @@
-<H2 CLASS="title">Producent urzÄ…dzenia {printer_name}</H2>
+<H2 CLASS="title">Producent {printer_name}</H2>
@@ -6442,18 +6537,18 @@
-<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj DrukarkÄ™:Modyfikuj DrukarkÄ™}"></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Dodaj drukarkÄ™:Zmodyfikuj drukarkÄ™}"></TD>
--- templates/pl/job-cancel.tmpl (revision 5500)
-+++ templates/pl/job-cancel.tmpl (working copy)
++++ templates/pl/job-cancel.tmpl (revision 5555)
@@ -1 +1 @@
-<P><A HREF="{job_printer_uri}">Wydruk {job_id}</A> został anulowany.
+<P><A HREF="{job_printer_uri}">Zadanie {job_id}</A> zostało anulowane.
--- templates/pl/printer-modified.tmpl (revision 5500)
-+++ templates/pl/printer-modified.tmpl (working copy)
++++ templates/pl/printer-modified.tmpl (revision 5555)
@@ -1 +1,2 @@
-<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została pomyślnie zmodyfikowana.
+<P>Drukarka <A HREF="/printers/{printer_name}">{printer_name}</A> została
+pomyślnie zmodyfikowana.
--- templates/pl/users.tmpl (revision 5500)
-+++ templates/pl/users.tmpl (working copy)
++++ templates/pl/users.tmpl (revision 5555)
@@ -6 +6 @@
-<H2 CLASS="title">Użytkownicy Uprawnieni do {printer_name}</H2>
+<H2 CLASS="title">Zezwoleni użytkownicy dla {printer_name}</H2>
@@ -6466,7 +6561,7 @@
-<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Ustaw Uprawnienia Użytkowników">
+<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Ustaw zezwolonych użytkowników">
--- templates/pl/trailer.tmpl (revision 5500)
-+++ templates/pl/trailer.tmpl (working copy)
++++ templates/pl/trailer.tmpl (revision 5555)
@@ -9,4 +9,4 @@
-<P><SMALL>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of <A HREF="http://www.easysw.com">Easy Software
@@ -6477,7 +6572,7 @@
+Products</A>. Copyright 1997-2006 Easy Software Products,
+wszelkie prawa zastrzeżone.</SMALL></P>
--- templates/pl/printer-purge.tmpl (revision 5500)
-+++ templates/pl/printer-purge.tmpl (working copy)
++++ templates/pl/printer-purge.tmpl (revision 5555)
@@ -1,3 +1,3 @@
-<P>Wszystkie wydruki z {is_class?Grupy:Drukarki} <A
-HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
@@ -6486,19 +6581,76 @@
+HREF="/{is_class?klasy:drukarki/{printer_name}">{printer_name}</A>
+została wyczyszczone ze wszystkich zadań.</P>
--- templates/es/jobs.tmpl (revision 5500)
-+++ templates/es/jobs.tmpl (working copy)
++++ templates/es/jobs.tmpl (revision 5555)
@@ -21 +21 @@
-{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado el<BR>{time_at_completed}:
+{job_state=5?en proceso desde<BR>{time_at_processing}:{job_state=6?parado:
+--- cgi-bin/html.c (revision 5500)
++++ cgi-bin/html.c (revision 5555)
+@@ -178 +178,2 @@
+- fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n", prompt);
++ fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n",
++ prompt ? prompt : "(null)");
+--- cgi-bin/printers.c (revision 5500)
++++ cgi-bin/printers.c (revision 5555)
+@@ -334 +334 @@
+- http, user);
++ http, user ? user : "(null)");
+@@ -546 +546 @@
+- http, printer);
++ http, printer ? printer : "(null)");
+--- cgi-bin/template.c (revision 5500)
++++ cgi-bin/template.c (revision 5555)
+@@ -63 +63 @@
+- tmpl);
++ tmpl ? tmpl : "(null)");
+@@ -72 +72 @@
+- tmpl, strerror(errno));
++ tmpl ? tmpl : "(null)", strerror(errno));
+@@ -105 +105,2 @@
+- fprintf(stderr, "DEBUG: cgiCopyTemplateLang(tmpl=\"%s\")\n", tmpl);
++ fprintf(stderr, "DEBUG: cgiCopyTemplateLang(tmpl=\"%s\")\n",
++ tmpl ? tmpl : "(null)");
+--- cgi-bin/ipp-var.c (revision 5500)
++++ cgi-bin/ipp-var.c (revision 5555)
+@@ -777 +777 @@
+- obj, prefix, element);
++ obj, prefix ? prefix : "(null)", element);
+@@ -980 +980,3 @@
+- response, filter_name, filter_value, prefix, parent_el);
++ response, filter_name ? filter_name : "(null)",
++ filter_value ? filter_value : "(null)",
++ prefix ? prefix : "(null)", parent_el);
+--- cgi-bin/help.c (revision 5500)
++++ cgi-bin/help.c (revision 5555)
+@@ -190 +190,2 @@
+- fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n", query, topic);
++ fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
++ query ? query : "(null)", topic ? topic : "(null)");
--- cgi-bin/admin.c (revision 5500)
-+++ cgi-bin/admin.c (working copy)
-@@ -1492 +1492,3 @@
++++ cgi-bin/admin.c (revision 5555)
+@@ -96 +96,2 @@
+- fprintf(stderr, "DEBUG: cupsServer()=\"%s\"\n", cupsServer());
++ fprintf(stderr, "DEBUG: cupsServer()=\"%s\"\n",
++ cupsServer() ? cupsServer() : "(null)");
+@@ -536,0 +538 @@
++ ptr = cgiGetVariable("DEVICE_URI");
+@@ -538 +540 @@
+- cgiGetVariable("DEVICE_URI"));
++ ptr ? ptr : "(null)");
+@@ -1492 +1494,3 @@
- if (!strcmp(keyword, "PageRegion"))
+ if (!strcmp(keyword, "PageRegion") ||
+ !strcmp(keyword, "PaperDimension") ||
+ !strcmp(keyword, "ImageableArea"))
+--- cgi-bin/var.c (revision 5500)
++++ cgi-bin/var.c (revision 5555)
+@@ -952 +952,2 @@
+- fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n", prompt);
++ fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n",
++ prompt ? prompt : "(null)");
--- scheduler/testmime.c (revision 5500)
-+++ scheduler/testmime.c (working copy)
++++ scheduler/testmime.c (revision 5555)
@@ -100,0 +101,2 @@
+ else if ((src = mimeType(mime, "application", "octet-stream")) != NULL)
+ printf("%s: application/octet-stream\n", argv[i]);
@@ -6511,7 +6663,7 @@
+ continue;
+
--- scheduler/ipp.c (revision 5500)
-+++ scheduler/ipp.c (working copy)
++++ scheduler/ipp.c (revision 5555)
@@ -629,0 +630,9 @@
+#ifdef CUPSD_USE_CHUNKING
+ /*
@@ -6529,27 +6681,42 @@
- cupsArrayAdd(ra, "notify-notify-events-supported");
+ cupsArrayAdd(ra, "notify-events-default");
+ cupsArrayAdd(ra, "notify-events-supported");
-@@ -7677,0 +7688,2 @@
+@@ -6834,0 +6845,2 @@
++ attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
++
+@@ -6836 +6848 @@
+- attr->num_values > 1)
++ attr && attr->num_values > 1)
+@@ -7677,0 +7690,2 @@
+ printer = cupsdFindDest(job->dest);
+
-@@ -7809,2 +7820,0 @@
+@@ -7809,2 +7822,0 @@
- printer = cupsdFindDest(job->dest);
-
-@@ -8599 +8609 @@
+@@ -8599 +8611 @@
- !strcmp(attr->name, "notify-notify-events-default"))
+ !strcmp(attr->name, "notify-events-default"))
--- scheduler/dirsvc.c (revision 5500)
-+++ scheduler/dirsvc.c (working copy)
-@@ -1164 +1164 @@
++++ scheduler/dirsvc.c (revision 5555)
+@@ -668 +668 @@
+- if (BrowseLocalProtocols & BROWSE_CUPS)
++ if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+@@ -671 +671 @@
+- if (BrowseLocalProtocols & BROWSE_SLP)
++ if ((BrowseLocalProtocols & BROWSE_SLP) && BrowseSLPHandle)
+@@ -936,0 +937,2 @@
++ else
++ BrowseSLPHandle = NULL;
+@@ -1164 +1166 @@
-#ifdef HAVE_OPENDAP
+#ifdef HAVE_OPENLDAP
--- scheduler/auth.c (revision 5500)
-+++ scheduler/auth.c (working copy)
++++ scheduler/auth.c (revision 5555)
@@ -122 +122 @@
-#if defined(__hpux) && defined(HAVE_LIBPAM)
+#if defined(__hpux) && HAVE_LIBPAM
--- scheduler/printers.c (revision 5500)
-+++ scheduler/printers.c (working copy)
++++ scheduler/printers.c (revision 5555)
@@ -2927,4 +2926,0 @@
- if (!strcasecmp(type->super, "application") &&
- !strcasecmp(type->type, "octet-stream"))
@@ -6572,7 +6739,7 @@
-
+ ipp_attribute_t *attr; /* Attribute data */
--- scheduler/job.c (revision 5500)
-+++ scheduler/job.c (working copy)
++++ scheduler/job.c (revision 5555)
@@ -882 +882 @@
- if (job->state_value >= IPP_JOB_STOPPED)
+ if (job->state_value > IPP_JOB_STOPPED)
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- cups.spec 19 May 2006 08:44:30 -0000 1.195
+++ cups.spec 20 May 2006 16:35:12 -0000 1.196
@@ -35,8 +35,6 @@
Patch24: cups-maxlogsize.patch
Patch32: cups-pid.patch
Patch41: cups-relro.patch
-Patch42: cups-str1670.patch
-Patch43: cups-str1705.patch
Epoch: 1
Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-root
@@ -122,8 +120,6 @@
%patch24 -p1 -b .maxlogsize
%patch32 -p1 -b .pid
%patch41 -p1 -b .relro
-%patch42 -p1 -b .str1670
-%patch43 -p1 -b .str1705
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
aclocal -I config-scripts
autoconf
@@ -379,6 +375,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Sat May 20 2006 Tim Waugh <twaugh at redhat.com>
+- Sync to svn5555. No longer need str1670 or str1705 patches.
+
* Fri May 19 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-5
- Sync to svn5545.
- Ship a driver directory.
--- cups-str1670.patch DELETED ---
--- cups-str1705.patch DELETED ---
More information about the fedora-cvs-commits
mailing list