SOURCES (DEVEL): cups-config.patch, cups-direct_usb.patch, cups-lp-lpr.patc...
lisu
lisu at pld-linux.org
Wed Dec 17 11:17:31 CET 2008
Author: lisu Date: Wed Dec 17 10:17:31 2008 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- up to 1.4b2
---- Files affected:
SOURCES:
cups-config.patch (1.6 -> 1.6.4.1) , cups-direct_usb.patch (1.1.2.2 -> 1.1.2.2.2.1) , cups-lp-lpr.patch (1.1 -> 1.1.6.1) , cups-verbose-compilation.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/cups-config.patch
diff -u SOURCES/cups-config.patch:1.6 SOURCES/cups-config.patch:1.6.4.1
--- SOURCES/cups-config.patch:1.6 Fri May 12 08:18:04 2006
+++ SOURCES/cups-config.patch Wed Dec 17 11:17:23 2008
@@ -1,6 +1,5 @@
-diff -urN cups-1.2.0.org/conf/cupsd.conf.in cups-1.2.0/conf/cupsd.conf.in
---- cups-1.2.0.org/conf/cupsd.conf.in 2006-04-23 23:46:38.000000000 +0200
-+++ cups-1.2.0/conf/cupsd.conf.in 2006-05-12 08:17:48.946318536 +0200
+--- cups-1.4b2/conf/cupsd.conf.in~ 2008-12-11 19:24:57.000000000 +0100
++++ cups-1.4b2/conf/cupsd.conf.in 2008-12-16 11:33:01.000000000 +0100
@@ -6,6 +6,9 @@
# file.
#
@@ -8,6 +7,6 @@
+MaxLogSize 0
+Printcap /etc/printcap
+
- # Log general information in error_log - change "info" to "debug" for
- # troubleshooting...
- LogLevel info
+ # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
+ # for troubleshooting...
+ LogLevel @CUPS_LOG_LEVEL@
================================================================
Index: SOURCES/cups-direct_usb.patch
diff -u SOURCES/cups-direct_usb.patch:1.1.2.2 SOURCES/cups-direct_usb.patch:1.1.2.2.2.1
--- SOURCES/cups-direct_usb.patch:1.1.2.2 Thu Aug 16 09:11:33 2007
+++ SOURCES/cups-direct_usb.patch Wed Dec 17 11:17:24 2008
@@ -1,9 +1,9 @@
--- cups-1.2.8/backend/usb-unix.c.direct-usb 2007-02-05 20:25:50.000000000 +0000
+++ cups-1.2.8/backend/usb-unix.c 2007-02-14 17:44:40.000000000 +0000
@@ -87,6 +87,8 @@
- use_bc = strcasecmp(hostname, "Canon") &&
- strcasecmp(hostname, "Konica Minolta") &&
- strcasecmp(hostname, "Minolta");
+ strcasecmp(hostname, "Canon") &&
+ strncasecmp(hostname, "Konica", 6) &&
+ strncasecmp(hostname, "Minolta", 7);
+ if (use_bc && !strncmp(uri, "usb:/dev/", 9))
+ use_bc = 0;
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
================================================================
Index: SOURCES/cups-lp-lpr.patch
diff -u SOURCES/cups-lp-lpr.patch:1.1 SOURCES/cups-lp-lpr.patch:1.1.6.1
--- SOURCES/cups-lp-lpr.patch:1.1 Tue Oct 23 11:30:06 2001
+++ SOURCES/cups-lp-lpr.patch Wed Dec 17 11:17:24 2008
@@ -1,22 +1,22 @@
---- cups-1.1.10/berkeley/lpr.c.orig Tue Jan 30 16:17:45 2001
-+++ cups-1.1.10/berkeley/lpr.c Tue Jan 30 16:18:18 2001
-@@ -324,7 +324,7 @@
- if (title)
- job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
- else
-- job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
-+ job_id = cupsPrintFile(printer, tempfile, "STDIN", num_options, options);
-
- unlink(tempfile);
- }
---- cups-1.1.10/systemv/lp.c.orig Tue Jan 30 16:16:32 2001
-+++ cups-1.1.10/systemv/lp.c Tue Jan 30 16:17:10 2001
-@@ -544,7 +544,7 @@
- if (title)
- job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
- else
-- job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
-+ job_id = cupsPrintFile(printer, tempfile, "STDIN", num_options, options);
-
- unlink(tempfile);
+--- cups-1.4b2/berkeley/lpr.c~ 2008-07-12 00:46:21.000000000 +0200
++++ cups-1.4b2/berkeley/lpr.c 2008-12-16 11:53:15.000000000 +0100
+@@ -383,7 +383,7 @@
+ }
}
+ else if ((job_id = cupsCreateJob(CUPS_HTTP_DEFAULT, printer,
+- title ? title : "(stdin)",
++ title ? title : "STDIN",
+ num_options, options)) > 0)
+ {
+ http_status_t status; /* Write status */
+--- cups-1.4b2/systemv/lp.c~ 2008-11-18 01:42:34.000000000 +0100
++++ cups-1.4b2/systemv/lp.c 2008-12-16 11:54:39.000000000 +0100
+@@ -618,7 +618,7 @@
+ if (num_files > 0)
+ job_id = cupsPrintFiles(printer, num_files, files, title, num_options, options);
+ else if ((job_id = cupsCreateJob(CUPS_HTTP_DEFAULT, printer,
+- title ? title : "(stdin)",
++ title ? title : "STDIN",
+ num_options, options)) > 0)
+ {
+ http_status_t status; /* Write status */
================================================================
Index: SOURCES/cups-verbose-compilation.patch
diff -u SOURCES/cups-verbose-compilation.patch:1.1 SOURCES/cups-verbose-compilation.patch:1.1.2.1
--- SOURCES/cups-verbose-compilation.patch:1.1 Fri Apr 11 15:43:35 2008
+++ SOURCES/cups-verbose-compilation.patch Wed Dec 17 11:17:25 2008
@@ -1,11 +1,11 @@
---- cups-1.3.7/Makedefs.in~ 2008-04-11 07:59:17.000000000 +0200
-+++ cups-1.3.7/Makedefs.in 2008-04-11 07:59:50.000000000 +0200
-@@ -241,7 +241,7 @@
+--- cups-1.4b2/Makedefs.in~ 2008-11-11 01:57:12.000000000 +0100
++++ cups-1.4b2/Makedefs.in 2008-12-16 12:10:37.000000000 +0100
+@@ -258,7 +258,7 @@
# Rules...
#
-.SILENT:
+#.SILENT:
- .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+ .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
.c.o:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cups-config.patch?r1=1.6&r2=1.6.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cups-direct_usb.patch?r1=1.1.2.2&r2=1.1.2.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cups-lp-lpr.patch?r1=1.1&r2=1.1.6.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cups-verbose-compilation.patch?r1=1.1&r2=1.1.2.1&f=u
More information about the pld-cvs-commit
mailing list