packaging/more-user-friendly-choice-names-for-installed-cartridges.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## more-user-friendly-choice-names-for-installed-cartridges.dpatch by  <till.kamppeter@gmail.com>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: No description.
   6
   7 @DPATCH@
   8 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.5~/prnt/drv/hpcups.drv.in hplip-3.11.5/prnt/drv/hpcups.drv.in
   9 --- hplip-3.11.5~/prnt/drv/hpcups.drv.in        2011-05-26 14:23:17.762457622 +0200
  10 +++ hplip-3.11.5/prnt/drv/hpcups.drv.in 2011-05-26 14:27:20.962443341 +0200
  11 @@ -5008,9 +5008,9 @@
  12
  13    // Installed Cartridge: Only For Lidil Devices.
  14    Option "InstalledCartridge/Installed Cartridges" PickOne AnySetup 10.0
  15 -    Choice "BlackColorOnly/BlackColor Only" "<</cupsInteger1 0>>setpagedevice"
  16 +    Choice "BlackColorOnly/Black Only" "<</cupsInteger1 0>>setpagedevice"
  17      Choice "TriColorOnly/TriColor Only" "<</cupsInteger1 1>>setpagedevice"
  18 -    Choice "PhotoColorOnly/PhotoColor Only" "<</cupsInteger1 2>>setpagedevice"
  19 +    Choice "PhotoColorOnly/Photo Only" "<</cupsInteger1 2>>setpagedevice"
  20      *Choice "BlackAndTriColor/Black and TriColor" "<</cupsInteger1 3>>setpagedevice"
  21      Choice "PhotoAndColor/Photo and TriColor" "<</cupsInteger1 4>>setpagedevice"
  22
  23 @@ -5227,9 +5227,9 @@
  24
  25    // Installed Cartridge: Only For Lidil Devices.
  26    Option "InstalledCartridge/Installed Cartridges" PickOne AnySetup 10.0
  27 -    Choice "BlackColorOnly/BlackColor Only" "<</cupsInteger1 0>>setpagedevice"
  28 +    Choice "BlackColorOnly/Black Only" "<</cupsInteger1 0>>setpagedevice"
  29      Choice "TriColorOnly/TriColor Only" "<</cupsInteger1 1>>setpagedevice"
  30 -    Choice "PhotoColorOnly/PhotoColor Only" "<</cupsInteger1 2>>setpagedevice"
  31 +    Choice "PhotoColorOnly/Photo Only" "<</cupsInteger1 2>>setpagedevice"
  32      *Choice "BlackAndTriColor/Black and TriColor" "<</cupsInteger1 3>>setpagedevice"
  33      Choice "PhotoAndColor/Photo and TriColor" "<</cupsInteger1 4>>setpagedevice"
  34
  35 @@ -8349,9 +8349,9 @@
  36
  37    // Installed Cartridge: Only For Lidil Devices.
  38    Option "InstalledCartridge/Installed Cartridges" PickOne AnySetup 10.0
  39 -    Choice "BlackColorOnly/BlackColor Only" "<</cupsInteger1 0>>setpagedevice"
  40 +    Choice "BlackColorOnly/Black Only" "<</cupsInteger1 0>>setpagedevice"
  41      Choice "TriColorOnly/TriColor Only" "<</cupsInteger1 1>>setpagedevice"
  42 -    Choice "PhotoColorOnly/PhotoColor Only" "<</cupsInteger1 2>>setpagedevice"
  43 +    Choice "PhotoColorOnly/Photo Only" "<</cupsInteger1 2>>setpagedevice"
  44      *Choice "BlackAndTriColor/Black and TriColor" "<</cupsInteger1 3>>setpagedevice"
  45      Choice "PhotoAndColor/Photo and TriColor" "<</cupsInteger1 4>>setpagedevice"
  46
  47 @@ -8770,9 +8770,9 @@
  48
  49    // Installed Cartridge: Only For Lidil Devices.
  50    Option "InstalledCartridge/Installed Cartridges" PickOne AnySetup 10.0
  51 -    Choice "BlackColorOnly/BlackColor Only" "<</cupsInteger1 0>>setpagedevice"
  52 +    Choice "BlackColorOnly/Black Only" "<</cupsInteger1 0>>setpagedevice"
  53      Choice "TriColorOnly/TriColor Only" "<</cupsInteger1 1>>setpagedevice"
  54 -    Choice "PhotoColorOnly/PhotoColor Only" "<</cupsInteger1 2>>setpagedevice"
  55 +    Choice "PhotoColorOnly/Photo Only" "<</cupsInteger1 2>>setpagedevice"
  56      *Choice "BlackAndTriColor/Black and TriColor" "<</cupsInteger1 3>>setpagedevice"
  57      Choice "PhotoAndColor/Photo and TriColor" "<</cupsInteger1 4>>setpagedevice"
  58
  59 @@ -9175,9 +9175,9 @@
  60
  61    // Installed Cartridge: Only For Lidil Devices.
  62    Option "InstalledCartridge/Installed Cartridges" PickOne AnySetup 10.0
  63 -    Choice "BlackColorOnly/BlackColor Only" "<</cupsInteger1 0>>setpagedevice"
  64 +    Choice "BlackColorOnly/Black Only" "<</cupsInteger1 0>>setpagedevice"
  65      Choice "TriColorOnly/TriColor Only" "<</cupsInteger1 1>>setpagedevice"
  66 -    Choice "PhotoColorOnly/PhotoColor Only" "<</cupsInteger1 2>>setpagedevice"
  67 +    Choice "PhotoColorOnly/Photo Only" "<</cupsInteger1 2>>setpagedevice"
  68      *Choice "BlackAndTriColor/Black and TriColor" "<</cupsInteger1 3>>setpagedevice"
  69      Choice "PhotoAndColor/Photo and TriColor" "<</cupsInteger1 4>>setpagedevice"
  70