diff -u system-config-printer-1.3.6+20110831/debian/changelog system-config-printer-1.3.6+20110831/debian/changelog
--- system-config-printer-1.3.6+20110831/debian/changelog
+++ system-config-printer-1.3.6+20110831/debian/changelog
@@ -1,3 +1,14 @@
+system-config-printer (1.3.6+20110831-0ubuntu9.2) oneiric-proposed; urgency=low
+
+  * debian/patches/70_use-hpcups-instead-of-ps-with-hp-laserjet-12xx-13xx.patch:
+    Use the PCL-5e driver (HPLIP's hpcups) instead of PostScript as recommended
+    driver on the HP LaserJet 12xx and 13xx as they do not come with enough
+    memory for PostScript. The PostScript driver options are still listed for
+    manual selection so that users with a memory extension in the printer can
+    use them (LP: #872991).
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Thu, 13 Oct 2011 19:33:24 +0200
+
 system-config-printer (1.3.6+20110831-0ubuntu9.1) oneiric-proposed; urgency=low
 
   * debian/control: Depend on python-cups 1.5.59 (LP: #653132).
only in patch2:
unchanged:
--- system-config-printer-1.3.6+20110831.orig/debian/patches/70_use-hpcups-instead-of-ps-with-hp-laserjet-12xx-13xx.patch
+++ system-config-printer-1.3.6+20110831/debian/patches/70_use-hpcups-instead-of-ps-with-hp-laserjet-12xx-13xx.patch
@@ -0,0 +1,22 @@
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.3.6+20110831//xml/preferreddrivers.xml system-config-printer-1.3.6+20110831.new//xml/preferreddrivers.xml
+--- system-config-printer-1.3.6+20110831//xml/preferreddrivers.xml	2011-10-13 19:26:21.103165232 +0200
++++ system-config-printer-1.3.6+20110831.new//xml/preferreddrivers.xml	2011-10-13 19:27:14.687386343 +0200
+@@ -215,6 +215,18 @@
+       </drivers>
+     </printer>
+ 
++    <printer>
++      <make-and-model
++	  match="(Hewlett-Packard|HP) LaserJet 1[23]\d\d.*"/>
++      <drivers>
++	<drivertype>hpcups</drivertype>
++      </drivers>
++      <avoid>
++	<drivertype>*-postscript</drivertype>
++	<drivertype>manufacturer*</drivertype>
++      </avoid>
++    </printer>
++
+     <!-- HP LaserJet 2100 series: avoid using PostScript for these
+          models because they only understand PS level 2 (bug
+          #710231). -->