rpms/cups/devel cups-direct-usb.patch,1.7,1.8

Tim Waugh (twaugh) fedora-extras-commits at redhat.com
Tue Jul 15 12:26:54 UTC 2008


Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8973

Modified Files:
	cups-direct-usb.patch 
Log Message:
Rediff direct-usb patch.

cups-direct-usb.patch:

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-direct-usb.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cups-direct-usb.patch	13 Jun 2007 16:15:27 -0000	1.7
+++ cups-direct-usb.patch	15 Jul 2008 12:26:10 -0000	1.8
@@ -1,7 +1,8 @@
---- cups-1.2.11/backend/usb-unix.c.direct-usb	2007-05-04 15:03:02.000000000 +0100
-+++ cups-1.2.11/backend/usb-unix.c	2007-06-13 16:46:56.000000000 +0100
-@@ -101,6 +101,9 @@
-              strcasecmp(hostname, "Minolta");
+diff -up cups-1.3.7/backend/usb-unix.c.direct-usb cups-1.3.7/backend/usb-unix.c
+--- cups-1.3.7/backend/usb-unix.c.direct-usb	2008-03-26 16:02:45.000000000 +0000
++++ cups-1.3.7/backend/usb-unix.c	2008-07-15 13:25:56.000000000 +0100
+@@ -94,6 +94,9 @@ print_device(const char *uri,		/* I - De
+              strncasecmp(hostname, "Minolta", 7);
  #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
  
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
@@ -10,7 +11,7 @@
      if ((device_fd = open_device(uri, &use_bc)) == -1)
      {
        if (getenv("CLASS") != NULL)
-@@ -317,12 +320,7 @@
+@@ -320,12 +323,7 @@ open_device(const char *uri,		/* I - Dev
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {




More information about the scm-commits mailing list