Don't map Primera name to Fargo anymore (STR #4708)

Bump version to 2.1.1.


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

6 files changed, 22 insertions, 30 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ab1574c1f..b75d55892 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
-CHANGES.txt - 2.1.0 - 2015-08-31
+CHANGES.txt - 2.1.1 - 2015-09-13
 --------------------------------
 
+CHANGES IN CUPS V2.1.1
+
+	- Current Primera printers were incorrectly reported as Fargo printers
+	  (STR #4708)
+
+
 CHANGES IN CUPS V2.1.0
 
 	- Fixed more scheduler crash bugs in the new logging code (STR #4687,
diff --git a/configure.ac b/configure.ac
index 9acda0129..ec1487997 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.1.0], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.1.1], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
diff --git a/cups/attr.c b/cups/attr.c
index bc241a517..c98a36b47 100644
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -1,22 +1,16 @@
 /*
  * "$Id$"
  *
- *   PPD model-specific attribute routines for CUPS.
+ * PPD model-specific attribute routines for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
+ * Copyright 2007-2015 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   ppdFindAttr()               - Find the first matching attribute.
- *   ppdFindNextAttr()           - Find the next matching attribute.
- *   _ppdNormalizeMakeAndModel() - Normalize a product/make-and-model string.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -229,14 +223,6 @@ _ppdNormalizeMakeAndModel(
 
     snprintf(buffer, bufsize, "Canon %s", make_and_model);
   }
-  else if (!_cups_strncasecmp(make_and_model, "primera", 7))
-  {
-   /*
-    * Fargo...
-    */
-
-    snprintf(buffer, bufsize, "Fargo %s", make_and_model);
-  }
   else if (!_cups_strncasecmp(make_and_model, "designjet", 9) ||
            !_cups_strncasecmp(make_and_model, "deskjet", 7))
   {
diff --git a/cups/cups.h b/cups/cups.h
index 3b1111b8c..28b106d9d 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -58,10 +58,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			2.0100
+#  define CUPS_VERSION			2.0101
 #  define CUPS_VERSION_MAJOR		2
 #  define CUPS_VERSION_MINOR		1
-#  define CUPS_VERSION_PATCH		0
+#  define CUPS_VERSION_PATCH		1
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
diff --git a/vcnet/config.h b/vcnet/config.h
index ff4312da2..2b4fb1e8b 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -96,8 +96,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.1.0"
-#define CUPS_MINIMAL "CUPS/2.1.0"
+#define CUPS_SVERSION "CUPS v2.1.1"
+#define CUPS_MINIMAL "CUPS/2.1.1"
 
 
 /*
diff --git a/xcode/config.h b/xcode/config.h
index 0bff22c07..dae0b8b14 100644
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -22,8 +22,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.1.0"
-#define CUPS_MINIMAL "CUPS/2.1.0"
+#define CUPS_SVERSION "CUPS v2.1.1"
+#define CUPS_MINIMAL "CUPS/2.1.1"
 
 
 /*