Merge upstream 3.18.5 version; un-gzip source files

16 files changed, 32 insertions, 32 deletions

diff --git a/ppd/classppd/hpcups/hp-LJ-Class1.ppd b/ppd/classppd/hpcups/hp-LJ-Class1.ppd
index d18d8b88e..a452db232 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class1.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class1.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class1.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class1"
 *ShortNickName: "LJ-Class1"
-*NickName: "LJ-Class1, hpcups 3.18.4"
+*NickName: "LJ-Class1, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-LJ-Class2.ppd b/ppd/classppd/hpcups/hp-LJ-Class2.ppd
index 6ee1f859d..0329237ea 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class2.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class2.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class2.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class2"
 *ShortNickName: "LJ-Class2"
-*NickName: "LJ-Class2, hpcups 3.18.4"
+*NickName: "LJ-Class2, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-LJ-Class3.ppd b/ppd/classppd/hpcups/hp-LJ-Class3.ppd
index ec3980ed3..1b7858ad8 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class3.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class3.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class3.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class3"
 *ShortNickName: "LJ-Class3"
-*NickName: "LJ-Class3, hpcups 3.18.4"
+*NickName: "LJ-Class3, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-LJ-Class4.ppd b/ppd/classppd/hpcups/hp-LJ-Class4.ppd
index a37c6a693..0f4c4e1b6 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class4.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class4.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class4.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class4"
 *ShortNickName: "LJ-Class4"
-*NickName: "LJ-Class4, hpcups 3.18.4"
+*NickName: "LJ-Class4, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd
index 4f4cbb8b7..8f6e4e33b 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class4A.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class4A.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class4A.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class4A"
 *ShortNickName: "LJ-Class4A"
-*NickName: "LJ-Class4A, hpcups 3.18.4"
+*NickName: "LJ-Class4A, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-LJ-Class5.ppd b/ppd/classppd/hpcups/hp-LJ-Class5.ppd
index 99733e70d..0ff9da9bf 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class5.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class5.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class5.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class5"
 *ShortNickName: "LJ-Class5"
-*NickName: "LJ-Class5, hpcups 3.18.4"
+*NickName: "LJ-Class5, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-LJ-Class6.ppd b/ppd/classppd/hpcups/hp-LJ-Class6.ppd
index ae5191fc8..65725cf9f 100644
--- a/ppd/classppd/hpcups/hp-LJ-Class6.ppd
+++ b/ppd/classppd/hpcups/hp-LJ-Class6.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-LJ-Class6.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP LJ-Class6"
 *ShortNickName: "LJ-Class6"
-*NickName: "LJ-Class6, hpcups 3.18.4"
+*NickName: "LJ-Class6, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class1.ppd b/ppd/classppd/hpcups/hp-PCL3-Class1.ppd
index 79b3fbe97..b7aa2b1c8 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class1.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class1.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class1.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class1"
 *ShortNickName: "PCL3-Class1"
-*NickName: "PCL3-Class1, hpcups 3.18.4"
+*NickName: "PCL3-Class1, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd b/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd
index ab7343b0a..b5f0f7cf0 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class1A.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class1A.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class1A"
 *ShortNickName: "PCL3-Class1A"
-*NickName: "PCL3-Class1A, hpcups 3.18.4"
+*NickName: "PCL3-Class1A, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd b/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd
index f117091ae..ae66db5c8 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class1B.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class1B.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class1B"
 *ShortNickName: "PCL3-Class1B"
-*NickName: "PCL3-Class1B, hpcups 3.18.4"
+*NickName: "PCL3-Class1B, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class2.ppd b/ppd/classppd/hpcups/hp-PCL3-Class2.ppd
index 194bc0f44..a7bc62cd3 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class2.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class2.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class2.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class2"
 *ShortNickName: "PCL3-Class2"
-*NickName: "PCL3-Class2, hpcups 3.18.4"
+*NickName: "PCL3-Class2, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd
index da1e2fb54..4c197692e 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class3.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class3.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class3.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class3"
 *ShortNickName: "PCL3-Class3"
-*NickName: "PCL3-Class3, hpcups 3.18.4"
+*NickName: "PCL3-Class3, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd
index 9faebe730..91e05af2f 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class3A.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class3A.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class3A"
 *ShortNickName: "PCL3-Class3A"
-*NickName: "PCL3-Class3A, hpcups 3.18.4"
+*NickName: "PCL3-Class3A, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd
index f45dd320f..4289f0528 100644
--- a/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd
+++ b/ppd/classppd/hpcups/hp-PCL3-Class3B.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL3-Class3B.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL3-Class3B"
 *ShortNickName: "PCL3-Class3B"
-*NickName: "PCL3-Class3B, hpcups 3.18.4"
+*NickName: "PCL3-Class3B, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd
index 6bb07ae8f..4c234a315 100644
--- a/ppd/classppd/hpcups/hp-PCL4-Class1.ppd
+++ b/ppd/classppd/hpcups/hp-PCL4-Class1.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCL4-Class1.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCL4-Class1"
 *ShortNickName: "PCL4-Class1"
-*NickName: "PCL4-Class1, hpcups 3.18.4"
+*NickName: "PCL4-Class1, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True
diff --git a/ppd/classppd/hpcups/hp-PCLM.ppd b/ppd/classppd/hpcups/hp-PCLM.ppd
index d831dfa09..7737451fe 100644
--- a/ppd/classppd/hpcups/hp-PCLM.ppd
+++ b/ppd/classppd/hpcups/hp-PCLM.ppd
@@ -3,7 +3,7 @@
 *%%%% Created by the CUPS PPD Compiler CUPS v1.5.0.
 *% (c) 2008 Copyright HP Development Company, LP
 *FormatVersion: "4.3"
-*FileVersion: "3.18.4"
+*FileVersion: "3.18.5"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
 *PCFileName: "hp-PCLM.ppd"
@@ -11,7 +11,7 @@
 *Manufacturer: "HP"
 *ModelName: "HP PCLM"
 *ShortNickName: "PCLM"
-*NickName: "PCLM, hpcups 3.18.4"
+*NickName: "PCLM, hpcups 3.18.5"
 *PSVersion: "(3010.000) 0"
 *LanguageLevel: "3"
 *ColorDevice: True