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
neonkore · Apr 22, 2011 · 22c9029 · 22c9029
1 parent 07ed0e9
commit 22c9029
Show file tree

Hide file tree

Showing 67 changed files with 3,666 additions and 2,009 deletions.
diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
@@ -4,11 +4,15 @@ CHANGES-1.4.txt
 CHANGES IN CUPS V1.4.7
 
 	- Documentation changes (STR #3710, STR #3720, STR #3745, STR #3750,
-	  STR #3757, STR #3758, STR #3782)
+	  STR #3757, STR #3758, STR #3782, STR #3826, STR #3829)
 	- Web interface fixes (STR #3412, STR #3345, STR #3455, STR #3707,
 	  STR #3755, STR #3769, STR #3783)
 	- Configure script fixes (STR #3659, STR #3691)
 	- Compilation fixes (STR #3718, STR #3771, STR #3774)
+	- The scheduler might leave old job data files in the spool directory
+	  (STR #3795)
+	- CUPS did not work with locales using the ASCII character set
+	  (STR #3832)
 	- httpAddrString() did not return a URI-style IPv6 numeric address
 	  (STR #3814)
 	- Fixed an issue when reading compressed CUPS raster streams (STR #3812)

diff --git a/Makedefs.in b/Makedefs.in
@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the