--- /usr/share/pyshared/cupshelpers/ppds.py~ 2010-10-29 12:53:37.000000000 -0400 +++ /usr/share/pyshared/cupshelpers/ppds.py 2010-11-02 07:37:51.165278118 -0400 @@ -280,11 +280,11 @@ DRIVER_TYPE_FOOMATIC_RECOMMENDED_POSTSCRIPT = 15 DRIVER_TYPE_HPCUPS = 16 DRIVER_TYPE_FOOMATIC_HPIJS_ON_HP = 17 -DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED = 20 -DRIVER_TYPE_GUTENPRINT_NATIVE = 25 DRIVER_TYPE_SPLIX = 27 DRIVER_TYPE_FOOMATIC_PS = 30 DRIVER_TYPE_FOOMATIC_HPIJS = 40 +DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED = 42 +DRIVER_TYPE_GUTENPRINT_NATIVE = 45 DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED = 50 DRIVER_TYPE_FOOMATIC_GUTENPRINT = 60 DRIVER_TYPE_FOOMATIC = 70 @@ -342,12 +342,17 @@ return DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED return DRIVER_TYPE_FOOMATIC_GUTENPRINT return DRIVER_TYPE_FOOMATIC - if ppdname.find ("gutenprint") != -1: + if ppdname.startswith ("gutenprint"): if (ppdname.find ("/simple") != -1 or ppdname.find (".sim-") != -1): return DRIVER_TYPE_GUTENPRINT_NATIVE_SIMPLIFIED else: return DRIVER_TYPE_GUTENPRINT_NATIVE + if ppdname.startswith ("ijsgutenprint"): + if ppdname.find ("-simplified") != -1: + return DRIVER_TYPE_FOOMATIC_GUTENPRINT_SIMPLIFIED + else: + return DRIVER_TYPE_FOOMATIC_GUTENPRINT if ppdname.find ("-hpijs") != -1: if ppdname.find ("hpijs-rss") == -1: return DRIVER_TYPE_FOOMATIC_HPIJS