]> git.hoellein.online Git - zenbook/commitdiff
projects / zenbook / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c18455)
daily autocommit
authorroot <root@localhost>
Thu, 6 Aug 2020 11:58:52 +0000 (13:58 +0200)
committerroot <root@localhost>
Thu, 6 Aug 2020 11:58:52 +0000 (13:58 +0200)
.etckeeper patch | blob | history
cups/ppd/hp8.ppd [deleted file] patch | blob | history
cups/ppd/hp_LaserJet_9040_179A69_.ppd [deleted file] patch | blob | history
cups/printers.conf.O patch | blob | history
systemd/system/multi-user.target.wants/snap-core18-1754.mount [deleted symlink] patch | blob | history
systemd/system/multi-user.target.wants/snap-core18-1885.mount [new symlink] patch | blob
systemd/system/snap-core18-1754.mount [deleted file] patch | blob | history
systemd/system/snap-core18-1885.mount [new file with mode: 0644] patch | blob
teamviewer/global.conf patch | blob | history

diff --git a/.etckeeper b/.etckeeper
index 99f6f4c1d7e86d8d2529d521aa930bc1f441b02d..cb68eac78a122c332d42dc8d26602bcec1c49c27 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1498,10 +1498,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_179A69_.ppd'
-maybe chmod 0640 'cups/ppd/hp_LaserJet_9040_179A69_.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'
@@ -3309,8 +3305,8 @@ maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-94.mount'
 maybe chmod 0644 'systemd/system/snap-canonical\x2dlivepatch-95.mount'
 maybe chmod 0644 'systemd/system/snap-core-9436.mount'
 maybe chmod 0644 'systemd/system/snap-core-9665.mount'
-maybe chmod 0644 'systemd/system/snap-core18-1754.mount'
 maybe chmod 0644 'systemd/system/snap-core18-1880.mount'
+maybe chmod 0644 'systemd/system/snap-core18-1885.mount'
 maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d28\x2d1804-128.mount'
 maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d34\x2d1804-33.mount'
 maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d34\x2d1804-36.mount'
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_179A69_.ppd b/cups/ppd/hp_LaserJet_9040_179A69_.ppd
deleted file mode 100644 (file)
index bfe3ed1..0000000
--- a/cups/ppd/hp_LaserJet_9040_179A69_.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 0353982b9e34fe29ac7bfe3f5edd6ad5f936e1ca..31f5811e1aa81c69441264b41a13144fcd9bb399 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 84
+NextPrinterId 91
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -97,6 +97,48 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer hp8>
+PrinterId 90
+UUID urn:uuid:393e0e2b-79c3-3f75-7c51-b2f6cfd2fd0a
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp8/
+State Idle
+StateTime 1596694345
+ConfigTime 1596694345
+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_LaserJet_9040_8BFB3E_>
+PrinterId 89
+UUID urn:uuid:c7e865e8-209a-3d6b-4ffa-c1852a1b5559
+Info 
+Location 
+MakeModel hp LaserJet 9040, driverless, cups-filters 1.27.4
+DeviceURI implicitclass://hp_LaserJet_9040_8BFB3E_/
+State Idle
+StateTime 1596694334
+ConfigTime 1596694334
+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_LaserJet_M806_17B98C_>
 PrinterId 7
 UUID urn:uuid:b97fc042-5272-3bbc-7495-afb7cf437065
diff --git a/systemd/system/multi-user.target.wants/snap-core18-1754.mount b/systemd/system/multi-user.target.wants/snap-core18-1754.mount
deleted file mode 120000 (symlink)
index 37b2966..0000000
--- a/systemd/system/multi-user.target.wants/snap-core18-1754.mount
+++ /dev/null
@@ -1 +0,0 @@
-/etc/systemd/system/snap-core18-1754.mount
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/snap-core18-1885.mount b/systemd/system/multi-user.target.wants/snap-core18-1885.mount
new file mode 120000 (symlink)
index 0000000..7b77e17
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-core18-1885.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-core18-1885.mount
\ No newline at end of file
diff --git a/systemd/system/snap-core18-1754.mount b/systemd/system/snap-core18-1754.mount
deleted file mode 100644 (file)
index be01b73..0000000
--- a/systemd/system/snap-core18-1754.mount
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Mount unit for core18, revision 1754
-Before=snapd.service
-
-[Mount]
-What=/var/lib/snapd/snaps/core18_1754.snap
-Where=/snap/core18/1754
-Type=squashfs
-Options=nodev,ro,x-gdu.hide
-LazyUnmount=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/system/snap-core18-1885.mount b/systemd/system/snap-core18-1885.mount
new file mode 100644 (file)
index 0000000..6c9eb87
--- /dev/null
+++ b/systemd/system/snap-core18-1885.mount
@@ -0,0 +1,13 @@
+[Unit]
+Description=Mount unit for core18, revision 1885
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/core18_1885.snap
+Where=/snap/core18/1885
+Type=squashfs
+Options=nodev,ro,x-gdu.hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/teamviewer/global.conf b/teamviewer/global.conf
index 40cb4de1048f1579cbcb6df2fa24ec1474452f7f..b21fdb2a81a1ce06a1396de76a61e017d9664899 100644 (file)
--- a/teamviewer/global.conf
+++ b/teamviewer/global.conf
@@ -7,7 +7,7 @@ TeamViewer Global Settings
 [int32] ClientIC = -1148625145
 [int32] ClientID = 716394204
 [bin  ] ConnectionHistory = 6f26b2dbabcf890f23fd7c04814846423e63ffd5e86918a6dce9fbace3c193bf
-[bin  ] EnterpriseUIState = f3eae369e2ab31455803ceba97867cdbea8437177f8ffd5b06182454eaee603b
+[bin  ] EnterpriseUIState = 250628cb06c84aaa5939ffbc907b753992460719810c8048279ef5e905f726ba
 [int32] EulaAccepted = 1
 [int32] Had_a_commercial_Connection = 1
 [int32] IPC_Port_Service = 5941
etckeeper - zenbook