Fix ppdi/ppdc unit tests - english localization is the default and shouldn't be overr...

Update sample.drv for new CUPS version.

diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx
index c791d30dc6f9bc16e3f60fb944b0691ba639684e..602321887b60eb5f6a766270ca5bf12480486278 100644 (file)
--- a/ppdc/ppdc-catalog.cxx
+++ b/ppdc/ppdc-catalog.cxx
@@ -58,7 +58,7 @@ ppdcCatalog::ppdcCatalog(const char *l,       // I - Locale
   filename = new ppdcString(f);
   messages = new ppdcArray();
 
-  if (l)
+  if (l && strcmp(l, "en"))
   {
     // Try loading the base messages for this locale...
     char       pofile[1024];           // Message catalog file

diff --git a/ppdc/sample.drv b/ppdc/sample.drv
index 89c75fe0d7f291c480ee4371d17d51b73a338883..17e33ac2c485727d2fbb8aface60a8f00995f25a 100644 (file)
--- a/ppdc/sample.drv
+++ b/ppdc/sample.drv
@@ -114,12 +114,12 @@
 #media "w576h468/8.00x6.50\"" 576 468
 
 // Common stuff for all drivers...
-Attribute "cupsVersion" "" "2.2"
+Attribute "cupsVersion" "" "2.3"
 Attribute "FileSystem" "" "False"
 Attribute "LandscapeOrientation" "" "Plus90"
 Attribute "TTRasterizer" "" "Type42"
 
-Copyright "Copyright 2007-2014 by Apple Inc."
+Copyright "Copyright 2007-2017 by Apple Inc."
 Copyright "Copyright 1997-2007 by Easy Software Products."
 Copyright ""
 Copyright "These coded instructions, statements, and computer programs are the"
@@ -130,7 +130,7 @@ Copyright "file is missing or damaged, see the license at \"http://www.cups.org/
 
 Font *
 
-Version "2.1"
+Version "2.3"
 
 // Dymo Label Printer
 {