From 28bc63f15da7dd6d872c5f0f0202dc0c5b6bc7f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20H=C3=B6llein?= Date: Tue, 8 Oct 2019 20:28:10 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 10 +- ... HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd} | 163 ++++++++---------- ...P_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O} | 163 ++++++++---------- cups/printers.conf.O | 22 +-- .../snap-canonical\\x2dlivepatch-77.mount" | 1 - .../snap-canonical\\x2dlivepatch-84.mount" | 1 + .../snap-canonical\\x2dlivepatch-77.mount" | 12 -- .../snap-canonical\\x2dlivepatch-84.mount" | 12 ++ ...cal-livepatch.canonical-livepatchd.service | 6 +- 9 files changed, 160 insertions(+), 230 deletions(-) rename cups/ppd/{HP_LaserJet_M806_17B98C_.ppd => HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd} (63%) rename cups/ppd/{HP_LaserJet_M806_17B98C_.ppd.O => HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O} (63%) delete mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-77.mount" create mode 120000 "systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-84.mount" delete mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-77.mount" create mode 100644 "systemd/system/snap-canonical\\x2dlivepatch-84.mount" diff --git a/.etckeeper b/.etckeeper index f5c4bb8..498388c 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1255,10 +1255,10 @@ maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd' maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd' maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O' maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O' -maybe chgrp 'lp' 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd' -maybe chmod 0640 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd' -maybe chgrp 'lp' 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O' -maybe chmod 0640 'cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O' +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 chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd' maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd' maybe chgrp 'lp' 'cups/printers.conf.O' @@ -2824,8 +2824,8 @@ maybe chmod 0755 'systemd/system/paths.target.wants' maybe chmod 0755 'systemd/system/printer.target.wants' maybe chmod 0644 'systemd/system/snap-atom-236.mount' maybe chmod 0644 'systemd/system/snap-atom-238.mount' -maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-77.mount' maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-81.mount' +maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-84.mount' maybe chmod 0644 'systemd/system/snap-core-7396.mount' maybe chmod 0644 'systemd/system/snap-core-7713.mount' maybe chmod 0644 'systemd/system/snap.canonical-livepatch.canonical-livepatchd.service' diff --git a/cups/ppd/HP_LaserJet_M806_17B98C_.ppd b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd similarity index 63% rename from cups/ppd/HP_LaserJet_M806_17B98C_.ppd rename to cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd index c33ab42..ed64732 100644 --- a/cups/ppd/HP_LaserJet_M806_17B98C_.ppd +++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd @@ -8,138 +8,113 @@ *FileSystem: False *PCFileName: "ippeve.ppd" *Manufacturer: "HP" -*ModelName: "LaserJet M806" -*Product: "(LaserJet M806)" -*NickName: "LaserJet M806 - IPP Everywhere" -*ShortNickName: "LaserJet M806 - IPP Everywhere" -*ColorDevice: False +*ModelName: "Color LaserJet MFP M277dw" +*Product: "(Color LaserJet MFP M277dw)" +*NickName: "Color LaserJet MFP M277dw - IPP Everywhere" +*ShortNickName: "Color LaserJet MFP M277dw - IPP Everywhere" +*ColorDevice: True *cupsVersion: 2.2 *cupsSNMPSupplies: False *cupsLanguages: "en" -*cupsPassword: "11111111111111111111111111111111" *cupsFilter2: "image/jpeg image/jpeg 0 -" *cupsFilter2: "application/vnd.cups-pdf application/pdf 10 -" *cupsFilter2: "image/urf image/urf 100 -" *OpenUI *PageSize: PickOne *OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: Unknown +*DefaultPageSize: A4 *PageSize Letter: "<>setpagedevice" *PageSize Legal: "<>setpagedevice" *PageSize Executive: "<>setpagedevice" -*PageSize Statement: "<>setpagedevice" *PageSize FanFoldGermanLegal: "<>setpagedevice" -*PageSize Tabloid: "<>setpagedevice" -*PageSize ARCHB: "<>setpagedevice" +*PageSize Oficio: "<>setpagedevice" +*PageSize 4x6: "<>setpagedevice" *PageSize 5x8: "<>setpagedevice" -*PageSize A3: "<>setpagedevice" *PageSize A4: "<>setpagedevice" *PageSize A5: "<>setpagedevice" -*PageSize RA3: "<>setpagedevice" -*PageSize RA4: "<>setpagedevice" -*PageSize SRA4: "<>setpagedevice" -*PageSize B4: "<>setpagedevice" +*PageSize A6: "<>setpagedevice" *PageSize B5: "<>setpagedevice" -*PageSize Oficio: "<>setpagedevice" -*PageSize 270x390mm: "<>setpagedevice" +*PageSize B6: "<>setpagedevice" +*PageSize 100x150mm: "<>setpagedevice" *PageSize 195x270mm: "<>setpagedevice" -*PageSize 260x368mm: "<>setpagedevice" *PageSize 184x260mm: "<>setpagedevice" -*PageSize roc8k: "<>setpagedevice" *PageSize roc16k: "<>setpagedevice" +*PageSize Postcard: "<>setpagedevice" *PageSize DoublePostcardRotated: "<>setpagedevice" -*PageSize Env9: "<>setpagedevice" *PageSize Env10: "<>setpagedevice" +*PageSize EnvMonarch: "<>setpagedevice" *PageSize ISOB5: "<>setpagedevice" *PageSize EnvC5: "<>setpagedevice" *PageSize EnvDL: "<>setpagedevice" *CloseUI: *PageSize *OpenUI *PageRegion: PickOne *OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Unknown +*DefaultPageRegion: A4 *PageRegion Letter: "<>setpagedevice" *PageRegion Legal: "<>setpagedevice" *PageRegion Executive: "<>setpagedevice" -*PageRegion Statement: "<>setpagedevice" *PageRegion FanFoldGermanLegal: "<>setpagedevice" -*PageRegion Tabloid: "<>setpagedevice" -*PageRegion ARCHB: "<>setpagedevice" +*PageRegion Oficio: "<>setpagedevice" +*PageRegion 4x6: "<>setpagedevice" *PageRegion 5x8: "<>setpagedevice" -*PageRegion A3: "<>setpagedevice" *PageRegion A4: "<>setpagedevice" *PageRegion A5: "<>setpagedevice" -*PageRegion RA3: "<>setpagedevice" -*PageRegion RA4: "<>setpagedevice" -*PageRegion SRA4: "<>setpagedevice" -*PageRegion B4: "<>setpagedevice" +*PageRegion A6: "<>setpagedevice" *PageRegion B5: "<>setpagedevice" -*PageRegion Oficio: "<>setpagedevice" -*PageRegion 270x390mm: "<>setpagedevice" +*PageRegion B6: "<>setpagedevice" +*PageRegion 100x150mm: "<>setpagedevice" *PageRegion 195x270mm: "<>setpagedevice" -*PageRegion 260x368mm: "<>setpagedevice" *PageRegion 184x260mm: "<>setpagedevice" -*PageRegion roc8k: "<>setpagedevice" *PageRegion roc16k: "<>setpagedevice" +*PageRegion Postcard: "<>setpagedevice" *PageRegion DoublePostcardRotated: "<>setpagedevice" -*PageRegion Env9: "<>setpagedevice" *PageRegion Env10: "<>setpagedevice" +*PageRegion EnvMonarch: "<>setpagedevice" *PageRegion ISOB5: "<>setpagedevice" *PageRegion EnvC5: "<>setpagedevice" *PageRegion EnvDL: "<>setpagedevice" *CloseUI: *PageRegion -*DefaultImageableArea: Unknown -*DefaultPaperDimension: Unknown +*DefaultImageableArea: A4 +*DefaultPaperDimension: A4 *ImageableArea Letter: "11.990551181102 11.990551181102 600.009448818898 780.009448818898" *PaperDimension Letter: "612 792" *ImageableArea Legal: "11.990551181102 11.990551181102 600.009448818898 996.009448818898" *PaperDimension Legal: "612 1008" *ImageableArea Executive: "11.990551181102 11.990551181102 510.009448818898 744.009448818898" *PaperDimension Executive: "522 756" -*ImageableArea Statement: "11.990551181102 11.990551181102 384.009448818898 600.009448818898" -*PaperDimension Statement: "396 612" *ImageableArea FanFoldGermanLegal: "11.990551181102 11.990551181102 600.009448818898 924.009448818898" *PaperDimension FanFoldGermanLegal: "612 936" -*ImageableArea Tabloid: "11.990551181102 11.990551181102 780.009448818898 1212.009448818898" -*PaperDimension Tabloid: "792 1224" -*ImageableArea ARCHB: "11.990551181102 11.990551181102 852.009448818898 1284.009448818898" -*PaperDimension ARCHB: "864 1296" +*ImageableArea Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" +*PaperDimension Oficio: "612 964.8" +*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 A3: "11.990551181102 11.990551181102 829.899212598425 1178.56062992126" -*PaperDimension A3: "841.889763779528 1190.551181102362" *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 RA3: "11.990551181102 11.990551181102 852.576377952756 1206.907086614173" -*PaperDimension RA3: "864.566929133858 1218.897637795276" -*ImageableArea RA4: "11.990551181102 11.990551181102 597.458267716535 852.576377952756" -*PaperDimension RA4: "609.448818897638 864.566929133858" -*ImageableArea SRA4: "11.990551181102 11.990551181102 625.804724409449 895.096062992126" -*PaperDimension SRA4: "637.795275590551 907.086614173228" -*ImageableArea B4: "11.990551181102 11.990551181102 716.513385826772 1019.820472440945" -*PaperDimension B4: "728.503937007874 1031.811023622047" +*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 Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" -*PaperDimension Oficio: "612 964.8" -*ImageableArea 270x390mm: "11.990551181102 11.990551181102 753.363779527559 1093.52125984252" -*PaperDimension 270x390mm: "765.354330708661 1105.511811023622" +*ImageableArea B6: "11.990551181102 11.990551181102 350.844094488189 503.914960629921" +*PaperDimension B6: "362.834645669291 515.905511811024" +*ImageableArea 100x150mm: "11.990551181102 11.990551181102 271.474015748031 413.206299212598" +*PaperDimension 100x150mm: "283.464566929134 425.196850393701" *ImageableArea 195x270mm: "11.990551181102 11.990551181102 540.765354330709 753.363779527559" *PaperDimension 195x270mm: "552.755905511811 765.354330708661" -*ImageableArea 260x368mm: "11.990551181102 11.990551181102 725.017322834646 1031.15905511811" -*PaperDimension 260x368mm: "737.007874015748 1043.149606299213" *ImageableArea 184x260mm: "11.990551181102 11.990551181102 509.584251968504 725.017322834646" *PaperDimension 184x260mm: "521.574803149606 737.007874015748" -*ImageableArea roc8k: "11.990551181102 11.990551181102 762.009448818898 1104.009448818898" -*PaperDimension roc8k: "774 1116" *ImageableArea roc16k: "11.990551181102 11.990551181102 546.009448818898 762.009448818898" *PaperDimension roc16k: "558 774" +*ImageableArea Postcard: "11.990551181102 11.990551181102 271.474015748031 407.537007874016" +*PaperDimension Postcard: "283.464566929134 419.527559055118" *ImageableArea DoublePostcardRotated: "11.990551181102 11.990551181102 407.537007874016 554.938582677165" *PaperDimension DoublePostcardRotated: "419.527559055118 566.929133858268" -*ImageableArea Env9: "11.990551181102 11.990551181102 266.995275590551 626.995275590551" -*PaperDimension Env9: "278.985826771654 638.985826771654" *ImageableArea Env10: "11.990551181102 11.990551181102 284.995275590551 672.009448818898" *PaperDimension Env10: "296.985826771654 684" +*ImageableArea EnvMonarch: "11.990551181102 11.990551181102 266.995275590551 528.009448818898" +*PaperDimension EnvMonarch: "278.985826771654 540" *ImageableArea ISOB5: "11.990551181102 11.990551181102 486.907086614173 696.670866141732" *PaperDimension ISOB5: "498.897637795276 708.661417322835" *ImageableArea EnvC5: "11.990551181102 11.990551181102 447.222047244094 637.143307086614" @@ -151,34 +126,40 @@ *DefaultInputSlot: Auto *InputSlot Auto: "<>setpagedevice" *de_DE.InputSlot Auto/Automatic: "" -*InputSlot Tray5: "<>setpagedevice" -*de_DE.InputSlot Tray5/Fach 5: "" -*InputSlot Tray4: "<>setpagedevice" -*de_DE.InputSlot Tray4/Fach 4: "" -*InputSlot Tray3: "<>setpagedevice" -*de_DE.InputSlot Tray3/Fach 3: "" -*InputSlot Tray2: "<>setpagedevice" -*de_DE.InputSlot Tray2/Fach 2: "" +*InputSlot Manual: "<>setpagedevice" +*de_DE.InputSlot Manual/Manual: "" *InputSlot Tray1: "<>setpagedevice" *de_DE.InputSlot Tray1/Fach 1: "" +*InputSlot Tray2: "<>setpagedevice" +*de_DE.InputSlot Tray2/Fach 2: "" *CloseUI: *InputSlot *OpenUI *MediaType: PickOne *OrderDependency: 10 AnySetup *MediaType -*DefaultMediaType: Stationery +*DefaultMediaType: HPMatte90gsm *MediaType Stationery: "<>setpagedevice" *de_DE.MediaType Stationery/Standardpapier: "" -*MediaType Com.hp.EcoSMARTLite/com.hp.EcoSMARTLite: "<>setpagedevice" +*MediaType HPMatte90gsm/HPMatte90gsm: "<>setpagedevice" +*MediaType HPMatte105gsm/HPMatte105gsm: "<>setpagedevice" +*MediaType HPMatte120gsm/HPMatte120gsm: "<>setpagedevice" +*MediaType HPMatte160gsm/HPMatte160gsm: "<>setpagedevice" +*MediaType HPCover/HPCover: "<>setpagedevice" +*MediaType HPGlossy130gsm/HPGlossy130gsm: "<>setpagedevice" +*MediaType PhotographicGlossy: "<>setpagedevice" +*de_DE.MediaType PhotographicGlossy/Fotoglanzpapier: "" +*MediaType HPTrifoldGlossy160gsm/HPTrifoldGlossy160gsm: "<>setpagedevice" +*MediaType HPGlossyPhoto/HPGlossyPhoto: "<>setpagedevice" *MediaType StationeryLightweight: "<>setpagedevice" *de_DE.MediaType StationeryLightweight/Lightweight Paper: "" -*MediaType StationeryBond/stationery-bond: "<>setpagedevice" -*MediaType Com.hp.recycled/com.hp.recycled: "<>setpagedevice" -*MediaType Com.hp.midweight/com.hp.midweight: "<>setpagedevice" +*MediaType ExtraLight/extraLight: "<>setpagedevice" +*MediaType Intermediate/intermediate: "<>setpagedevice" +*MediaType Midweight/midweight: "<>setpagedevice" *MediaType StationeryHeavyweight: "<>setpagedevice" *de_DE.MediaType StationeryHeavyweight/Schweres Papier: "" -*MediaType Com.hp.extraHeavy: "<>setpagedevice" -*de_DE.MediaType Com.hp.extraHeavy/Extra Heavyweight Paper: "" -*MediaType Cardstock: "<>setpagedevice" -*de_DE.MediaType Cardstock/Cardstock: "" +*MediaType ExtraHeavy/extraHeavy: "<>setpagedevice" +*MediaType PhotographicHighGloss: "<>setpagedevice" +*de_DE.MediaType PhotographicHighGloss/Hochglanzfotopapier: "" +*MediaType ExtraHeavyGloss/extraHeavyGloss: "<>setpagedevice" +*MediaType CardGlossy/cardGlossy: "<>setpagedevice" *MediaType Transparency: "<>setpagedevice" *de_DE.MediaType Transparency/Transparenz: "" *MediaType Labels: "<>setpagedevice" @@ -194,13 +175,21 @@ *MediaType StationeryPrepunched: "<>setpagedevice" *de_DE.MediaType StationeryPrepunched/Gelochtes Papier: "" *MediaType StationeryColored/stationery-colored: "<>setpagedevice" +*MediaType StationeryBond/stationery-bond: "<>setpagedevice" +*MediaType Recycled/recycled: "<>setpagedevice" +*MediaType Rough/rough: "<>setpagedevice" +*MediaType HeavyRough/heavyRough: "<>setpagedevice" +*MediaType PhotographicFilm: "<>setpagedevice" +*de_DE.MediaType PhotographicFilm/Fotofilm: "" *CloseUI: *MediaType *OpenUI *ColorModel: PickOne *OrderDependency: 10 AnySetup *ColorModel *de_DE.Translation ColorModel/Farbmodus: "" *ColorModel Gray: "<>setpagedevice" *de_DE.ColorModel Gray/Graustufen: "" -*DefaultColorModel: Gray +*ColorModel RGB: "<>setpagedevice" +*de_DE.ColorModel RGB/Farbe: "" +*DefaultColorModel: RGB *CloseUI: *ColorModel *OpenUI *Duplex: PickOne *OrderDependency: 10 AnySetup *Duplex @@ -214,20 +203,6 @@ *de_DE.Duplex DuplexTumble/Kurze Kante (Querformat): "" *CloseUI: *Duplex *cupsBackSide: Normal -*OpenUI *OutputBin: PickOne -*OrderDependency: 10 AnySetup *OutputBin -*DefaultOutputBin: Auto -*DefaultOutputOrder: Normal -*OutputBin Auto: "" -*de_DE.OutputBin Auto/Automatic: "" -*PageStackOrder Auto: Normal -*OutputBin Side: "" -*de_DE.OutputBin Side/Side Tray: "" -*PageStackOrder Side: Normal -*OutputBin Top: "" -*de_DE.OutputBin Top/Top Tray: "" -*PageStackOrder Top: Normal -*CloseUI: *OutputBin *DefaultResolution: 600dpi *OpenUI *cupsPrintQuality: PickOne *OrderDependency: 10 AnySetup *cupsPrintQuality diff --git a/cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O similarity index 63% rename from cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O rename to cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O index c33ab42..ed64732 100644 --- a/cups/ppd/HP_LaserJet_M806_17B98C_.ppd.O +++ b/cups/ppd/HP_Color_LaserJet_MFP_M277dw_9D0E59_.ppd.O @@ -8,138 +8,113 @@ *FileSystem: False *PCFileName: "ippeve.ppd" *Manufacturer: "HP" -*ModelName: "LaserJet M806" -*Product: "(LaserJet M806)" -*NickName: "LaserJet M806 - IPP Everywhere" -*ShortNickName: "LaserJet M806 - IPP Everywhere" -*ColorDevice: False +*ModelName: "Color LaserJet MFP M277dw" +*Product: "(Color LaserJet MFP M277dw)" +*NickName: "Color LaserJet MFP M277dw - IPP Everywhere" +*ShortNickName: "Color LaserJet MFP M277dw - IPP Everywhere" +*ColorDevice: True *cupsVersion: 2.2 *cupsSNMPSupplies: False *cupsLanguages: "en" -*cupsPassword: "11111111111111111111111111111111" *cupsFilter2: "image/jpeg image/jpeg 0 -" *cupsFilter2: "application/vnd.cups-pdf application/pdf 10 -" *cupsFilter2: "image/urf image/urf 100 -" *OpenUI *PageSize: PickOne *OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: Unknown +*DefaultPageSize: A4 *PageSize Letter: "<>setpagedevice" *PageSize Legal: "<>setpagedevice" *PageSize Executive: "<>setpagedevice" -*PageSize Statement: "<>setpagedevice" *PageSize FanFoldGermanLegal: "<>setpagedevice" -*PageSize Tabloid: "<>setpagedevice" -*PageSize ARCHB: "<>setpagedevice" +*PageSize Oficio: "<>setpagedevice" +*PageSize 4x6: "<>setpagedevice" *PageSize 5x8: "<>setpagedevice" -*PageSize A3: "<>setpagedevice" *PageSize A4: "<>setpagedevice" *PageSize A5: "<>setpagedevice" -*PageSize RA3: "<>setpagedevice" -*PageSize RA4: "<>setpagedevice" -*PageSize SRA4: "<>setpagedevice" -*PageSize B4: "<>setpagedevice" +*PageSize A6: "<>setpagedevice" *PageSize B5: "<>setpagedevice" -*PageSize Oficio: "<>setpagedevice" -*PageSize 270x390mm: "<>setpagedevice" +*PageSize B6: "<>setpagedevice" +*PageSize 100x150mm: "<>setpagedevice" *PageSize 195x270mm: "<>setpagedevice" -*PageSize 260x368mm: "<>setpagedevice" *PageSize 184x260mm: "<>setpagedevice" -*PageSize roc8k: "<>setpagedevice" *PageSize roc16k: "<>setpagedevice" +*PageSize Postcard: "<>setpagedevice" *PageSize DoublePostcardRotated: "<>setpagedevice" -*PageSize Env9: "<>setpagedevice" *PageSize Env10: "<>setpagedevice" +*PageSize EnvMonarch: "<>setpagedevice" *PageSize ISOB5: "<>setpagedevice" *PageSize EnvC5: "<>setpagedevice" *PageSize EnvDL: "<>setpagedevice" *CloseUI: *PageSize *OpenUI *PageRegion: PickOne *OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Unknown +*DefaultPageRegion: A4 *PageRegion Letter: "<>setpagedevice" *PageRegion Legal: "<>setpagedevice" *PageRegion Executive: "<>setpagedevice" -*PageRegion Statement: "<>setpagedevice" *PageRegion FanFoldGermanLegal: "<>setpagedevice" -*PageRegion Tabloid: "<>setpagedevice" -*PageRegion ARCHB: "<>setpagedevice" +*PageRegion Oficio: "<>setpagedevice" +*PageRegion 4x6: "<>setpagedevice" *PageRegion 5x8: "<>setpagedevice" -*PageRegion A3: "<>setpagedevice" *PageRegion A4: "<>setpagedevice" *PageRegion A5: "<>setpagedevice" -*PageRegion RA3: "<>setpagedevice" -*PageRegion RA4: "<>setpagedevice" -*PageRegion SRA4: "<>setpagedevice" -*PageRegion B4: "<>setpagedevice" +*PageRegion A6: "<>setpagedevice" *PageRegion B5: "<>setpagedevice" -*PageRegion Oficio: "<>setpagedevice" -*PageRegion 270x390mm: "<>setpagedevice" +*PageRegion B6: "<>setpagedevice" +*PageRegion 100x150mm: "<>setpagedevice" *PageRegion 195x270mm: "<>setpagedevice" -*PageRegion 260x368mm: "<>setpagedevice" *PageRegion 184x260mm: "<>setpagedevice" -*PageRegion roc8k: "<>setpagedevice" *PageRegion roc16k: "<>setpagedevice" +*PageRegion Postcard: "<>setpagedevice" *PageRegion DoublePostcardRotated: "<>setpagedevice" -*PageRegion Env9: "<>setpagedevice" *PageRegion Env10: "<>setpagedevice" +*PageRegion EnvMonarch: "<>setpagedevice" *PageRegion ISOB5: "<>setpagedevice" *PageRegion EnvC5: "<>setpagedevice" *PageRegion EnvDL: "<>setpagedevice" *CloseUI: *PageRegion -*DefaultImageableArea: Unknown -*DefaultPaperDimension: Unknown +*DefaultImageableArea: A4 +*DefaultPaperDimension: A4 *ImageableArea Letter: "11.990551181102 11.990551181102 600.009448818898 780.009448818898" *PaperDimension Letter: "612 792" *ImageableArea Legal: "11.990551181102 11.990551181102 600.009448818898 996.009448818898" *PaperDimension Legal: "612 1008" *ImageableArea Executive: "11.990551181102 11.990551181102 510.009448818898 744.009448818898" *PaperDimension Executive: "522 756" -*ImageableArea Statement: "11.990551181102 11.990551181102 384.009448818898 600.009448818898" -*PaperDimension Statement: "396 612" *ImageableArea FanFoldGermanLegal: "11.990551181102 11.990551181102 600.009448818898 924.009448818898" *PaperDimension FanFoldGermanLegal: "612 936" -*ImageableArea Tabloid: "11.990551181102 11.990551181102 780.009448818898 1212.009448818898" -*PaperDimension Tabloid: "792 1224" -*ImageableArea ARCHB: "11.990551181102 11.990551181102 852.009448818898 1284.009448818898" -*PaperDimension ARCHB: "864 1296" +*ImageableArea Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" +*PaperDimension Oficio: "612 964.8" +*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 A3: "11.990551181102 11.990551181102 829.899212598425 1178.56062992126" -*PaperDimension A3: "841.889763779528 1190.551181102362" *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 RA3: "11.990551181102 11.990551181102 852.576377952756 1206.907086614173" -*PaperDimension RA3: "864.566929133858 1218.897637795276" -*ImageableArea RA4: "11.990551181102 11.990551181102 597.458267716535 852.576377952756" -*PaperDimension RA4: "609.448818897638 864.566929133858" -*ImageableArea SRA4: "11.990551181102 11.990551181102 625.804724409449 895.096062992126" -*PaperDimension SRA4: "637.795275590551 907.086614173228" -*ImageableArea B4: "11.990551181102 11.990551181102 716.513385826772 1019.820472440945" -*PaperDimension B4: "728.503937007874 1031.811023622047" +*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 Oficio: "11.990551181102 11.990551181102 600.009448818898 952.809448818898" -*PaperDimension Oficio: "612 964.8" -*ImageableArea 270x390mm: "11.990551181102 11.990551181102 753.363779527559 1093.52125984252" -*PaperDimension 270x390mm: "765.354330708661 1105.511811023622" +*ImageableArea B6: "11.990551181102 11.990551181102 350.844094488189 503.914960629921" +*PaperDimension B6: "362.834645669291 515.905511811024" +*ImageableArea 100x150mm: "11.990551181102 11.990551181102 271.474015748031 413.206299212598" +*PaperDimension 100x150mm: "283.464566929134 425.196850393701" *ImageableArea 195x270mm: "11.990551181102 11.990551181102 540.765354330709 753.363779527559" *PaperDimension 195x270mm: "552.755905511811 765.354330708661" -*ImageableArea 260x368mm: "11.990551181102 11.990551181102 725.017322834646 1031.15905511811" -*PaperDimension 260x368mm: "737.007874015748 1043.149606299213" *ImageableArea 184x260mm: "11.990551181102 11.990551181102 509.584251968504 725.017322834646" *PaperDimension 184x260mm: "521.574803149606 737.007874015748" -*ImageableArea roc8k: "11.990551181102 11.990551181102 762.009448818898 1104.009448818898" -*PaperDimension roc8k: "774 1116" *ImageableArea roc16k: "11.990551181102 11.990551181102 546.009448818898 762.009448818898" *PaperDimension roc16k: "558 774" +*ImageableArea Postcard: "11.990551181102 11.990551181102 271.474015748031 407.537007874016" +*PaperDimension Postcard: "283.464566929134 419.527559055118" *ImageableArea DoublePostcardRotated: "11.990551181102 11.990551181102 407.537007874016 554.938582677165" *PaperDimension DoublePostcardRotated: "419.527559055118 566.929133858268" -*ImageableArea Env9: "11.990551181102 11.990551181102 266.995275590551 626.995275590551" -*PaperDimension Env9: "278.985826771654 638.985826771654" *ImageableArea Env10: "11.990551181102 11.990551181102 284.995275590551 672.009448818898" *PaperDimension Env10: "296.985826771654 684" +*ImageableArea EnvMonarch: "11.990551181102 11.990551181102 266.995275590551 528.009448818898" +*PaperDimension EnvMonarch: "278.985826771654 540" *ImageableArea ISOB5: "11.990551181102 11.990551181102 486.907086614173 696.670866141732" *PaperDimension ISOB5: "498.897637795276 708.661417322835" *ImageableArea EnvC5: "11.990551181102 11.990551181102 447.222047244094 637.143307086614" @@ -151,34 +126,40 @@ *DefaultInputSlot: Auto *InputSlot Auto: "<>setpagedevice" *de_DE.InputSlot Auto/Automatic: "" -*InputSlot Tray5: "<>setpagedevice" -*de_DE.InputSlot Tray5/Fach 5: "" -*InputSlot Tray4: "<>setpagedevice" -*de_DE.InputSlot Tray4/Fach 4: "" -*InputSlot Tray3: "<>setpagedevice" -*de_DE.InputSlot Tray3/Fach 3: "" -*InputSlot Tray2: "<>setpagedevice" -*de_DE.InputSlot Tray2/Fach 2: "" +*InputSlot Manual: "<>setpagedevice" +*de_DE.InputSlot Manual/Manual: "" *InputSlot Tray1: "<>setpagedevice" *de_DE.InputSlot Tray1/Fach 1: "" +*InputSlot Tray2: "<>setpagedevice" +*de_DE.InputSlot Tray2/Fach 2: "" *CloseUI: *InputSlot *OpenUI *MediaType: PickOne *OrderDependency: 10 AnySetup *MediaType -*DefaultMediaType: Stationery +*DefaultMediaType: HPMatte90gsm *MediaType Stationery: "<>setpagedevice" *de_DE.MediaType Stationery/Standardpapier: "" -*MediaType Com.hp.EcoSMARTLite/com.hp.EcoSMARTLite: "<>setpagedevice" +*MediaType HPMatte90gsm/HPMatte90gsm: "<>setpagedevice" +*MediaType HPMatte105gsm/HPMatte105gsm: "<>setpagedevice" +*MediaType HPMatte120gsm/HPMatte120gsm: "<>setpagedevice" +*MediaType HPMatte160gsm/HPMatte160gsm: "<>setpagedevice" +*MediaType HPCover/HPCover: "<>setpagedevice" +*MediaType HPGlossy130gsm/HPGlossy130gsm: "<>setpagedevice" +*MediaType PhotographicGlossy: "<>setpagedevice" +*de_DE.MediaType PhotographicGlossy/Fotoglanzpapier: "" +*MediaType HPTrifoldGlossy160gsm/HPTrifoldGlossy160gsm: "<>setpagedevice" +*MediaType HPGlossyPhoto/HPGlossyPhoto: "<>setpagedevice" *MediaType StationeryLightweight: "<>setpagedevice" *de_DE.MediaType StationeryLightweight/Lightweight Paper: "" -*MediaType StationeryBond/stationery-bond: "<>setpagedevice" -*MediaType Com.hp.recycled/com.hp.recycled: "<>setpagedevice" -*MediaType Com.hp.midweight/com.hp.midweight: "<>setpagedevice" +*MediaType ExtraLight/extraLight: "<>setpagedevice" +*MediaType Intermediate/intermediate: "<>setpagedevice" +*MediaType Midweight/midweight: "<>setpagedevice" *MediaType StationeryHeavyweight: "<>setpagedevice" *de_DE.MediaType StationeryHeavyweight/Schweres Papier: "" -*MediaType Com.hp.extraHeavy: "<>setpagedevice" -*de_DE.MediaType Com.hp.extraHeavy/Extra Heavyweight Paper: "" -*MediaType Cardstock: "<>setpagedevice" -*de_DE.MediaType Cardstock/Cardstock: "" +*MediaType ExtraHeavy/extraHeavy: "<>setpagedevice" +*MediaType PhotographicHighGloss: "<>setpagedevice" +*de_DE.MediaType PhotographicHighGloss/Hochglanzfotopapier: "" +*MediaType ExtraHeavyGloss/extraHeavyGloss: "<>setpagedevice" +*MediaType CardGlossy/cardGlossy: "<>setpagedevice" *MediaType Transparency: "<>setpagedevice" *de_DE.MediaType Transparency/Transparenz: "" *MediaType Labels: "<>setpagedevice" @@ -194,13 +175,21 @@ *MediaType StationeryPrepunched: "<>setpagedevice" *de_DE.MediaType StationeryPrepunched/Gelochtes Papier: "" *MediaType StationeryColored/stationery-colored: "<>setpagedevice" +*MediaType StationeryBond/stationery-bond: "<>setpagedevice" +*MediaType Recycled/recycled: "<>setpagedevice" +*MediaType Rough/rough: "<>setpagedevice" +*MediaType HeavyRough/heavyRough: "<>setpagedevice" +*MediaType PhotographicFilm: "<>setpagedevice" +*de_DE.MediaType PhotographicFilm/Fotofilm: "" *CloseUI: *MediaType *OpenUI *ColorModel: PickOne *OrderDependency: 10 AnySetup *ColorModel *de_DE.Translation ColorModel/Farbmodus: "" *ColorModel Gray: "<>setpagedevice" *de_DE.ColorModel Gray/Graustufen: "" -*DefaultColorModel: Gray +*ColorModel RGB: "<>setpagedevice" +*de_DE.ColorModel RGB/Farbe: "" +*DefaultColorModel: RGB *CloseUI: *ColorModel *OpenUI *Duplex: PickOne *OrderDependency: 10 AnySetup *Duplex @@ -214,20 +203,6 @@ *de_DE.Duplex DuplexTumble/Kurze Kante (Querformat): "" *CloseUI: *Duplex *cupsBackSide: Normal -*OpenUI *OutputBin: PickOne -*OrderDependency: 10 AnySetup *OutputBin -*DefaultOutputBin: Auto -*DefaultOutputOrder: Normal -*OutputBin Auto: "" -*de_DE.OutputBin Auto/Automatic: "" -*PageStackOrder Auto: Normal -*OutputBin Side: "" -*de_DE.OutputBin Side/Side Tray: "" -*PageStackOrder Side: Normal -*OutputBin Top: "" -*de_DE.OutputBin Top/Top Tray: "" -*PageStackOrder Top: Normal -*CloseUI: *OutputBin *DefaultResolution: 600dpi *OpenUI *cupsPrintQuality: PickOne *OrderDependency: 10 AnySetup *cupsPrintQuality diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 7a08fef..b814d51 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -7,7 +7,7 @@ Info HP LaserJet M806 MakeModel HP LaserJet M806 Postscript (recommended) DeviceURI socket://172.17.6.105:9100 State Idle -StateTime 1570468446 +StateTime 1570536627 ConfigTime 1526624974 Type 8433876 Accepting Yes @@ -91,26 +91,6 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job - -UUID urn:uuid:9ef53ca8-12e1-3e80-4ef7-68f46b112ceb -Info HP LaserJet M806 [17B98C] -Location -MakeModel LaserJet M806 - IPP Everywhere -DeviceURI ipps://k2-hp2.local:443/ipp/print -State Idle -StateTime 1570515128 -ConfigTime 1570515134 -Type 12372 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job -Option cups-browsed true - UUID urn:uuid:26ed6b4a-09ef-38ff-72ee-93e3df6219a5 Info ISUDRUCK0309_apmgoppold diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-77.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-77.mount" deleted file mode 120000 index bb0e849..0000000 --- "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-77.mount" +++ /dev/null @@ -1 +0,0 @@ -/etc/systemd/system/snap-canonical\x2dlivepatch-77.mount \ No newline at end of file diff --git "a/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-84.mount" "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-84.mount" new file mode 120000 index 0000000..456d1d0 --- /dev/null +++ "b/systemd/system/multi-user.target.wants/snap-canonical\\x2dlivepatch-84.mount" @@ -0,0 +1 @@ +/etc/systemd/system/snap-canonical\x2dlivepatch-84.mount \ No newline at end of file diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-77.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-77.mount" deleted file mode 100644 index b021b86..0000000 --- "a/systemd/system/snap-canonical\\x2dlivepatch-77.mount" +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Mount unit for canonical-livepatch, revision 77 -Before=snapd.service - -[Mount] -What=/var/lib/snapd/snaps/canonical-livepatch_77.snap -Where=/snap/canonical-livepatch/77 -Type=squashfs -Options=nodev,ro,x-gdu.hide - -[Install] -WantedBy=multi-user.target diff --git "a/systemd/system/snap-canonical\\x2dlivepatch-84.mount" "b/systemd/system/snap-canonical\\x2dlivepatch-84.mount" new file mode 100644 index 0000000..18411e9 --- /dev/null +++ "b/systemd/system/snap-canonical\\x2dlivepatch-84.mount" @@ -0,0 +1,12 @@ +[Unit] +Description=Mount unit for canonical-livepatch, revision 84 +Before=snapd.service + +[Mount] +What=/var/lib/snapd/snaps/canonical-livepatch_84.snap +Where=/snap/canonical-livepatch/84 +Type=squashfs +Options=nodev,ro,x-gdu.hide + +[Install] +WantedBy=multi-user.target diff --git a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service index 6e5e84d..c5077cf 100644 --- a/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service +++ b/systemd/system/snap.canonical-livepatch.canonical-livepatchd.service @@ -1,16 +1,16 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application canonical-livepatch.canonical-livepatchd -Requires=snap-canonical\x2dlivepatch-81.mount +Requires=snap-canonical\x2dlivepatch-84.mount Wants=network.target -After=snap-canonical\x2dlivepatch-81.mount network.target +After=snap-canonical\x2dlivepatch-84.mount network.target X-Snappy=yes [Service] ExecStart=/usr/bin/snap run canonical-livepatch.canonical-livepatchd SyslogIdentifier=canonical-livepatch.canonical-livepatchd Restart=on-failure -WorkingDirectory=/var/snap/canonical-livepatch/81 +WorkingDirectory=/var/snap/canonical-livepatch/84 TimeoutStopSec=30 Type=simple -- 2.43.0