diff -u foomatic-db-engine-4.0.0/debian/changelog foomatic-db-engine-4.0.0/debian/changelog
--- foomatic-db-engine-4.0.0/debian/changelog
+++ foomatic-db-engine-4.0.0/debian/changelog
@@ -1,3 +1,15 @@
+foomatic-db-engine (4.0.0-0ubuntu6.1) jaunty-proposed; urgency=low
+
+  * debian/patches/20_fix-jcl-options-as-members-of-composite-options.patch:
+    Upstream fix in the PPD generator: In Foomatic PPDs JCL options were
+    broken when they where member options of a composite options. In addition
+    to these options not being correctly applied this made them also be
+    interpreted as a PostScript options which in turn made foomatic-rip
+    converting PDF jobs to PostScript. This made some printers suffering
+    LP: #361772 which usually is worked around by the PDF printing workflow.
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Thu,  7 May 2009 22:00:49 +0200
+
 foomatic-db-engine (4.0.0-0ubuntu6) jaunty; urgency=low
 
   * debian/foomatic-db-engine.postinst: Silenced non-fatal error messages when
only in patch2:
unchanged:
--- foomatic-db-engine-4.0.0.orig/debian/patches/20_fix-jcl-options-as-members-of-composite-options.patch
+++ foomatic-db-engine-4.0.0/debian/patches/20_fix-jcl-options-as-members-of-composite-options.patch
@@ -0,0 +1,49 @@
+diff -Nur -x '*.orig' -x '*~' foomatic-db-engine-4.0.0/lib/Foomatic/DB.pm foomatic-db-engine-4.0.0.new/lib/Foomatic/DB.pm
+--- foomatic-db-engine-4.0.0/lib/Foomatic/DB.pm	2009-05-07 21:59:12.000000000 +0200
++++ foomatic-db-engine-4.0.0.new/lib/Foomatic/DB.pm	2009-05-07 21:59:39.000000000 +0200
+@@ -3671,16 +3671,16 @@
+ 	}
+ 
+ 	# Set default for missing section value
+-	if (!defined($section)) {
+-	    if ($optstyle eq "JCL") {
+-		$section = "JCLSetup"
+-	    }
+-	    else {
+-		$section = "AnySetup";
+-	    }
++	if (defined($arg->{'style'}) && ($arg->{'style'} eq "J") &&
++	    !defined($arg->{'memberof'})) {
++	    $arg->{'section'} = "JCLSetup";
++        } elsif (!defined($arg->{'section'})) {
++	    $arg->{'section'} = "AnySetup"
+ 	}
++	$section = $arg->{'section'};
+ 
+-	my $jcl = ($section eq 'JCLSetup' ? "JCL" : "");
++	my $jcl = (($section eq 'JCLSetup') &&
++		   !defined($arg->{'memberof'}) ? "JCL" : "");
+ 
+ 	# Set default for missing tranaslation/longname
+ 	if (!$com) {$com = longname($name);}
+@@ -3841,7 +3841,8 @@
+ 		     sprintf("\n*${jcl}OpenUI *%s/%s: PickOne\n", $name, 
+ 			     cutguiname($com, $shortgui)));
+ 
+-		if ($arg->{'style'} ne 'G' && ($optstyle ne "JCL")) {
++		if ($arg->{'style'} ne 'G' && 
++		    (($optstyle ne "JCL") || defined($arg->{'memberof'}))) {
+ 		    # For non-PostScript options insert line with option
+ 		    # properties
+ 		    push(@optionblob, sprintf
+@@ -3986,7 +3987,9 @@
+ 		    # inserted, unless they are member of a composite
+ 		    # option AND they are set to the "Controlled by
+ 		    # '<Composite>'" choice (driverval is "\x01")
+-		    if (($arg->{'style'} eq 'G' || $optstyle eq "JCL") &&
++		    if (($arg->{'style'} eq 'G' || 
++			 (($optstyle eq "JCL") &&
++			  !defined($arg->{'memberof'}))) &&
+ 			($v->{'driverval'} ne "\x01")) {
+ 			# Ghostscript argument; offer up ps for
+ 			# insertion