packages: cups/cups-branch.diff, cups/cups.spec - rel 7; branch fixes
arekm
arekm at pld-linux.org
Fri Nov 6 23:33:11 CET 2009
Author: arekm Date: Fri Nov 6 22:33:11 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 7; branch fixes
---- Files affected:
packages/cups:
cups-branch.diff (1.3 -> 1.4) , cups.spec (1.272 -> 1.273)
---- Diffs:
================================================================
Index: packages/cups/cups-branch.diff
diff -u packages/cups/cups-branch.diff:1.3 packages/cups/cups-branch.diff:1.4
--- packages/cups/cups-branch.diff:1.3 Sun Oct 4 12:49:55 2009
+++ packages/cups/cups-branch.diff Fri Nov 6 23:33:06 2009
@@ -1,23 +1,23 @@
Index: conf/pam.irix
===================================================================
---- conf/pam.irix (.../tags/release-1.4.1) (wersja 8833)
-+++ conf/pam.irix (.../branches/branch-1.4) (wersja 8833)
+--- conf/pam.irix (.../tags/release-1.4.1) (wersja 8857)
++++ conf/pam.irix (.../branches/branch-1.4) (wersja 8857)
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so shadow nodelay nullok
-account required pam_unix.so
Index: conf/pam.std.in
===================================================================
---- conf/pam.std.in (.../tags/release-1.4.1) (wersja 8833)
-+++ conf/pam.std.in (.../branches/branch-1.4) (wersja 8833)
+--- conf/pam.std.in (.../tags/release-1.4.1) (wersja 8857)
++++ conf/pam.std.in (.../branches/branch-1.4) (wersja 8857)
@@ -1,2 +1,2 @@
-auth required @PAMMOD@ nullok shadow
+auth required @PAMMODAUTH@
account required @PAMMOD@
Index: conf/Makefile
===================================================================
---- conf/Makefile (.../tags/release-1.4.1) (wersja 8833)
-+++ conf/Makefile (.../branches/branch-1.4) (wersja 8833)
+--- conf/Makefile (.../tags/release-1.4.1) (wersja 8857)
++++ conf/Makefile (.../branches/branch-1.4) (wersja 8857)
@@ -90,7 +90,7 @@
done
-if test x$(PAMDIR) != x; then \
@@ -29,8 +29,8 @@
$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
Index: backend/usb-unix.c
===================================================================
---- backend/usb-unix.c (.../tags/release-1.4.1) (wersja 8833)
-+++ backend/usb-unix.c (.../branches/branch-1.4) (wersja 8833)
+--- backend/usb-unix.c (.../tags/release-1.4.1) (wersja 8857)
++++ backend/usb-unix.c (.../branches/branch-1.4) (wersja 8857)
@@ -560,7 +560,7 @@
* 'side_cb()' - Handle side-channel requests...
*/
@@ -42,8 +42,8 @@
int snmp_fd, /* I - SNMP socket (unused) */
Index: backend/usb-darwin.c
===================================================================
---- backend/usb-darwin.c (.../tags/release-1.4.1) (wersja 8833)
-+++ backend/usb-darwin.c (.../branches/branch-1.4) (wersja 8833)
+--- backend/usb-darwin.c (.../tags/release-1.4.1) (wersja 8857)
++++ backend/usb-darwin.c (.../branches/branch-1.4) (wersja 8857)
@@ -292,9 +292,8 @@
#if defined(__i386__) || defined(__x86_64__)
static pid_t child_pid; /* Child PID */
@@ -76,6 +76,15 @@
sigaction(SIGTERM, &action, NULL);
}
+@@ -698,7 +697,7 @@
+
+ else if (iostatus == kIOReturnAborted)
+ {
+- fputs("DEBUG: Got return aborted during write!\n", stderr);
++ fputs("DEBUG: Got USB return aborted during write!\n", stderr);
+
+ IOReturn err = (*g.classdriver)->Abort(g.classdriver);
+ fprintf(stderr, "DEBUG: USB class driver Abort returned %x\n", err);
@@ -725,7 +724,7 @@
fprintf(stderr, "DEBUG: USB class driver Abort returned %x\n",
err);
@@ -85,6 +94,20 @@
break;
}
else if (bytes > 0)
+@@ -898,11 +897,11 @@
+ #endif
+ }
+ else if (readstatus == kIOUSBTransactionTimeout)
+- fputs("DEBUG: Got USB transaction timeout during write!\n", stderr);
++ fputs("DEBUG: Got USB transaction timeout during read!\n", stderr);
+ else if (readstatus == kIOUSBPipeStalled)
+ fputs("DEBUG: Got USB pipe stalled during read!\n", stderr);
+ else if (readstatus == kIOReturnAborted)
+- fputs("DEBUG: Got return aborted during read!\n", stderr);
++ fputs("DEBUG: Got USB return aborted during read!\n", stderr);
+
+ /*
+ * Make sure this loop executes no more than once every 250 miliseconds...
@@ -944,7 +943,7 @@
datalen = sizeof(data);
@@ -133,10 +156,49 @@
#ifdef PARSE_PS_ERRORS
/*
* 'next_line()' - Find the next line in a buffer.
+Index: config-scripts/cups-common.m4
+===================================================================
+--- config-scripts/cups-common.m4 (.../tags/release-1.4.1) (wersja 8857)
++++ config-scripts/cups-common.m4 (.../branches/branch-1.4) (wersja 8857)
+@@ -266,11 +266,6 @@
+ dbus_message_iter_init_append,
+ AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
+ `$PKGCONFIG --libs dbus-1`)
+- if $PKGCONFIG --exists glib-2.0 && $PKGCONFIG --exists dbus-glib-1; then
+- DBUS_NOTIFIER="dbus"
+- DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs glib-2.0` `$PKGCONFIG --libs dbus-glib-1` `$PKGCONFIG --libs dbus-1`"
+- CFLAGS="$CFLAGS `$PKGCONFIG --cflags glib-2.0`"
+- fi
+ else
+ AC_MSG_RESULT(no)
+ fi
+@@ -289,7 +284,6 @@
+
+ case $uname in
+ Darwin*)
+-# FONTS=""
+ LEGACY_BACKENDS=""
+ BACKLIBS="$BACKLIBS -framework IOKit"
+ CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -weak_framework ApplicationServices"
+Index: config-scripts/cups-defaults.m4
+===================================================================
+--- config-scripts/cups-defaults.m4 (.../tags/release-1.4.1) (wersja 8857)
++++ config-scripts/cups-defaults.m4 (.../branches/branch-1.4) (wersja 8857)
+@@ -325,8 +325,8 @@
+ CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
+ ;;
+ *)
+- if test -d /etc/xinetd.d; then
+- CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd:///etc/xinetd.d/cups-lpd"
++ if test "x$XINETD" != x; then
++ CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd://$XINETD/cups-lpd"
+ else
+ CUPS_DEFAULT_LPD_CONFIG_FILE=""
+ fi
Index: config-scripts/cups-pam.m4
===================================================================
---- config-scripts/cups-pam.m4 (.../tags/release-1.4.1) (wersja 8833)
-+++ config-scripts/cups-pam.m4 (.../branches/branch-1.4) (wersja 8833)
+--- config-scripts/cups-pam.m4 (.../tags/release-1.4.1) (wersja 8857)
++++ config-scripts/cups-pam.m4 (.../branches/branch-1.4) (wersja 8857)
@@ -22,9 +22,10 @@
fi
@@ -202,10 +264,359 @@
dnl
dnl End of "$Id$".
+Index: doc/de/index.html.in
+===================================================================
+--- doc/de/index.html.in (.../tags/release-1.4.1) (wersja 8857)
++++ doc/de/index.html.in (.../branches/branch-1.4) (wersja 8857)
+@@ -17,7 +17,7 @@
+ <TD CLASS="unsel"><A HREF="/admin"> Verwaltung </A></TD>
+ <TD CLASS="unsel"><A HREF="/classes/"> Klassen </A></TD>
+ <TD CLASS="unsel"><A HREF="/help/"> On-Line Hilfe </A></TD>
+-<TD CLASS="unsel"><A HREF="/jobs/"> Auftrüge </A></TD>
++<TD CLASS="unsel"><A HREF="/jobs/"> Aufträge </A></TD>
+ <TD CLASS="unsel"><A HREF="/printers/"> Drucker </A></TD>
+ <TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+ TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help"
+Index: doc/help/ref-ppdcfile.html
+===================================================================
+--- doc/help/ref-ppdcfile.html (.../tags/release-1.4.1) (wersja 8857)
++++ doc/help/ref-ppdcfile.html (.../branches/branch-1.4) (wersja 8857)
+@@ -380,10 +380,10 @@
+ inclusion in a driver. The name with optional user text defines
+ the name for the media size and is used with the <a
+ href='#MediaSize'><code>MediaSize</code></a> directive to associate
+-the media size with the driver. The name may only contain
+-letters, numbers, and the underscore and may not exceed 40
+-characters in length. The user text, if supplied, may not exceed
+-80 characters in length.</p>
++the media size with the driver. The name may contain up to 40 ASCII
++characters within the range of decimal 33 to decimal 126 inclusive,
++except for the characters comma (44), slash (47) and colon (58).
++The user text, if supplied, may not exceed 80 bytes in length.</p>
+
+ <p>The width and length define the dimensions of the media. Each
+ number is optionally followed by one of the following unit
+@@ -459,17 +459,15 @@
+ <h3>Description</h3>
+
+ <p>The <code>Attribute</code> directive creates a PPD attribute. The
+-name is any combination of letters, numbers, and the underscore
+-and can be up to 40 characters in length.</p>
++name may contain up to 40 ASCII characters within the range of decimal
++33 to decimal 126 inclusive, except for the characters comma (44),
++slash (47) and colon (58).</p>
+
+-<p>The selector can be the empty string (<code>""</code>), a keyword
+-consisting of up to 40 letters, numbers, and the underscore, or
+-a string composed of a keyword and user text of up to 80
+-characters.</p>
++<p>The selector can be the empty string (<code>""</code>) or text of up
++to 80 bytes.</p>
+
+-<p>The value is any string or number; the string may contain
+-multiple lines, however no one line may exceed 255
+-characters.</p>
++<p>The value is any string or number; the string may contain multiple
++lines, however no one line may exceed 255 bytes.</p>
+
+ <h3>See Also</h3>
+
+@@ -495,14 +493,15 @@
+ <h3>Description</h3>
+
+ <p>The <code>Choice</code> directive adds a single choice to the
+-current option. The name is any combination of letters, numbers,
+-and the underscore and can be up to 40 characters in length.</p>
++current option. The name may contain up to 40 ASCII characters within
++the range of decimal 33 to decimal 126 inclusive, except for the
++characters comma (44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
++<p>If provided, the text can be any string up to 80 bytes
+ in length. If no text is provided, the name is used.</p>
+
+ <p>The code is any string and may contain multiple lines,
+-however no one line may exceed 255 characters.</p>
++however no one line may exceed 255 bytes.</p>
+
+ <h3>See Also</h3>
+
+@@ -568,11 +567,12 @@
+
+ <p>The <code>ColorModel</code> directive is a convenience directive
+ which creates a ColorModel option and choice for the current
+-printer driver. The name is any combination of letters, numbers,
+-and the underscore and can be up to 40 characters in length.</p>
++printer driver. The name may contain up to 40 ASCII characters within
++the range of decimal 33 to decimal 126 inclusive, except for the
++characters comma (44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+ <p>The colorspace argument is one of the standard colorspace
+ keywords defined later in this appendix in the section titled,
+@@ -698,7 +698,7 @@
+ <p>The <code>Copyright</code> directive adds text comments to the
+ top of a PPD file, typically for use in copyright notices. The
+ text argument can contain multiple lines of text, but no line
+-may exceed 255 characters.</p>
++may exceed 255 bytes.</p>
+
+
+ <h2 class="title"><a name='CustomMedia'>CustomMedia</a></h2>
+@@ -730,11 +730,12 @@
+ <h3>Description</h3>
+
+ <p>The <code>CustomMedia</code> directive adds a custom media size to
+-the driver. The name is any combination of letters, numbers,
+-and the underscore and can be up to 40 characters in length.</p>
++the driver. The name may contain up to 40 ASCII characters within the
++range of decimal 33 to decimal 126 inclusive, except for the characters
++comma (44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+ <p>The width and length arguments specify the dimensions of the
+ media as defined for the <a href="#_media"><code>#media</code></a>
+@@ -747,7 +748,7 @@
+ PostScript commands to run for the <code>PageSize</code> and
+ <code>PageRegion</code> options, respectively. The commands can
+ contain multiple lines, however no line may be more than 255
+-characters in length.</p>
++bytes in length.</p>
+
+ <h3>See Also</h3>
+
+@@ -823,11 +824,12 @@
+ the Dymo driver from 0 (lowest) to 3 (highest), with 2
+ representing the normal setting.</p>
+
+-<p>The name is any combination of letters, numbers, and the
+-underscore and can be up to 40 characters in length.</p>
++<p>The name may contain up to 40 ASCII characters within the range of
++decimal 33 to decimal 126 inclusive, except for the characters comma
++(44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+ <h3>See Also</h3>
+
+@@ -1044,15 +1046,16 @@
+ <h3>Description</h3>
+
+ <p>The <code>Finishing</code> directive adds a choice to the
+-<code>cupsFinishing</code> option. The name is any combination of
+-letters, numbers, and the underscore and can be up to 40
+-characters in length. The name is stored in the
+-<code>OutputType</code> attribute in the PostScript page device
+-dictionary.</p>
++<code>cupsFinishing</code> option. The name may contain up to 40 ASCII
++characters within the range of decimal 33 to decimal 126 inclusive,
++except for the characters comma (44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
++<p>The name is stored in the <code>OutputType</code> attribute in the
++PostScript page device dictionary.</p>
++
+ <h3>See Also</h3>
+
+ <p><a href='#Choice'><code>Choice</code></a>,
+@@ -1091,8 +1094,7 @@
+ <h3>Description</h3>
+
+ <p>The <code>Font</code> directive defines a "device font" for the
+-current printer driver. The name is the PostScript font
+-name.</p>
++current printer driver. The name is the PostScript font name.</p>
+
+ <p>The encoding is the default encoding of the font, usually
+ <code>Standard</code>, <code>Expert</code>, or <code>Special</code>, as
+@@ -1139,23 +1141,25 @@
+ <h3>Description</h3>
+
+ <p>The <code>Group</code> directive specifies the group for new
+-<code>Option</code> directives. The name is any combination of
+-letters, numbers, and the underscore and can be up to 40
+-characters in length. The names <code>General</code> and
+-<code>InstallableOptions</code> are predefined for the standard
+-Adobe UI keywords and for installable options, respectively.</p>
++<code>Option</code> directives. The name may contain up to 40 ASCII
++characters within the range of decimal 33 to decimal 126 inclusive,
++except for the characters comma (44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 40 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 40 bytes in length.
++If no text is provided, the name is used.</p>
+
++<p>The names <code>General</code> and <code>InstallableOptions</code>
++are predefined for the standard Adobe UI keywords and for installable
++options, respectively.</p>
++
+ <center><table width='80%' border='1' bgcolor='#cccccc' cellpadding='5' cellspacing='0'>
+ <tr>
+ <td align='justify'><b>Note:</b>
+
+ <p>Because of certain API binary compatibility issues,
+ CUPS limits the length of PPD group translation strings
+- (text) to 40 characters, while the PPD specification
+- allows for up to 80 characters.</p>
++ (text) to 40 bytes, while the PPD specification
++ allows for up to 80 bytes.</p>
+
+ </td>
+ </tr>
+@@ -1229,11 +1233,12 @@
+ in the <code>MediaPosition</code> attribute in the PostScript page
+ device dictionary.</p>
+
+-<p>The name is any combination of letters, numbers, and the
+-underscore and can be up to 40 characters in length.</p>
++<p>The name may contain up to 40 ASCII characters within the range of
++decimal 33 to decimal 126 inclusive, except for the characters comma
++(44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+ <h3>See Also</h3>
+
+@@ -1271,11 +1276,12 @@
+
+ <p>The <code>Installable</code> directive adds a new boolean option
+ to the <code>InstallableOptions</code> group with a default value of
+-<code>False</code>. The name is any combination of letters, numbers,
+-and the underscore and can be up to 40 characters in length.</p>
++<code>False</code>. The name may contain up to 40 ASCII characters
++within the range of decimal 33 to decimal 126 inclusive, except for
++the characters comma (44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+
+ <h2 class="title"><a name='LocAttribute'>LocAttribute</a></h2>
+@@ -1295,17 +1301,15 @@
+ <h3>Description</h3>
+
+ <p>The <code>LocAttribute</code> directive creates a localized PPD
+-attribute. The name is any combination of letters, numbers, and the
+-underscore and can be up to 40 characters in length.</p>
++attribute. The name may contain up to 40 ASCII characters within the
++range of decimal 33 to decimal 126 inclusive, except for the characters
++comma (44), slash (47) and colon (58).</p>
+
+-<p>The selector can be the empty string (<code>""</code>), a keyword
+-consisting of up to 40 letters, numbers, and the underscore, or
+-a string composed of a keyword and user text of up to 80
+-characters.</p>
++<p>The selector can be the empty string (<code>""</code>) or text of up
++to 80 bytes.</p>
+
+-<p>The value is any string or number; the string may contain
+-multiple lines, however no one line may exceed 255
+-characters.</p>
++<p>The value is any string or number; the string may contain multiple
++lines, however no one line may exceed 255 bytes.</p>
+
+ <h3>See Also</h3>
+
+@@ -1458,14 +1462,16 @@
+ in the <code>cupsMediaType</code> attribute in the PostScript page
+ device dictionary.</p>
+
+-<p>The name is any combination of letters, numbers, and the
+-underscore and can be up to 40 characters in length. The name is
+-placed in the <code>MediaType</code> attribute in the PostScript
+-page device dictionary.</p>
++<p>The name may contain up to 40 ASCII characters within the range of
++decimal 33 to decimal 126 inclusive, except for the characters comma
++(44), slash (47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
++<p>The name is placed in the <code>MediaType</code> attribute in the
++PostScript page device dictionary.</p>
++
+ <h3>See Also</h3>
+
+ <p><a href='#Choice'><code>Choice</code></a>,
+@@ -1532,7 +1538,7 @@
+ characters ".", "/", "-", and "+" and should not begin with the
+ manufacturer name since the PPD compiler will add this
+ automatically for you. The maximum length of the name string is
+-31 characters to conform to the Adobe limits on the length of
++31 bytes to conform to the Adobe limits on the length of
+ <code>ShortNickName</code>.</p>
+
+ <h3>See Also</h3>
+@@ -1598,11 +1604,12 @@
+
+ <p>The <code>Option</code> directive creates a new option in the
+ current group, by default the <code>General</code> group. The name
+-is any combination of letters, numbers, and the underscore and
+-can be up to 40 characters in length.</p>
++may contain up to 40 ASCII characters within the range of decimal 33
++to decimal 126 inclusive, except for the characters comma (44), slash
++(47) and colon (58).</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+ <p>The type argument is one of the following keywords:</p>
+
+@@ -1749,8 +1756,8 @@
+ the examples represent the horizontal and vertical resolutions
+ which must be positive integer values.</p>
+
+-<p>If provided, the text can be any string up to 80 characters
+-in length. If no text is provided, the name is used.</p>
++<p>If provided, the text can be any string up to 80 bytes in length.
++If no text is provided, the name is used.</p>
+
+ <h3>See Also</h3>
+
+Index: doc/help/ref-printers-conf.html
+===================================================================
+--- doc/help/ref-printers-conf.html (.../tags/release-1.4.1) (wersja 8857)
++++ doc/help/ref-printers-conf.html (.../branches/branch-1.4) (wersja 8857)
+@@ -21,8 +21,8 @@
+ normally use the <A HREF="man-lpadmin.html">lpadmin(8)</A>
+ command, web interface, or any of the available GUIs to manage
+ your printers instead. If you do choose to edit this file
+-manually, you will need to restart the scheduler to make them
+-active.</P>
++manually, you will need to stop the scheduler first, make your
++changes, and then start the scheduler to make them active.</P>
+
+
+ <H2 CLASS="title"><A NAME="Accepting">Accepting</A></H2>
Index: doc/help/spec-ipp.html
===================================================================
---- doc/help/spec-ipp.html (.../tags/release-1.4.1) (wersja 8833)
-+++ doc/help/spec-ipp.html (.../branches/branch-1.4) (wersja 8833)
+--- doc/help/spec-ipp.html (.../tags/release-1.4.1) (wersja 8857)
++++ doc/help/spec-ipp.html (.../branches/branch-1.4) (wersja 8857)
@@ -558,7 +558,7 @@
<h4>Cancel-Job Request</h4>
@@ -233,10 +644,40 @@
<dt><span class="info">CUPS 1.2/Mac OS X 10.5</span>"purge-jobs" (boolean):
<dd>The client OPTIONALLY supplies this attribute to specify
+Index: doc/help/ref-classes-conf.html
+===================================================================
+--- doc/help/ref-classes-conf.html (.../tags/release-1.4.1) (wersja 8857)
++++ doc/help/ref-classes-conf.html (.../branches/branch-1.4) (wersja 8857)
+@@ -21,8 +21,8 @@
+ normally use the <A HREF="man-lpadmin.html">lpadmin(8)</A>
+ command, web interface, or any of the available GUIs to manage
+ your classes instead. If you do choose to edit this file
+-manually, you will need to restart the scheduler to make them
+-active.</P>
++manually, you will need to stop the scheduler first, make your
++changes, and then start the scheduler to make them active.</P>
+
+
+ <H2 CLASS="title"><A NAME="Accepting">Accepting</A></H2>
+Index: doc/Makefile
+===================================================================
+--- doc/Makefile (.../tags/release-1.4.1) (wersja 8857)
++++ doc/Makefile (.../branches/branch-1.4) (wersja 8857)
+@@ -190,8 +190,8 @@
+ for lang in $(LANGUAGES); do \
+ if test -d $$lang; then \
+ $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang; \
+- $(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang; \
+- test -f $$lang/cups.css && $(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang; \
++ $(INSTALL_DATA) $$lang/index.html $(DOCDIR)/$$lang; \
++ $(INSTALL_DATA) $$lang/cups.css $(DOCDIR)/$$lang >/dev/null 2>&1 || true; \
+ fi; \
+ done
+
Index: desktop/cups.desktop.in
===================================================================
---- desktop/cups.desktop.in (.../tags/release-1.4.1) (wersja 8833)
-+++ desktop/cups.desktop.in (.../branches/branch-1.4) (wersja 8833)
+--- desktop/cups.desktop.in (.../tags/release-1.4.1) (wersja 8857)
++++ desktop/cups.desktop.in (.../branches/branch-1.4) (wersja 8857)
@@ -7,33 +7,33 @@
Type=Application
Name=Manage Printing
@@ -303,8 +744,8 @@
+Comment[zh_TW]=CUPS 網頁介面
Index: cups/sidechannel.c
===================================================================
---- cups/sidechannel.c (.../tags/release-1.4.1) (wersja 8833)
-+++ cups/sidechannel.c (.../branches/branch-1.4) (wersja 8833)
+--- cups/sidechannel.c (.../tags/release-1.4.1) (wersja 8857)
++++ cups/sidechannel.c (.../branches/branch-1.4) (wersja 8857)
@@ -191,10 +191,24 @@
if (errno != EINTR && errno != EAGAIN)
{
@@ -375,8 +816,8 @@
while (status == CUPS_SC_STATUS_OK);
Index: cups/cups.h
===================================================================
---- cups/cups.h (.../tags/release-1.4.1) (wersja 8833)
-+++ cups/cups.h (.../branches/branch-1.4) (wersja 8833)
+--- cups/cups.h (.../tags/release-1.4.1) (wersja 8857)
++++ cups/cups.h (.../branches/branch-1.4) (wersja 8857)
@@ -59,10 +59,10 @@
* Constants...
*/
@@ -392,8 +833,8 @@
# define CUPS_DATE_ANY (time_t)-1
Index: cups/sidechannel.h
===================================================================
---- cups/sidechannel.h (.../tags/release-1.4.1) (wersja 8833)
-+++ cups/sidechannel.h (.../branches/branch-1.4) (wersja 8833)
+--- cups/sidechannel.h (.../tags/release-1.4.1) (wersja 8857)
++++ cups/sidechannel.h (.../branches/branch-1.4) (wersja 8857)
@@ -55,6 +55,7 @@
enum cups_sc_command_e /**** Request command codes ****/
@@ -404,8 +845,8 @@
CUPS_SC_CMD_GET_BIDI = 3, /* Return bidirectional capabilities */
Index: cups/snmp.c
===================================================================
---- cups/snmp.c (.../tags/release-1.4.1) (wersja 8833)
-+++ cups/snmp.c (.../branches/branch-1.4) (wersja 8833)
+--- cups/snmp.c (.../tags/release-1.4.1) (wersja 8857)
++++ cups/snmp.c (.../branches/branch-1.4) (wersja 8857)
@@ -608,6 +608,8 @@
int count = 0; /* Number of OIDs found */
int request_id = 0; /* Current request ID */
@@ -452,10 +893,392 @@
count ++;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-branch.diff?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.272&r2=1.273&f=u
More information about the pld-cvs-commit
mailing list