Merge branch 'f14' into f15

gutenprint-device-ids.patch

@@ -1,6 +1,6 @@
 diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/xml/printers.xml
 --- gutenprint-5.2.7/src/xml/printers.xml.device-ids	2011-05-01 17:44:04.000000000 +0200
-+++ gutenprint-5.2.7/src/xml/printers.xml	2011-05-05 13:07:51.000000000 +0200
++++ gutenprint-5.2.7/src/xml/printers.xml	2011-06-03 17:12:34.507467491 +0200
 @@ -143,11 +143,11 @@
        <printer translate="name" name="Canon PIXMA iP2500" driver="bjc-PIXMA-iP2500" manufacturer="Canon" model="3002500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2500" />
        <printer translate="name" name="Canon PIXMA iP2600" driver="bjc-PIXMA-iP2600" manufacturer="Canon" model="3002600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2600" />
@@ -33,7 +33,15 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
        <printer translate="name" name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" foomaticid="Epson-Stylus_Photo_1280" />
        <printer translate="name" name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" foomaticid="Epson-Stylus_Photo_1290" />
        <printer translate="name" name="Epson Stylus Photo 1290s" driver="escp2-1290s" manufacturer="Epson" model="37" parameters="standard_params" foomaticid="Epson-Stylus_Photo_1290s" />
-@@ -785,7 +785,7 @@
+@@ -522,6 +522,7 @@
+       <printer translate="name" name="Epson Stylus CX9400F" driver="escp2-cx9400f" manufacturer="Epson" model="65" parameters="cx3500_params" foomaticid="Epson-Stylus_CX9400F" />
+       <printer translate="name" name="Epson Stylus CX9475F" driver="escp2-cx9475f" manufacturer="Epson" model="65" parameters="cx3500_params" foomaticid="Epson-Stylus_CX9475F" />
+       <printer translate="name" name="Epson Stylus D68" deviceid="MFG:EPSON;MDL:Stylus D68;DES:EPSON Stylus D68;CMD:ESCPL2,BDC,D4;" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" foomaticid="Epson-Stylus_D68" />
++      <printer translate="name" name="Epson Stylus D78" deviceid="MFG:EPSON;MDL:Stylus D78;DES:EPSON Stylus D78;CMD:ESCPL2,BDC,D4,D4PX;" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" foomaticid="Epson-Stylus_D78" />
+       <printer translate="name" name="Epson Stylus D88" deviceid="MFG:EPSON;MDL:Stylus D88;DES:EPSON Stylus D88;CMD:ESCPL2,BDC,D4;" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" foomaticid="Epson-Stylus_D88" />
+       <printer translate="name" name="Epson Stylus D92" deviceid="MFG:EPSON;CMD:ESCPL2,BDC,D4,D4PX;MDL:Stylus D92;DES:EPSON Stylus D92;" driver="escp2-d92" manufacturer="Epson" model="66" parameters="standard_params" foomaticid="Epson-Stylus_D92" />
+       <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" foomaticid="Epson-Stylus_D120" />
+@@ -785,7 +786,7 @@
        <printer translate="name" name="Brother HL-1850" driver="brother-hl-1850" manufacturer="Brother" model="6" parameters="pcl_laser_params" foomaticid="Brother-HL-1850" />
        <printer translate="name" name="Brother HL-1870N" driver="brother-hl-1870n" manufacturer="Brother" model="6" parameters="pcl_laser_params" foomaticid="Brother-HL-1870N" />
        <printer translate="name" name="Brother HL-2030" driver="brother-hl-2030" manufacturer="Brother" model="6" parameters="pcl_laser_params" foomaticid="Brother-HL-2030" />
@@ -42,7 +50,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
        <printer translate="name" name="Brother HL-2060" driver="brother-hl-2060" manufacturer="Brother" model="6" parameters="pcl_laser_params" foomaticid="Brother-HL-2060" />
        <printer translate="name" name="Brother HL-2460" deviceid="MFG:Brother;MDL:Brother HL-2460 series;" driver="brother-hl-2460" manufacturer="Brother" model="6" parameters="pcl_laser_params" foomaticid="Brother-HL-2460" />
        <printer translate="name" name="Brother HL-2460N" driver="brother-hl-2460n" manufacturer="Brother" model="6" parameters="pcl_laser_params" foomaticid="Brother-HL-2460N" />
-@@ -918,9 +918,9 @@
+@@ -918,9 +919,9 @@
        <printer translate="name" name="HP Business Inkjet 2280" deviceid="MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;CMD:MLC,PML,PJL,PCL5,POSTSCRIPT;" driver="hp-bij_2280" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-Business_Inkjet_2280" />
        <printer translate="name" name="HP Color Inkjet Printer CP1160" driver="hp-cij_cp1160" manufacturer="HP" model="900" parameters="pcl_inkjet_params" foomaticid="HP-Color_Inkjet_Printer_CP1160" />
        <printer translate="name" name="HP Color Inkjet Printer CP1700" deviceid="MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" driver="hp-cij_cp1700" manufacturer="HP" model="901" parameters="pcl_inkjet_params" foomaticid="HP-Color_Inkjet_Printer_CP1700" />
@@ -54,7 +62,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
        <printer translate="name" name="HP Color LaserJet 4600" deviceid="MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" driver="hp-clj_4600" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-Color_LaserJet_4600" />
        <printer translate="name" name="HP Color LaserJet 5" driver="hp-clj_5" manufacturer="HP" model="3" parameters="pcl_laser_params" foomaticid="HP-Color_LaserJet_5" />
        <printer translate="name" name="HP Color LaserJet 5000" driver="hp-clj_5000" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-Color_LaserJet_5000" />
-@@ -1090,19 +1090,19 @@
+@@ -1090,19 +1091,19 @@
        <printer translate="name" name="HP LaserJet 3390" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3390" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_3390" />
        <printer translate="name" name="HP LaserJet 3392" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;CMD:PJL,MLC,PCL,POSTSCRIPT,PCLXL;" driver="hp-lj_3392" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_3392" />
        <printer translate="name" name="HP LaserJet 4000" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_4000" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_4000" />
@@ -79,7 +87,7 @@ diff -up gutenprint-5.2.7/src/xml/printers.xml.device-ids gutenprint-5.2.7/src/x
        <printer translate="name" name="HP LaserJet 8100" driver="hp-lj_8100" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_8100" />
        <printer translate="name" name="HP LaserJet 8150" deviceid="MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;" driver="hp-lj_8150" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_8150" />
        <printer translate="name" name="HP LaserJet 9000" driver="hp-lj_9000" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_9000" />
-@@ -1110,15 +1110,15 @@
+@@ -1110,15 +1111,15 @@
        <printer translate="name" name="HP LaserJet 9040 MFP" driver="hp-lj_9040_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_9040_MFP" />
        <printer translate="name" name="HP LaserJet 9050" driver="hp-lj_9050" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_9050" />
        <printer translate="name" name="HP LaserJet 9050 MFP" driver="hp-lj_9050_mfp" manufacturer="HP" model="6" parameters="pcl_laser_params" foomaticid="HP-LaserJet_9050_MFP" />

gutenprint-null-pointer.patch

@@ -1,7 +1,7 @@
 diff -up gutenprint-5.2.7/src/escputil/escputil.c.null-pointer gutenprint-5.2.7/src/escputil/escputil.c
 --- gutenprint-5.2.7/src/escputil/escputil.c.null-pointer	2010-12-11 23:04:07.000000000 +0100
-+++ gutenprint-5.2.7/src/escputil/escputil.c	2011-05-05 13:11:37.000000000 +0200
++++ gutenprint-5.2.7/src/escputil/escputil.c	2011-07-25 17:52:56.999202508 +0200
-@@ -1340,10 +1340,8 @@ do_new_status(status_cmd_t cmd, char *bu
+@@ -1340,10 +1340,14 @@ do_new_status(status_cmd_t cmd, char *bu
    const char *ind;
    const stp_string_list_t *color_list = NULL;
    stp_parameter_t desc;
@@ -10,21 +10,23 @@ diff -up gutenprint-5.2.7/src/escputil/escputil.c.null-pointer gutenprint-5.2.7/
 -  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 -    color_list = desc.bounds.str;
 +  const stp_vars_t *printvars = NULL;
-+
++  if (printer)
++    {
++      printvars = stp_printer_get_defaults(printer);
++      stp_describe_parameter(printvars, "ChannelNames", &desc);
++      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
++        color_list = desc.bounds.str;
++    }
    STP_DEBUG(printf("New format bytes: %d bytes\n", bytes));
    if (cmd == CMD_STATUS)
      printf(_("Printer Name: %s\n"),
-@@ -1409,6 +1407,13 @@ do_new_status(status_cmd_t cmd, char *bu
+@@ -1428,7 +1432,8 @@ do_new_status(status_cmd_t cmd, char *bu
- 	      for (j = 0; j < total_param_count; j++)
+ 	}
- 		{
+       i += total_param_count + 2;
- 		  param = (unsigned) buf[i + j + 2];
+     }
-+		  if (printer)
+-  stp_parameter_description_destroy(&desc);
-+		  {
++  if (printer)
-+		    printvars = stp_printer_get_defaults(printer);
++    stp_parameter_description_destroy(&desc);
-+		    stp_describe_parameter(printvars, "ChannelNames", &desc);
+   exit(0);
-+		    if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+ }
-+		      color_list = desc.bounds.str;
+ 
-+		  }
- 		  print_warning(param, color_list);
- 		}
- 	      break;

gutenprint.spec

@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package
 Version:        5.2.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:	http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2
@@ -154,7 +154,7 @@ Epson, HP and compatible printers.
 # Allow the CUPS dynamic driver to run inside a build root.
 %patch3 -p1 -b .postscriptdriver
 # Added IEEE 1284 Device ID for
-#  Epson Stylus D92 (bug #570888).
+#  Epson Stylus D78 (bug #245948).
 #  Epson Stylus Photo R230 (from Ubuntu #520466).
 #  Epson Stylus D92 (bug #570888).
 #  Epson Stylus Photo 1400 (bug #577299).
@@ -301,6 +301,11 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Tue Aug 09 2011 Jiri Popelka <jpopelka@redhat.com> 5.2.7-5
+- Improve the null-pointer.patch (bug #725447).
+- Added IEEE 1284 Device ID for:
+    Epson Stylus D78 (bug #245948).
+
 * Tue Jun 28 2011 Tim Waugh <twaugh@redhat.com> 5.2.7-4
 - Fixed use of find_lang macro (bug #716426).