saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 5d02328fb0ff9031429d949c0e3850abd7c19ce0..2a4e98360054d69afa91f16a0b57723d4f84a54f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2130,10 +2130,12 @@ maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd'
 maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd'
 maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O'
 maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O'
-maybe chmod 0644 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd'
-maybe chmod 0644 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O'
-maybe chmod 0644 'cups/printers.conf'
-maybe chmod 0644 'cups/printers.conf.O'
+maybe chgrp 'lp' 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd'
+maybe chmod 0640 'cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd'
+maybe chgrp 'lp' 'cups/printers.conf'
+maybe chmod 0600 'cups/printers.conf'
+maybe chgrp 'lp' 'cups/printers.conf.O'
+maybe chmod 0600 'cups/printers.conf.O'
 maybe chmod 0644 'cups/raw.convs'
 maybe chmod 0644 'cups/raw.types'
 maybe chmod 0644 'cups/snmp.conf'

diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd
index e23744fff8754aa5620e3d76ca511bd6a1146a92..51d789741f7b4295d5928cd3572a504831192b0e 100644 (file)
--- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd
+++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd
@@ -16,7 +16,7 @@
 *cupsVersion: 2.2
 *cupsSNMPSupplies: False
 *cupsLanguages: "en"
-*APSupplies: "http://NPI9D0E59.local:631/hp/device/info_config_AirPrint.html?tab=Networking&menu=AirPrintStatus"
+*APSupplies: "https://NPI9D0E59.local:443/hp/device/info_config_AirPrint.html?tab=Networking&menu=AirPrintStatus"
 *cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"
 *cupsFilter2: "image/urf image/urf 100 -"
 *cupsFilter2: "application/PCLm application/PCLm 200 -"
@@ -35,20 +35,14 @@
 *PageSize 100x150mm/100 x 150mm: "<</PageSize[283.464566929134 425.196850393701]>>setpagedevice"
 *PageSize 184x260mm: "<</PageSize[521.574803149606 737.007874015748]>>setpagedevice"
 *PageSize 195x270mm: "<</PageSize[552.755905511811 765.354330708661]>>setpagedevice"
-<<<<<<< HEAD
 *PageSize 4x6/4 x 6": "<</PageSize[288 432]>>setpagedevice"
 *PageSize 5x8/5 x 8": "<</PageSize[360 576]>>setpagedevice"
-=======
-*PageSize 4x6/4 x 6″: "<</PageSize[288 432]>>setpagedevice"
-*PageSize 5x8/5 x 8″: "<</PageSize[360 576]>>setpagedevice"
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 *PageSize A4/A4: "<</PageSize[595.275590551181 841.889763779528]>>setpagedevice"
 *PageSize A5/A5: "<</PageSize[419.527559055118 595.275590551181]>>setpagedevice"
 *PageSize A6/A6: "<</PageSize[297.637795275591 419.527559055118]>>setpagedevice"
 *PageSize B5/JIS B5: "<</PageSize[515.905511811024 728.503937007874]>>setpagedevice"
 *PageSize B6/JIS B6: "<</PageSize[362.834645669291 515.905511811024]>>setpagedevice"
 *PageSize DoublePostcardRotated/Oufuku Reply Postcard: "<</PageSize[419.527559055118 566.929133858268]>>setpagedevice"
-<<<<<<< HEAD
 *PageSize Env10/#10 Envelope: "<</PageSize[296.985826771654 684]>>setpagedevice"
 *PageSize EnvC5/C5 Envelope: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
 *PageSize EnvDL/DL Envelope: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
@@ -59,18 +53,6 @@
 *PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
 *PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
 *PageSize Oficio/8.5 x 13.4": "<</PageSize[612 964.8]>>setpagedevice"
-=======
-*PageSize Env10/Envelope #10: "<</PageSize[296.985826771654 684]>>setpagedevice"
-*PageSize EnvC5/CEnvelope 5: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
-*PageSize EnvDL/Envelope DL: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[278.985826771654 540]>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize FanFoldGermanLegal/Foolscap: "<</PageSize[612 936]>>setpagedevice"
-*PageSize ISOB5/Envelope B5: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
-*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Oficio/8.5 x 13.4″: "<</PageSize[612 964.8]>>setpagedevice"
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 *PageSize Postcard/Hagaki: "<</PageSize[283.464566929134 419.527559055118]>>setpagedevice"
 *PageSize roc16k/ROC 16k: "<</PageSize[558 774]>>setpagedevice"
 *CloseUI: *PageSize
@@ -80,20 +62,14 @@
 *PageRegion 100x150mm/100 x 150mm: "<</PageSize[283.464566929134 425.196850393701]>>setpagedevice"
 *PageRegion 184x260mm: "<</PageSize[521.574803149606 737.007874015748]>>setpagedevice"
 *PageRegion 195x270mm: "<</PageSize[552.755905511811 765.354330708661]>>setpagedevice"
-<<<<<<< HEAD
 *PageRegion 4x6/4 x 6": "<</PageSize[288 432]>>setpagedevice"
 *PageRegion 5x8/5 x 8": "<</PageSize[360 576]>>setpagedevice"
-=======
-*PageRegion 4x6/4 x 6″: "<</PageSize[288 432]>>setpagedevice"
-*PageRegion 5x8/5 x 8″: "<</PageSize[360 576]>>setpagedevice"
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 *PageRegion A4/A4: "<</PageSize[595.275590551181 841.889763779528]>>setpagedevice"
 *PageRegion A5/A5: "<</PageSize[419.527559055118 595.275590551181]>>setpagedevice"
 *PageRegion A6/A6: "<</PageSize[297.637795275591 419.527559055118]>>setpagedevice"
 *PageRegion B5/JIS B5: "<</PageSize[515.905511811024 728.503937007874]>>setpagedevice"
 *PageRegion B6/JIS B6: "<</PageSize[362.834645669291 515.905511811024]>>setpagedevice"
 *PageRegion DoublePostcardRotated/Oufuku Reply Postcard: "<</PageSize[419.527559055118 566.929133858268]>>setpagedevice"
-<<<<<<< HEAD
 *PageRegion Env10/#10 Envelope: "<</PageSize[296.985826771654 684]>>setpagedevice"
 *PageRegion EnvC5/C5 Envelope: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
 *PageRegion EnvDL/DL Envelope: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
@@ -104,18 +80,6 @@
 *PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
 *PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
 *PageRegion Oficio/8.5 x 13.4": "<</PageSize[612 964.8]>>setpagedevice"
-=======
-*PageRegion Env10/Envelope #10: "<</PageSize[296.985826771654 684]>>setpagedevice"
-*PageRegion EnvC5/CEnvelope 5: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[278.985826771654 540]>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion FanFoldGermanLegal/Foolscap: "<</PageSize[612 936]>>setpagedevice"
-*PageRegion ISOB5/Envelope B5: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
-*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Oficio/8.5 x 13.4″: "<</PageSize[612 964.8]>>setpagedevice"
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 *PageRegion Postcard/Hagaki: "<</PageSize[283.464566929134 419.527559055118]>>setpagedevice"
 *PageRegion roc16k/ROC 16k: "<</PageSize[558 774]>>setpagedevice"
 *CloseUI: *PageRegion
@@ -213,13 +177,13 @@
 *print-content-optimize photo/Photo: ""
 *print-content-optimize graphics/Graphics: ""
 *print-content-optimize text/Text: ""
-*print-content-optimize text-and-graphics/Text and Graphics: ""
+*print-content-optimize text-and-graphics/Text And Graphics: ""
 *CloseUI: *print-content-optimize
 *OpenUI *print-scaling/Print Scaling: PickOne
 *OrderDependency: 10 AnySetup *print-scaling
 *Defaultprint-scaling: auto
 *print-scaling auto/Automatic: ""
-*print-scaling auto-fit/Auto-fit: ""
+*print-scaling auto-fit/Auto Fit: ""
 *print-scaling fill/Fill: ""
 *print-scaling fit/Fit: ""
 *print-scaling none/None: ""

diff --git a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O
deleted file mode 100644 (file)
index af25729..0000000
--- a/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local.ppd.O
+++ /dev/null
@@ -1,190 +0,0 @@
-*PPD-Adobe: "4.3"
-*FormatVersion: "4.3"
-*FileVersion: "1.20.2"
-*LanguageVersion: English
-*LanguageEncoding: ISOLatin1
-*PSVersion: "(3010.000) 0"
-*LanguageLevel: "3"
-*FileSystem: False
-*PCFileName: "drvless.ppd"
-*Manufacturer: "HP"
-*ModelName: "HP Color LaserJet MFP M277dw"
-*Product: "(HP Color LaserJet MFP M277dw)"
-*NickName: "HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2"
-*ShortNickName: "HP Color LaserJet MFP M277dw"
-*ColorDevice: True
-*cupsVersion: 2.2
-*cupsSNMPSupplies: False
-*cupsLanguages: "en"
-*APSupplies: "https://NPI9D0E59.local:443/hp/device/info_config_AirPrint.html?tab=Networking&menu=AirPrintStatus"
-*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"
-*cupsFilter2: "image/urf image/urf 100 -"
-*cupsFilter2: "application/PCLm application/PCLm 200 -"
-*cupsFilter2: "application/vnd.cups-pdf application/vnd.hp-pclxl 300 gstopxl"
-*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -"
-*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx"
-*cupsFilter2: "image/jpeg image/jpeg 0 -"
-*cupsPclmRasterBackSide: normal
-*cupsPclmCompressionMethodPreferred: flate
-*cupsPclmSourceResolutionSupported: 600dpi
-*cupsPclmStripHeightPreferred: 64
-*cupsPclmStripHeightSupported: "16,32,64,128"
-*OpenUI *PageSize/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageSize
-*DefaultPageSize: A4
-*PageSize 100x150mm: "<</PageSize[283.464566929134 425.196850393701]>>setpagedevice"
-*PageSize 184x260mm: "<</PageSize[521.574803149606 737.007874015748]>>setpagedevice"
-*PageSize 195x270mm: "<</PageSize[552.755905511811 765.354330708661]>>setpagedevice"
-*PageSize 4x6: "<</PageSize[288 432]>>setpagedevice"
-*PageSize 5x8: "<</PageSize[360 576]>>setpagedevice"
-*PageSize A4: "<</PageSize[595.275590551181 841.889763779528]>>setpagedevice"
-*PageSize A5: "<</PageSize[419.527559055118 595.275590551181]>>setpagedevice"
-*PageSize A6: "<</PageSize[297.637795275591 419.527559055118]>>setpagedevice"
-*PageSize B5: "<</PageSize[515.905511811024 728.503937007874]>>setpagedevice"
-*PageSize B6: "<</PageSize[362.834645669291 515.905511811024]>>setpagedevice"
-*PageSize DoublePostcardRotated: "<</PageSize[419.527559055118 566.929133858268]>>setpagedevice"
-*PageSize Env10: "<</PageSize[296.985826771654 684]>>setpagedevice"
-*PageSize EnvC5: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
-*PageSize EnvDL: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
-*PageSize EnvMonarch: "<</PageSize[278.985826771654 540]>>setpagedevice"
-*PageSize Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize FanFoldGermanLegal: "<</PageSize[612 936]>>setpagedevice"
-*PageSize ISOB5: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
-*PageSize Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Oficio: "<</PageSize[612 964.8]>>setpagedevice"
-*PageSize Postcard: "<</PageSize[283.464566929134 419.527559055118]>>setpagedevice"
-*PageSize roc16k: "<</PageSize[558 774]>>setpagedevice"
-*CloseUI: *PageSize
-*OpenUI *PageRegion/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: A4
-*PageRegion 100x150mm: "<</PageSize[283.464566929134 425.196850393701]>>setpagedevice"
-*PageRegion 184x260mm: "<</PageSize[521.574803149606 737.007874015748]>>setpagedevice"
-*PageRegion 195x270mm: "<</PageSize[552.755905511811 765.354330708661]>>setpagedevice"
-*PageRegion 4x6: "<</PageSize[288 432]>>setpagedevice"
-*PageRegion 5x8: "<</PageSize[360 576]>>setpagedevice"
-*PageRegion A4: "<</PageSize[595.275590551181 841.889763779528]>>setpagedevice"
-*PageRegion A5: "<</PageSize[419.527559055118 595.275590551181]>>setpagedevice"
-*PageRegion A6: "<</PageSize[297.637795275591 419.527559055118]>>setpagedevice"
-*PageRegion B5: "<</PageSize[515.905511811024 728.503937007874]>>setpagedevice"
-*PageRegion B6: "<</PageSize[362.834645669291 515.905511811024]>>setpagedevice"
-*PageRegion DoublePostcardRotated: "<</PageSize[419.527559055118 566.929133858268]>>setpagedevice"
-*PageRegion Env10: "<</PageSize[296.985826771654 684]>>setpagedevice"
-*PageRegion EnvC5: "<</PageSize[459.212598425197 649.133858267717]>>setpagedevice"
-*PageRegion EnvDL: "<</PageSize[311.811023622047 623.622047244094]>>setpagedevice"
-*PageRegion EnvMonarch: "<</PageSize[278.985826771654 540]>>setpagedevice"
-*PageRegion Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion FanFoldGermanLegal: "<</PageSize[612 936]>>setpagedevice"
-*PageRegion ISOB5: "<</PageSize[498.897637795276 708.661417322835]>>setpagedevice"
-*PageRegion Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Oficio: "<</PageSize[612 964.8]>>setpagedevice"
-*PageRegion Postcard: "<</PageSize[283.464566929134 419.527559055118]>>setpagedevice"
-*PageRegion roc16k: "<</PageSize[558 774]>>setpagedevice"
-*CloseUI: *PageRegion
-*DefaultImageableArea: A4
-*DefaultPaperDimension: A4
-*ImageableArea 100x150mm: "11.990551181102 11.990551181102 271.474015748031 413.206299212598"
-*PaperDimension 100x150mm: "283.464566929134 425.196850393701"
-*ImageableArea 184x260mm: "11.990551181102 11.990551181102 509.584251968504 725.017322834646"
-*PaperDimension 184x260mm: "521.574803149606 737.007874015748"
-*ImageableArea 195x270mm: "11.990551181102 11.990551181102 540.765354330709 753.363779527559"
-*PaperDimension 195x270mm: "552.755905511811 765.354330708661"
-*ImageableArea 4x6: "11.990551181102 11.990551181102 276.009448818898 420.009448818898"
-*PaperDimension 4x6: "288 432"
-*ImageableArea 5x8: "11.990551181102 11.990551181102 348.009448818898 564.009448818898"
-*PaperDimension 5x8: "360 576"
-*ImageableArea A4: "11.990551181102 11.990551181102 583.285039370079 829.899212598425"
-*PaperDimension A4: "595.275590551181 841.889763779528"
-*ImageableArea A5: "11.990551181102 11.990551181102 407.537007874016 583.285039370079"
-*PaperDimension A5: "419.527559055118 595.275590551181"
-*ImageableArea A6: "11.990551181102 11.990551181102 285.647244094488 407.537007874016"
-*PaperDimension A6: "297.637795275591 419.527559055118"
-*ImageableArea B5: "11.990551181102 11.990551181102 503.914960629921 716.513385826772"
-*PaperDimension B5: "515.905511811024 728.503937007874"
-*ImageableArea B6: "11.990551181102 11.990551181102 350.844094488189 503.914960629921"
-*PaperDimension B6: "362.834645669291 515.905511811024"
-*ImageableArea DoublePostcardRotated: "11.990551181102 11.990551181102 407.537007874016 554.938582677165"
-*PaperDimension DoublePostcardRotated: "419.527559055118 566.929133858268"
-*ImageableArea Env10: "11.990551181102 11.990551181102 284.995275590551 672.009448818898"
-*PaperDimension Env10: "296.985826771654 684"
-*ImageableArea EnvC5: "11.990551181102 11.990551181102 447.222047244094 637.143307086614"
-*PaperDimension EnvC5: "459.212598425197 649.133858267717"
-*ImageableArea EnvDL: "11.990551181102 11.990551181102 299.820472440945 611.631496062992"
-*PaperDimension EnvDL: "311.811023622047 623.622047244094"
-*ImageableArea EnvMonarch: "11.990551181102 11.990551181102 266.995275590551 528.009448818898"
-*PaperDimension EnvMonarch: "278.985826771654 540"
-*ImageableArea Executive: "11.990551181102 11.990551181102 510.009448818898 744.009448818898"
-*PaperDimension Executive: "522 756"
-*ImageableArea FanFoldGermanLegal: "11.990551181102 11.990551181102 600.009448818898 924.009448818898"
-*PaperDimension FanFoldGermanLegal: "612 936"
-*ImageableArea ISOB5: "11.990551181102 11.990551181102 486.907086614173 696.670866141732"
-*PaperDimension ISOB5: "498.897637795276 708.661417322835"
-*ImageableArea Legal: "11.990551181102 11.990551181102 600.009448818898 996.009448818898"
-*PaperDimension Legal: "612 1008"
-*ImageableArea Letter: "11.990551181102 11.990551181102 600.009448818898 780.009448818898"
-*PaperDimension Letter: "612 792"
-*ImageableArea Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898"
-*PaperDimension Oficio: "612 964.8"
-*ImageableArea Postcard: "11.990551181102 11.990551181102 271.474015748031 407.537007874016"
-*PaperDimension Postcard: "283.464566929134 419.527559055118"
-*ImageableArea roc16k: "11.990551181102 11.990551181102 546.009448818898 762.009448818898"
-*PaperDimension roc16k: "558 774"
-*HWMargins: "11.990551181102 11.990551181102 11.990551181102 11.990551181102"
-*ParamCustomPageSize Width: 1 points 216 612
-*ParamCustomPageSize Height: 2 points 360 1008
-*ParamCustomPageSize WidthOffset: 3 points 0 0
-*ParamCustomPageSize HeightOffset: 4 points 0 0
-*ParamCustomPageSize Orientation: 5 int 0 3
-*CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice"
-*OpenUI *InputSlot/Media Source: PickOne
-*OrderDependency: 10 AnySetup *InputSlot
-*DefaultInputSlot: Auto
-*InputSlot Auto/Automatic: "<</MediaPosition 0>>setpagedevice"
-*InputSlot Manual/Manual: "<</MediaPosition 4>>setpagedevice"
-*InputSlot Tray-1: ""
-*InputSlot Tray-2: ""
-*CloseUI: *InputSlot
-*OpenUI *ColorModel/Color Mode: PickOne
-*OrderDependency: 10 AnySetup *ColorModel
-*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
-*ColorModel AdobeRGB/Deep Color (Wide Color Gamut, AdobeRGB): "<</cupsColorSpace 20/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
-*ColorModel DeviceRGB/Device RGB: "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
-*ColorModel DeviceGray/Device Gray: "<</cupsColorSpace 0/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
-*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0>>setpagedevice"
-*DefaultColorModel: RGB
-*CloseUI: *ColorModel
-*OpenUI *Duplex/2-Sided Printing: PickOne
-*OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off (1-Sided): "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/Long-Edge (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/Short-Edge (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
-*CloseUI: *Duplex
-*cupsBackSide: Normal
-*DefaultResolution: 600dpi
-*OpenUI *cupsPrintQuality/Print Quality: PickOne
-*OrderDependency: 10 AnySetup *cupsPrintQuality
-*DefaultcupsPrintQuality: 4
-*cupsPrintQuality 3/Draft: "<</HWResolution[600 600]>>setpagedevice"
-*cupsPrintQuality 4/Normal: "<</HWResolution[600 600]>>setpagedevice"
-*CloseUI: *cupsPrintQuality
-*OpenUI *print-content-optimize/Print Optimization: PickOne
-*OrderDependency: 10 AnySetup *print-content-optimize
-*Defaultprint-content-optimize: auto
-*print-content-optimize auto/Automatic: ""
-*print-content-optimize photo/Photo: ""
-*print-content-optimize graphics/Graphics: ""
-*print-content-optimize text/Text: ""
-*print-content-optimize text-and-graphics/Text And Graphics: ""
-*CloseUI: *print-content-optimize
-*OpenUI *print-scaling/Print Scaling: PickOne
-*OrderDependency: 10 AnySetup *print-scaling
-*Defaultprint-scaling: auto
-*print-scaling auto/Automatic: ""
-*print-scaling auto-fit/Auto Fit: ""
-*print-scaling fill/Fill: ""
-*print-scaling fit/Fit: ""
-*print-scaling none/None: ""
-*CloseUI: *print-scaling

diff --git a/cups/printers.conf b/cups/printers.conf
index c8890fc2ae70e65020180cb825041d6256f520d4..a42d0bcae065cdc2168157791964f67248beed09 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -2,7 +2,6 @@
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-<<<<<<< HEAD
 UUID urn:uuid:b89eca21-fb25-3f10-483b-b060c6ca3210
 Info HP_Color_LaserJet_MFP_M277dw_9D0E59_
 MakeModel Color LaserJet MFP M277dw
@@ -11,35 +10,6 @@ State Idle
 StateTime 1650925011
 ConfigTime 1651351488
 Type 4188
-=======
-UUID urn:uuid:eb25fb10-fb06-3141-7db1-2a5d2b9246c2
-Info HP_Color_LaserJet_MFP_M277dw_9D0E59_
-MakeModel Color LaserJet MFP M277dw
-DeviceURI ipps://NPI9D0E59.local:443/ipp/print
-State Idle
-StateTime 1651061482
-ConfigTime 1651137013
-Type 4188
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-</Printer>
-<Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local>
-UUID urn:uuid:05c08d2e-f0d3-3519-574b-43e75d9e5c79
-Info 
-Location 
-MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
-DeviceURI ipp://NPI9D0E59.local:631/ipp/print
-State Idle
-StateTime 1651137594
-ConfigTime 1651137594
-Type 8425564
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 Accepting Yes
 Shared No
 JobSheets none none
@@ -50,14 +20,14 @@ OpPolicy default
 ErrorPolicy retry-job
 </Printer>
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_@NPI9D0E59.local>
-UUID urn:uuid:42ff3b52-8793-36d5-6bf3-2d9b91601e9e
+UUID urn:uuid:d93f4800-4d47-3ae9-4101-83b39ad454f6
 Info 
 Location 
 MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2
 DeviceURI ipps://NPI9D0E59.local:443/ipp/print
 State Idle
-StateTime 1651442881
-ConfigTime 1651442881
+StateTime 1651529609
+ConfigTime 1651529610
 Type 8425564
 Accepting Yes
 Shared No

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index ac2e454e7db1accbe2af2f7cc573a8057475781a..be3fe0fe04c70ae1d797c5fcf4a78ea1957f331c 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -2,7 +2,6 @@
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-<<<<<<< HEAD
 UUID urn:uuid:b89eca21-fb25-3f10-483b-b060c6ca3210
 Info HP_Color_LaserJet_MFP_M277dw_9D0E59_
 MakeModel Color LaserJet MFP M277dw
@@ -10,16 +9,6 @@ DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 State Idle
 StateTime 1650925011
 ConfigTime 1651351488
-=======
-UUID urn:uuid:eb25fb10-fb06-3141-7db1-2a5d2b9246c2
-Info 
-Location 
-MakeModel Color LaserJet MFP M277dw
-DeviceURI ipps://NPI9D0E59.local:443/ipp/print
-State Idle
-StateTime 1651061482
-ConfigTime 1651137013
->>>>>>> 79ced3fb4923401e772b7f23f7ba99d5673396d6
 Type 4188
 Accepting Yes
 Shared No