git.ipfire.org Git - thirdparty/cups.git/log

]> git.ipfire.org Git - thirdparty/cups.git/log

projects / thirdparty / cups.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

msweet [Thu, 4 Jul 2013 15:54:36 +0000 (15:54 +0000)]

Some ippserver fixes to allow it to be used as a CUPS destination:

- Don't actually advertise IPPS support yet, since libcups doesn't support
  server-side HTTPS yet.
- Allow printer-uri values that have the right resource paths - this allows
  things like back-to-my-mac to work.
- Advertise the correct URI resource path in the Bonjour TXT record.
- Fix valid_doc_attributes to use the document-format-default value instead of
  "application/octet-stream".

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11097 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 3 Jul 2013 16:39:38 +0000 (16:39 +0000)]

Allow job-billing to be an alias for job-account-id, and requesting-user-name to
be an alias for job-accounting-user-id (<rdar://problem/14290027>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11089 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 3 Jul 2013 14:26:55 +0000 (14:26 +0000)]

Fix HTML errors in documentation (using swish-e to validate HTML...)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11087 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 3 Jul 2013 13:55:05 +0000 (13:55 +0000)]

Fix compile error.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11086 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 3 Jul 2013 13:53:05 +0000 (13:53 +0000)]

Update version numbers.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11085 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 3 Jul 2013 13:36:21 +0000 (13:36 +0000)]

Update usage to match what is now supported.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11084 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 2 Jul 2013 20:39:24 +0000 (20:39 +0000)]

Use new kIOPMAssertRemoteAccess power management assertion, when supported, to
keep the system awake enough to print (<rdar://problem/11918463>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11081 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 27 Jun 2013 19:03:21 +0000 (19:03 +0000)]

Update distribution script to use new SVN repo location.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11078 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 27 Jun 2013 18:49:52 +0000 (18:49 +0000)]

Add ippfind project for Visual Studio.

Drop support for VC++ 2005.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11077 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 27 Jun 2013 18:36:13 +0000 (18:36 +0000)]

Fix a state transition issue that affected ippserver.

Fix a crasher for handling of sides in ippserver.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11074 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 16:46:38 +0000 (16:46 +0000)]

Fix ippfind for Linux/Avahi.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11064 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 15:11:25 +0000 (15:11 +0000)]

httpStatus(HTTP_ERROR) did not return a useful error message
(<rdar://problem/14217326>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11062 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 15:02:18 +0000 (15:02 +0000)]

The lp and lpr commands incorrectly ignored the default printer set in the
lpoptions file (<rdar://problem/14216472>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11060 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 14:38:01 +0000 (14:38 +0000)]

Added documentation about the /version=1.1 option to ServerName in client.conf
(<rdar://problem/14216262>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11058 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 14:30:18 +0000 (14:30 +0000)]

Also deprecate cupsGetPPD and cupsGetPPD2.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11057 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 14:27:30 +0000 (14:27 +0000)]

Fixed deprecation warnings for many functions on OS X so they are tied
to the deployment version when building (<rdar://problem/14210079>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11056 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 01:42:48 +0000 (01:42 +0000)]

<rdar://problem/14243133> AirPrint: Printers with name containing certain characters are not recognized

Support backquote (`) character and fix the IPv6 address detection code.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11052 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 25 Jun 2013 00:57:09 +0000 (00:57 +0000)]

Add unit test for httpAssembleUUID.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11051 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 12 Jun 2013 13:00:54 +0000 (13:00 +0000)]

ARM-based Linux doesn't allow pointer comparisons on va_list values; not sure
how you are supposed to validate input, but whatever...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11032 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 7 Jun 2013 02:18:50 +0000 (02:18 +0000)]

Save work on ippfind for Linux.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11028 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 7 Jun 2013 01:45:14 +0000 (01:45 +0000)]

Update ippfind documentation with examples, change '-e' to '-x' for --exec.

Add ippfind to the ipptool binary package.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11027 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 7 Jun 2013 01:00:33 +0000 (01:00 +0000)]

Fix up svn:keywords for all files.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11025 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 6 Jun 2013 23:11:13 +0000 (23:11 +0000)]

Don't clean HTML man pages.

Add some other print-job tests.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11024 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 6 Jun 2013 22:48:46 +0000 (22:48 +0000)]

Ignore more stuff.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11023 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 6 Jun 2013 22:14:09 +0000 (22:14 +0000)]

Fix keywords on man page files.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11022 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 6 Jun 2013 22:08:14 +0000 (22:08 +0000)]

<rdar://problem/13876199> cups.org: Need ippfind command-line utility

Implement --exec.

The ippfind command is now feature complete for CUPS 1.7.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11021 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 6 Jun 2013 19:19:26 +0000 (19:19 +0000)]

Implement --ls.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11020 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 6 Jun 2013 15:03:40 +0000 (15:03 +0000)]

Fix --or handling.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11019 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 5 Jun 2013 20:40:53 +0000 (20:40 +0000)]

Save work - all of the tests work, todo:

- Fix --or
- Implement --ls
- Implement --exec

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11018 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 5 Jun 2013 18:23:08 +0000 (18:23 +0000)]

<rdar://problem/14040186> Backend failure when sharing Simulated inkjet after creating ACL with standard user. OS X 10.9 (13A476l)

Don't trampoline if we are using a password.

Don't call xpc_connection_suspend since we are releasing it (not supposed to do
that for some reason...)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11014 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 5 Jun 2013 17:25:22 +0000 (17:25 +0000)]

<rdar://problem/14065748> pwgMediaForPWG: roll_max_36.1025x3622.0472in becomes 91700 x 180568 instead of 91700 x 9199999

Convert fractional portion separately to avoid integer overflow.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11011 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 5 Jun 2013 16:05:45 +0000 (16:05 +0000)]

Save work on ippfind program. Nearly there.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11010 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 31 May 2013 13:29:59 +0000 (13:29 +0000)]

<rdar://problem/13854722> 13A459 Printing completely broken on MBP after upgrade to Cab

Fix httpFlushWrite, which was incorrectly updating data_remaining.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11003 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 30 May 2013 21:45:32 +0000 (21:45 +0000)]

Save work on new ippfind tool.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11002 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 30 May 2013 01:33:55 +0000 (01:33 +0000)]

<rdar://problem/14016099> ipptool: Use SO_NWRITE socket option to extend timeouts

Make the ipptool timeout callback check whether the output buffer is empty. If
not, automatically extend the timeout until it is - useful for when the printer
is blocking due to a printer error like "out of paper"...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11000 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 30 May 2013 00:48:16 +0000 (00:48 +0000)]

Restore debug2 logging of cupsdAdd/RemoveSelect.

Add higher-level debug logging of client select management.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10999 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 30 May 2013 00:41:43 +0000 (00:41 +0000)]

Go back to non-blocking ippWrite.

Add some more debug logging.

Normalize some of the logging to consistently have a [Client NNN] prefix.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10998 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 29 May 2013 21:45:03 +0000 (21:45 +0000)]

Ignore generated files.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10997 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 29 May 2013 11:51:34 +0000 (11:51 +0000)]

Update svn:keyword properties.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10996 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 29 May 2013 11:51:03 +0000 (11:51 +0000)]

Add option to specify a single operation to test with.

Add CUPS-Get-Default to the list of standard ops to test.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10995 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 24 May 2013 21:21:04 +0000 (21:21 +0000)]

Added support for RFC 6874's IPv6 link local address format in URIs
(<rdar://problem/13979453>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10990 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 23 May 2013 19:57:17 +0000 (19:57 +0000)]

<rdar://problem/13493241> APVT3.0 checks a custom size using a 1/100mm smaller size

Don't use floating point at all. Go old-school and do integer math to convert
to 100ths of millimeters...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10988 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 16 May 2013 19:39:53 +0000 (19:39 +0000)]

Changelog.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10984 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 May 2013 23:57:32 +0000 (23:57 +0000)]

Save new Bonjour discovery/test program.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10983 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 May 2013 21:48:45 +0000 (21:48 +0000)]

<rdar://problem/13876091> cups.org: ipptool should support validation of hostname and port in URIs

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10982 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 May 2013 19:40:47 +0000 (19:40 +0000)]

<rdar://problem/13876038> cups.org: ipptool does not include any version information in the plist output

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10981 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 May 2013 19:15:06 +0000 (19:15 +0000)]

<rdar://problem/13875803> cups.org: ipptool does not proceed past INCLUDE if ignore is not used

Also: IPP finishings values for (now standardized) punch and fold stuff, new
IPP FaxOut Send-Hardcopy-Document operation.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10980 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 May 2013 16:46:08 +0000 (16:46 +0000)]

<rdar://problem/13875729> cups.org: libusb-based backend can crash if USB is disabled in BIOS

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10977 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 May 2013 16:36:57 +0000 (16:36 +0000)]

<rdar://problem/ 13493241> APVT3.0 checks a custom size using a 1/100mm smaller size

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10976 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 10 May 2013 17:14:12 +0000 (17:14 +0000)]

Move current import directory to new cups.org trunk

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4303 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 10 May 2013 16:04:59 +0000 (16:04 +0000)]

Final sync-up with cups.org trunk repository

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4297 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 9 Apr 2013 20:10:23 +0000 (20:10 +0000)]

Merge changes from CUPS 1.7b1-r10947.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4274 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 11 Mar 2013 13:57:36 +0000 (13:57 +0000)]

Sync up with CUPS 1.7svn-r10893

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4216 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 20 Feb 2013 15:22:35 +0000 (15:22 +0000)]

Merge changes from CUPS 1.7svn-r10874.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4189 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 4 Feb 2013 19:27:13 +0000 (19:27 +0000)]

Merge changes from CUPS 1.7svn-r10861.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4167 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 14 Jan 2013 22:10:30 +0000 (22:10 +0000)]

Merge changes from CUPS 1.7svn-r10814.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4125 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 10 Jan 2013 17:01:44 +0000 (17:01 +0000)]

Merge changes from CUPS 1.7svn-r10791.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4120 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 12 Dec 2012 20:54:21 +0000 (20:54 +0000)]

Merge changes from CUPS 1.7svn-r10755.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4074 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 26 Nov 2012 19:37:04 +0000 (19:37 +0000)]

Merge changes from CUPS 1.7svn-r10710.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4040 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 16 Nov 2012 01:00:05 +0000 (01:00 +0000)]

Merge changes from CUPS 1.7svn-r10704.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4027 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 15 Oct 2012 21:10:00 +0000 (21:10 +0000)]

Fix property on test file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3943 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 15 Oct 2012 21:02:10 +0000 (21:02 +0000)]

Merge changes from CUPS 1.7svn-r10643

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3940 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 1 Oct 2012 03:01:10 +0000 (03:01 +0000)]

Merge changes from CUPS 1.7svn-r10629.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3933 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 29 Aug 2012 00:26:48 +0000 (00:26 +0000)]

Merge changes from CUPS 1.7svn-r10578.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3891 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 23 May 2012 22:51:18 +0000 (22:51 +0000)]

Merge changes from CUPS 1.6svn-r10510.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3833 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 23 Apr 2012 22:44:16 +0000 (22:44 +0000)]

Merge changes from CUPS 1.6svn-r10437.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3794 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Sat, 31 Mar 2012 04:54:53 +0000 (04:54 +0000)]

Remove ".orig" files that somehow got into the repo.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3764 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 30 Mar 2012 05:59:14 +0000 (05:59 +0000)]

Merge changes from CUPS 1.6svn-r10390.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3755 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 16 Feb 2012 22:03:53 +0000 (22:03 +0000)]

Merge changes from CUPS 1.6svn-r10310.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3683 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 Feb 2012 17:18:19 +0000 (17:18 +0000)]

Sync up with CUPS 1.6svn-r10269 (changes from Zin TOT merged into cups.org TOT)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3645 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 Feb 2012 16:38:44 +0000 (16:38 +0000)]

Remove deleted file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3644 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 13 Feb 2012 16:35:48 +0000 (16:35 +0000)]

Merge changes from CUPS 1.6svn-r10267.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3643 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 19 Jan 2012 16:53:50 +0000 (16:53 +0000)]

Merge changes from CUPS 1.6svn-r10188, including changes for <rdar://problem/10127258> CUPS 1.6: New printer/printing APIs

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3618 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 28 Nov 2011 17:26:29 +0000 (17:26 +0000)]

Merge changes from CUPS 1.6svn-r10127.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3518 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 8 Nov 2011 00:30:03 +0000 (00:30 +0000)]

Merge changes from CUPS 1.6svn-r10112.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3486 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 4 Oct 2011 06:53:26 +0000 (06:53 +0000)]

Merge changes from CUPS 1.6svn-r10056

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3448 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 28 Sep 2011 22:40:47 +0000 (22:40 +0000)]

Merge changes from CUPS 1.6svn-r10024.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3438 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 20 Sep 2011 18:40:57 +0000 (18:40 +0000)]

Merge changes from CUPS 1.6svn-r10006.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3427 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 14 Sep 2011 22:44:45 +0000 (22:44 +0000)]

Merge changes from CUPS 1.6svn-r10002

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3421 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 7 Sep 2011 22:31:27 +0000 (22:31 +0000)]

Merge changes from CUPS 1.6svn-r9968.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 31 Aug 2011 01:58:55 +0000 (01:58 +0000)]

Merge changes from CUPS 1.6svn-r9939.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3392 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 9 Aug 2011 21:32:14 +0000 (21:32 +0000)]

Merge changes from CUPS 1.5.1-r9875.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3363 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 15 Jun 2011 00:48:47 +0000 (00:48 +0000)]

Merge changes from CUPS 1.5rc1-r9834.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3322 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 15 Jun 2011 00:37:13 +0000 (00:37 +0000)]

Merge changes from CUPS 1.5rc1-r9833.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3318 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Sun, 5 Jun 2011 17:00:32 +0000 (17:00 +0000)]

Merge changes from CUPS 1.5rc1-r9815.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3299 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 26 May 2011 13:22:56 +0000 (13:22 +0000)]

Merge changes from CUPS 1.5b2-r9811.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3289 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 20 May 2011 07:26:13 +0000 (07:26 +0000)]

Merge changes from CUPS 1.5b1-r9798.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3275 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Thu, 12 May 2011 06:22:31 +0000 (06:22 +0000)]

Merge changes from CUPS 1.5b1-r9774.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 11 May 2011 05:36:13 +0000 (05:36 +0000)]

Merge changes from CUPS 1.5svn-r9763.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3242 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 22 Apr 2011 23:02:56 +0000 (23:02 +0000)]

Merge changes from CUPS 1.5svn-r9717.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3171 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 11 Apr 2011 18:53:27 +0000 (18:53 +0000)]

Merge changes from CUPS 1.5svn-r9675.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3122 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Wed, 23 Mar 2011 00:05:29 +0000 (00:05 +0000)]

Merge changes from CUPS 1.5svn-r9641

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3071 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Sun, 20 Mar 2011 21:48:45 +0000 (21:48 +0000)]

Merge changes from CUPS 1.5svn-r9631.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3062 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 14 Mar 2011 18:48:04 +0000 (18:48 +0000)]

Sync up some other changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3047 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 14 Mar 2011 18:45:10 +0000 (18:45 +0000)]

Merge changes from CUPS 1.5svn-r9602.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3046 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 25 Feb 2011 01:40:44 +0000 (01:40 +0000)]

Merge changes from CUPS 1.5svn-r9567

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3015 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Fri, 11 Feb 2011 21:20:35 +0000 (21:20 +0000)]

Merge changes from CUPS 1.5svn-r9525

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2975 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 18 Jan 2011 00:26:43 +0000 (00:26 +0000)]

Fix bad merge.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2951 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Mon, 17 Jan 2011 23:54:15 +0000 (23:54 +0000)]

Merge changes from CUPS 1.5svn-r9491.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2949 a1ca3aef-8c08-0410-bb20-df032aa958be

commit | commitdiff | tree

msweet [Tue, 14 Dec 2010 21:25:17 +0000 (21:25 +0000)]

Merge changes from CUPS 1.5svn-r9407.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2910 a1ca3aef-8c08-0410-bb20-df032aa958be

Unnamed repository; edit this file 'description' to name the repository.