saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 388766f3a700a49441af8e06f9051f7977612322..d3058df1d9fd3a0ece2811299c6c6b7cf06967c4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -790,6 +790,7 @@ maybe chmod 0644 'apt/sources.list.d/nodesource.list.save'
 maybe chmod 0644 'apt/sources.list.d/openscad-ubuntu-releases-bionic.list'
 maybe chmod 0644 'apt/sources.list.d/openscad-ubuntu-releases-bionic.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/openscad-ubuntu-releases-bionic.list.save'
+maybe chmod 0644 'apt/sources.list.d/openshot_developers-ubuntu-ppa-focal.list'
 maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/privacyidea-ubuntu-privacyidea-dev-xenial.list.save'
@@ -797,6 +798,7 @@ maybe chmod 0644 'apt/sources.list.d/signal-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/signal-xenial.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/signal-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/skype-stable.list'
+maybe chmod 0644 'apt/sources.list.d/skype-stable.list.save'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list.save'
@@ -831,6 +833,7 @@ maybe chmod 0644 'apt/trusted.gpg.d/linphone_ubuntu_release.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/microsoft.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/mozillateam_ubuntu_firefox-next.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/openscad_ubuntu_releases.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/teejee2008_ubuntu_ppa.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
@@ -1480,10 +1483,6 @@ 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/ppd/ar-hp-HP-LaserJet-M806.ppd.O'
 maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd.O'
-maybe chgrp 'lp' 'cups/ppd/hp8.ppd'
-maybe chmod 0640 'cups/ppd/hp8.ppd'
-maybe chgrp 'lp' 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd'
-maybe chmod 0640 'cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd'
 maybe chgrp 'lp' 'cups/printers.conf.O'
 maybe chmod 0600 'cups/printers.conf.O'
 maybe chmod 0644 'cups/raw.convs'

diff --git a/apt/sources.list.d/devolo-updates.list.save b/apt/sources.list.d/devolo-updates.list.save
index 7fa2570a13420a25d179039e5f075a934f22297f..781ccb2221325f2b892fa0e9bb426cf34fe23663 100644 (file)
--- a/apt/sources.list.d/devolo-updates.list.save
+++ b/apt/sources.list.d/devolo-updates.list.save
@@ -4,4 +4,4 @@
 # because that's what the Ubuntu Upgrade Managaer does when disabling all 
 # third-party repositories and that would cause this entry to be re-enabled.
 # See /etc/cron.daily/devolo-updates for more details.
-# deb http://update.devolo.com/linux/apt/ stable main # Bei Aktualisierung zu eoan deaktiviert
+deb http://update.devolo.com/linux/apt/ stable main

diff --git a/apt/sources.list.d/openshot_developers-ubuntu-ppa-focal.list b/apt/sources.list.d/openshot_developers-ubuntu-ppa-focal.list
new file mode 100644 (file)
index 0000000..8f5b5d1
--- /dev/null
+++ b/apt/sources.list.d/openshot_developers-ubuntu-ppa-focal.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/openshot.developers/ppa/ubuntu focal main
+# deb-src http://ppa.launchpad.net/openshot.developers/ppa/ubuntu focal main

diff --git a/apt/sources.list.d/signal-xenial.list.save b/apt/sources.list.d/signal-xenial.list.save
index 217a5907e0c229fc1e80f3e49bdc87c0986717ae..c3f1801fec008cce9c3b34012b0958a75a740c58 100644 (file)
--- a/apt/sources.list.d/signal-xenial.list.save
+++ b/apt/sources.list.d/signal-xenial.list.save
@@ -1 +1,2 @@
 # deb [arch=amd64] https://updates.signal.org/desktop/apt bionic main # Bei Aktualisierung zu bionic deaktiviert
+# deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main # Bei Aktualisierung zu focal deaktiviert

diff --git a/apt/sources.list.d/skype-stable.list.save b/apt/sources.list.d/skype-stable.list.save
new file mode 100644 (file)
index 0000000..119d8f8
--- /dev/null
+++ b/apt/sources.list.d/skype-stable.list.save
@@ -0,0 +1 @@
+deb [arch=amd64] https://repo.skype.com/deb stable main

diff --git a/apt/sources.list.d/xenial-partner.list.save b/apt/sources.list.d/xenial-partner.list.save
index a0aa25b0785ca44e40ba0b458695754f3fec143d..d0c3b6c279f51e4a9ced8466fadfcc800cf7da23 100644 (file)
--- a/apt/sources.list.d/xenial-partner.list.save
+++ b/apt/sources.list.d/xenial-partner.list.save
@@ -1,4 +1,4 @@
 # channel for the xenial (16.04) partner channel
 # 
 #:description:This channel contains the partner software for xenial
-deb http://archive.canonical.com/ubuntu eoan partner
+deb http://archive.canonical.com/ubuntu focal partner

diff --git a/apt/sources.list.save b/apt/sources.list.save
index 643406f4292c1f3d6be2b1cf4fa2e538ea804425..baaa8ed727439888ed88412e821b71bf502022e3 100644 (file)
--- a/apt/sources.list.save
+++ b/apt/sources.list.save
@@ -1,18 +1,18 @@
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb http://de.archive.ubuntu.com/ubuntu/ eoan main restricted
+deb http://de.archive.ubuntu.com/ubuntu/ focal main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates main restricted
+deb http://de.archive.ubuntu.com/ubuntu/ focal-updates main restricted
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.
-deb http://de.archive.ubuntu.com/ubuntu/ eoan universe
-deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates universe
+deb http://de.archive.ubuntu.com/ubuntu/ focal universe
+deb http://de.archive.ubuntu.com/ubuntu/ focal-updates universe
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
@@ -20,8 +20,8 @@ deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates universe
 ## your rights to use the software. Also, please note that software in 
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-deb http://de.archive.ubuntu.com/ubuntu/ eoan multiverse
-deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ focal multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ focal-updates multiverse
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
 
 ## N.B. software from this repository may not have been tested as
@@ -29,7 +29,7 @@ deb http://de.archive.ubuntu.com/ubuntu/ eoan-updates multiverse
 ## newer versions of some applications which may provide useful features.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-deb http://de.archive.ubuntu.com/ubuntu/ eoan-backports main restricted universe multiverse
+deb http://de.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
 # deb-src http://de.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
@@ -39,11 +39,11 @@ deb http://de.archive.ubuntu.com/ubuntu/ eoan-backports main restricted universe
 # deb http://archive.canonical.com/ubuntu xenial partner
 # deb-src http://archive.canonical.com/ubuntu xenial partner
 
-deb http://security.ubuntu.com/ubuntu eoan-security main restricted
+deb http://security.ubuntu.com/ubuntu focal-security main restricted
 # deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted
-deb http://security.ubuntu.com/ubuntu eoan-security universe
+deb http://security.ubuntu.com/ubuntu focal-security universe
 # deb-src http://security.ubuntu.com/ubuntu xenial-security universe
-deb http://security.ubuntu.com/ubuntu eoan-security multiverse
+deb http://security.ubuntu.com/ubuntu focal-security multiverse
 # deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
 # deb http://archive.canonical.com/ precise partner
 # deb-src http://archive.canonical.com/ precise partner

diff --git a/apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg b/apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg
new file mode 100644 (file)
index 0000000..45ed26b
Binary files /dev/null and b/apt/trusted.gpg.d/openshot_developers_ubuntu_ppa.gpg differ

diff --git a/cups/ppd/hp8.ppd b/cups/ppd/hp8.ppd
deleted file mode 100644 (file)
index bfe3ed1..0000000
--- a/cups/ppd/hp8.ppd
+++ /dev/null
@@ -1,100 +0,0 @@
-*PPD-Adobe: "4.3"
-*FormatVersion: "4.3"
-*FileVersion: "1.27.4"
-*LanguageVersion: English
-*LanguageEncoding: ISOLatin1
-*PSVersion: "(3010.000) 0"
-*LanguageLevel: "3"
-*FileSystem: False
-*PCFileName: "drvless.ppd"
-*Manufacturer: "hp"
-*ModelName: "hp LaserJet 9040"
-*Product: "(hp LaserJet 9040)"
-*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4"
-*ShortNickName: "hp LaserJet 9040"
-*DefaultOutputOrder: Normal
-*ColorDevice: True
-*cupsVersion: 2.3
-*cupsSNMPSupplies: False
-*cupsLanguages: "en"
-*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -"
-*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx"
-*% Printer did not supply page size info via IPP, using defaults
-*OpenUI *PageSize/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageSize
-*DefaultPageSize: Letter
-*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*OpenUI *PageRegion/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*DefaultImageableArea: Letter
-*ImageableArea Letter/US Letter: "18 12 594 780"
-*ImageableArea Legal/US Legal: "18 12 594 996"
-*ImageableArea Executive/Executive: "18 12 504 744"
-*ImageableArea Tabloid/Tabloid: "18 12 774 1212"
-*ImageableArea A3/A3: "18 12 824 1179"
-*ImageableArea A4/A4: "18 12 577 830"
-*ImageableArea A5/A5: "18 12 402 583"
-*ImageableArea B5/JIS B5: "18 12 498 717"
-*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697"
-*ImageableArea Env10/Envelope #10 : "18 12 279 672"
-*ImageableArea EnvC5/Envelope C5: "18 12 441 637"
-*ImageableArea EnvDL/Envelope DL: "18 12 294 612"
-*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528"
-*DefaultPaperDimension: Letter
-*PaperDimension Letter/US Letter: "612 792"
-*PaperDimension Legal/US Legal: "612 1008"
-*PaperDimension Executive/Executive: "522 756"
-*PaperDimension Tabloid/Tabloid: "792 1224"
-*PaperDimension A3/A3: "842 1191"
-*PaperDimension A4/A4: "595 842"
-*PaperDimension A5/A5: "420 595"
-*PaperDimension B5/JIS B5: "516 729"
-*PaperDimension EnvISOB5/Envelope B5: "499 709"
-*PaperDimension Env10/Envelope #10 : "297 684"
-*PaperDimension EnvC5/Envelope C5: "459 649"
-*PaperDimension EnvDL/Envelope DL: "312 624"
-*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
-*OpenUI *ColorModel/Print Color Mode: PickOne
-*OrderDependency: 10 AnySetup *ColorModel
-*DefaultColorModel: Gray
-*ColorModel FastGray/Fast Grayscale: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
-*CloseUI: *ColorModel
-*OpenUI *Duplex/2-Sided Printing: PickOne
-*OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
-*CloseUI: *Duplex
-*DefaultResolution: 300dpi
-*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"

diff --git a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd b/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd
deleted file mode 100644 (file)
index bfe3ed1..0000000
--- a/cups/ppd/hp_LaserJet_9040_8BFB3E_.ppd
+++ /dev/null
@@ -1,100 +0,0 @@
-*PPD-Adobe: "4.3"
-*FormatVersion: "4.3"
-*FileVersion: "1.27.4"
-*LanguageVersion: English
-*LanguageEncoding: ISOLatin1
-*PSVersion: "(3010.000) 0"
-*LanguageLevel: "3"
-*FileSystem: False
-*PCFileName: "drvless.ppd"
-*Manufacturer: "hp"
-*ModelName: "hp LaserJet 9040"
-*Product: "(hp LaserJet 9040)"
-*NickName: "hp LaserJet 9040, driverless, cups-filters 1.27.4"
-*ShortNickName: "hp LaserJet 9040"
-*DefaultOutputOrder: Normal
-*ColorDevice: True
-*cupsVersion: 2.3
-*cupsSNMPSupplies: False
-*cupsLanguages: "en"
-*cupsFilter2: "application/vnd.cups-postscript application/postscript 500 -"
-*cupsFilter2: "application/vnd.cups-raster application/vnd.hp-pcl 700 rastertopclx"
-*% Printer did not supply page size info via IPP, using defaults
-*OpenUI *PageSize/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageSize
-*DefaultPageSize: Letter
-*PageSize Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageSize Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageSize Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageSize Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageSize A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageSize A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageSize A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageSize B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageSize Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*OpenUI *PageRegion/Media Size: PickOne
-*OrderDependency: 10 AnySetup *PageRegion
-*DefaultPageRegion: Letter
-*PageRegion Letter/US Letter: "<</PageSize[612 792]>>setpagedevice"
-*PageRegion Legal/US Legal: "<</PageSize[612 1008]>>setpagedevice"
-*PageRegion Executive/Executive: "<</PageSize[522 756]>>setpagedevice"
-*PageRegion Tabloid/Tabloid: "<</PageSize[792 1224]>>setpagedevice"
-*PageRegion A3/A3: "<</PageSize[842 1191]>>setpagedevice"
-*PageRegion A4/A4: "<</PageSize[595 842]>>setpagedevice"
-*PageRegion A5/A5: "<</PageSize[420 595]>>setpagedevice"
-*PageRegion B5/JIS B5: "<</PageSize[516 729]>>setpagedevice"
-*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]>>setpagedevice"
-*PageRegion Env10/Envelope #10 : "<</PageSize[297 684]>>setpagedevice"
-*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]>>setpagedevice"
-*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]>>setpagedevice"
-*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]>>setpagedevice"
-*CloseUI: *PageSize
-*DefaultImageableArea: Letter
-*ImageableArea Letter/US Letter: "18 12 594 780"
-*ImageableArea Legal/US Legal: "18 12 594 996"
-*ImageableArea Executive/Executive: "18 12 504 744"
-*ImageableArea Tabloid/Tabloid: "18 12 774 1212"
-*ImageableArea A3/A3: "18 12 824 1179"
-*ImageableArea A4/A4: "18 12 577 830"
-*ImageableArea A5/A5: "18 12 402 583"
-*ImageableArea B5/JIS B5: "18 12 498 717"
-*ImageableArea EnvISOB5/Envelope B5: "18 12 481 697"
-*ImageableArea Env10/Envelope #10 : "18 12 279 672"
-*ImageableArea EnvC5/Envelope C5: "18 12 441 637"
-*ImageableArea EnvDL/Envelope DL: "18 12 294 612"
-*ImageableArea EnvMonarch/Envelope Monarch: "18 12 261 528"
-*DefaultPaperDimension: Letter
-*PaperDimension Letter/US Letter: "612 792"
-*PaperDimension Legal/US Legal: "612 1008"
-*PaperDimension Executive/Executive: "522 756"
-*PaperDimension Tabloid/Tabloid: "792 1224"
-*PaperDimension A3/A3: "842 1191"
-*PaperDimension A4/A4: "595 842"
-*PaperDimension A5/A5: "420 595"
-*PaperDimension B5/JIS B5: "516 729"
-*PaperDimension EnvISOB5/Envelope B5: "499 709"
-*PaperDimension Env10/Envelope #10 : "297 684"
-*PaperDimension EnvC5/Envelope C5: "459 649"
-*PaperDimension EnvDL/Envelope DL: "312 624"
-*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
-*OpenUI *ColorModel/Print Color Mode: PickOne
-*OrderDependency: 10 AnySetup *ColorModel
-*DefaultColorModel: Gray
-*ColorModel FastGray/Fast Grayscale: "<</cupsColorSpace 3/cupsBitsPerColor 1/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel Gray/Grayscale: "<</cupsColorSpace 18/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceGray>>setpagedevice"
-*ColorModel RGB/Color: "<</cupsColorSpace 19/cupsBitsPerColor 8/cupsColorOrder 0/cupsCompression 0/ProcessColorModel /DeviceRGB>>setpagedevice"
-*CloseUI: *ColorModel
-*OpenUI *Duplex/2-Sided Printing: PickOne
-*OrderDependency: 10 AnySetup *Duplex
-*DefaultDuplex: None
-*Duplex None/Off: "<</Duplex false>>setpagedevice"
-*Duplex DuplexNoTumble/On (Portrait): "<</Duplex true/Tumble false>>setpagedevice"
-*Duplex DuplexTumble/On (Landscape): "<</Duplex true/Tumble true>>setpagedevice"
-*CloseUI: *Duplex
-*DefaultResolution: 300dpi
-*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -"

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 6ea199f0659a68e176ec1e0e3677d669b9bbd2e9..1c5deedeaa1caa81873bbd2ffbf88c0422df5bec 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,7 @@
 # Printer configuration file for CUPS v2.3.1
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-NextPrinterId 54
+NextPrinterId 55
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -97,6 +97,27 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer hp8>
+PrinterId 54
+UUID urn:uuid:be98a0b4-c715-3944-4338-5d6344713c7e
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp8/
+State Idle
+StateTime 1592808079
+ConfigTime 1592808079
+Type 8400988
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>
 <Printer HP_ENVY_4520_series_7B89BC_>
 PrinterId 6
 UUID urn:uuid:53fea9f7-eaf7-3997-43bb-7e9f0e78a2e9