From ea232bfa67fbdff30a3b7ef773a739334984b47a Mon Sep 17 00:00:00 2001 From: pi Date: Mon, 19 Sep 2022 09:31:21 +0200 Subject: [PATCH] committing changes in /etc made by "/usr/bin/apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold upgrade --with-new-pkgs" Packages with configuration changes: -base-files 11.1+deb11u4 amd64 +base-files 11.1+deb11u5 amd64 -grub-common 2.04-20 amd64 -grub2-common 2.04-20 amd64 +grub-common 2.06-3~deb11u1 amd64 +grub2-common 2.06-3~deb11u1 amd64 Package changes: -avahi-autoipd 0.8-5 amd64 -avahi-daemon 0.8-5 amd64 -base-files 11.1+deb11u4 amd64 +avahi-autoipd 0.8-5+deb11u1 amd64 +avahi-daemon 0.8-5+deb11u1 amd64 +base-files 11.1+deb11u5 amd64 -containerd.io 1.6.7-1 amd64 +containerd.io 1.6.8-1 amd64 -curl 7.74.0-1.3+deb11u2 amd64 +curl 7.74.0-1.3+deb11u3 amd64 -docker-ce 5:20.10.17~3-0~debian-bullseye amd64 -docker-ce-cli 5:20.10.17~3-0~debian-bullseye amd64 -docker-ce-rootless-extras 5:20.10.17~3-0~debian-bullseye amd64 -docker-compose-plugin 2.6.0~debian-bullseye amd64 +docker-ce 5:20.10.18~3-0~debian-bullseye amd64 +docker-ce-cli 5:20.10.18~3-0~debian-bullseye amd64 +docker-ce-rootless-extras 5:20.10.18~3-0~debian-bullseye amd64 +docker-compose-plugin 2.10.2~debian-bullseye amd64 -dpkg 1.20.11 amd64 -dpkg-dev 1.20.11 all +dpkg 1.20.12 amd64 +dpkg-dev 1.20.12 all -fonts-opensymbol 2:102.11+LibO7.0.4-4+deb11u1 all +fonts-opensymbol 2:102.11+LibO7.0.4-4+deb11u3 all -gir1.2-gdkpixbuf-2.0 2.42.2+dfsg-1 amd64 +gir1.2-gdkpixbuf-2.0 2.42.2+dfsg-1+deb11u1 amd64 -gir1.2-javascriptcoregtk-4.0 2.36.6-1~deb11u1 amd64 +gir1.2-javascriptcoregtk-4.0 2.36.7-1~deb11u1 amd64 -gir1.2-webkit2-4.0 2.36.6-1~deb11u1 amd64 +gir1.2-webkit2-4.0 2.36.7-1~deb11u1 amd64 -grub-common 2.04-20 amd64 -grub-efi-amd64 2.04-20 amd64 -grub-efi-amd64-bin 2.04-20 amd64 -grub-efi-amd64-signed 1+2.04+20 amd64 -grub2-common 2.04-20 amd64 +grub-common 2.06-3~deb11u1 amd64 +grub-efi-amd64 2.06-3~deb11u1 amd64 +grub-efi-amd64-bin 2.06-3~deb11u1 amd64 +grub-efi-amd64-signed 1+2.06+3~deb11u1 amd64 +grub2-common 2.06-3~deb11u1 amd64 -krb5-locales 1.18.3-6+deb11u1 all +krb5-locales 1.18.3-6+deb11u2 all -libavahi-client3 0.8-5 amd64 -libavahi-client3 0.8-5 i386 -libavahi-common-data 0.8-5 amd64 -libavahi-common-data 0.8-5 i386 -libavahi-common3 0.8-5 amd64 -libavahi-common3 0.8-5 i386 -libavahi-core7 0.8-5 amd64 -libavahi-glib1 0.8-5 amd64 +libavahi-client3 0.8-5+deb11u1 amd64 +libavahi-client3 0.8-5+deb11u1 i386 +libavahi-common-data 0.8-5+deb11u1 amd64 +libavahi-common-data 0.8-5+deb11u1 i386 +libavahi-common3 0.8-5+deb11u1 amd64 +libavahi-common3 0.8-5+deb11u1 i386 +libavahi-core7 0.8-5+deb11u1 amd64 +libavahi-glib1 0.8-5+deb11u1 amd64 -libayatana-appindicator1 0.5.5-2 amd64 -libayatana-appindicator3-1 0.5.5-2 amd64 +libayatana-appindicator1 0.5.5-2+deb11u2 amd64 +libayatana-appindicator3-1 0.5.5-2+deb11u2 amd64 -libc-bin 2.31-13+deb11u3 amd64 -libc-dev-bin 2.31-13+deb11u3 amd64 -libc-devtools 2.31-13+deb11u3 amd64 -libc-l10n 2.31-13+deb11u3 all -libc6 2.31-13+deb11u3 amd64 -libc6 2.31-13+deb11u3 i386 -libc6-dev 2.31-13+deb11u3 amd64 +libc-bin 2.31-13+deb11u4 amd64 +libc-dev-bin 2.31-13+deb11u4 amd64 +libc-devtools 2.31-13+deb11u4 amd64 +libc-l10n 2.31-13+deb11u4 all +libc6 2.31-13+deb11u4 amd64 +libc6 2.31-13+deb11u4 i386 +libc6-dev 2.31-13+deb11u4 amd64 -libcpupower1 5.10.136-1 amd64 +libcpupower1 5.10.140-1 amd64 -libcurl3-gnutls 7.74.0-1.3+deb11u2 amd64 -libcurl3-gnutls 7.74.0-1.3+deb11u2 i386 -libcurl4 7.74.0-1.3+deb11u2 amd64 -libcurl4 7.74.0-1.3+deb11u2 i386 +libcurl3-gnutls 7.74.0-1.3+deb11u3 amd64 +libcurl3-gnutls 7.74.0-1.3+deb11u3 i386 +libcurl4 7.74.0-1.3+deb11u3 amd64 +libcurl4 7.74.0-1.3+deb11u3 i386 -libdpkg-perl 1.20.11 all +libdpkg-perl 1.20.12 all -libgdk-pixbuf-2.0-0 2.42.2+dfsg-1 amd64 -libgdk-pixbuf-2.0-0 2.42.2+dfsg-1 i386 +libgdk-pixbuf-2.0-0 2.42.2+dfsg-1+deb11u1 amd64 +libgdk-pixbuf-2.0-0 2.42.2+dfsg-1+deb11u1 i386 -libgdk-pixbuf2.0-bin 2.42.2+dfsg-1 amd64 -libgdk-pixbuf2.0-common 2.42.2+dfsg-1 all +libgdk-pixbuf2.0-bin 2.42.2+dfsg-1+deb11u1 amd64 +libgdk-pixbuf2.0-common 2.42.2+dfsg-1+deb11u1 all -libgssapi-krb5-2 1.18.3-6+deb11u1 amd64 -libgssapi-krb5-2 1.18.3-6+deb11u1 i386 +libgssapi-krb5-2 1.18.3-6+deb11u2 amd64 +libgssapi-krb5-2 1.18.3-6+deb11u2 i386 -libhttp-daemon-perl 6.12-1 all +libhttp-daemon-perl 6.12-1+deb11u1 all -libjavascriptcoregtk-4.0-18 2.36.6-1~deb11u1 amd64 +libjavascriptcoregtk-4.0-18 2.36.7-1~deb11u1 amd64 -libjuh-java 1:7.0.4-4+deb11u1 all -libjurt-java 1:7.0.4-4+deb11u1 all -libk5crypto3 1.18.3-6+deb11u1 amd64 -libk5crypto3 1.18.3-6+deb11u1 i386 +libjuh-java 1:7.0.4-4+deb11u3 all +libjurt-java 1:7.0.4-4+deb11u3 all +libk5crypto3 1.18.3-6+deb11u2 amd64 +libk5crypto3 1.18.3-6+deb11u2 i386 -libkrb5-3 1.18.3-6+deb11u1 amd64 -libkrb5-3 1.18.3-6+deb11u1 i386 -libkrb5support0 1.18.3-6+deb11u1 amd64 -libkrb5support0 1.18.3-6+deb11u1 i386 +libkrb5-3 1.18.3-6+deb11u2 amd64 +libkrb5-3 1.18.3-6+deb11u2 i386 +libkrb5support0 1.18.3-6+deb11u2 amd64 +libkrb5support0 1.18.3-6+deb11u2 i386 -liblibreoffice-java 1:7.0.4-4+deb11u1 all +liblibreoffice-java 1:7.0.4-4+deb11u3 all +libnm0 1.30.6-1+deb11u1 i386 -libnss-systemd 247.3-7 amd64 +libnss-systemd 247.3-7+deb11u1 amd64 -libpam-systemd 247.3-7 amd64 +libpam-systemd 247.3-7+deb11u1 amd64 -libpcre2-16-0 10.36-2 amd64 -libpcre2-8-0 10.36-2 amd64 -libpcre2-8-0 10.36-2 i386 +libpcre2-16-0 10.36-2+deb11u1 amd64 +libpcre2-8-0 10.36-2+deb11u1 amd64 +libpcre2-8-0 10.36-2+deb11u1 i386 -libpoppler-cpp0v5 20.09.0-3.1 amd64 -libpoppler-glib8 20.09.0-3.1 amd64 -libpoppler-glib8 20.09.0-3.1 i386 -libpoppler102 20.09.0-3.1 amd64 -libpoppler102 20.09.0-3.1 i386 +libpoppler-cpp0v5 20.09.0-3.1+deb11u1 amd64 +libpoppler-glib8 20.09.0-3.1+deb11u1 amd64 +libpoppler-glib8 20.09.0-3.1+deb11u1 i386 +libpoppler102 20.09.0-3.1+deb11u1 amd64 +libpoppler102 20.09.0-3.1+deb11u1 i386 -libpq5 13.7-0+deb11u1 amd64 +libpq5 13.8-0+deb11u1 amd64 -libreoffice-base-core 1:7.0.4-4+deb11u1 amd64 -libreoffice-calc 1:7.0.4-4+deb11u1 amd64 -libreoffice-common 1:7.0.4-4+deb11u1 all -libreoffice-core 1:7.0.4-4+deb11u1 amd64 -libreoffice-draw 1:7.0.4-4+deb11u1 amd64 -libreoffice-gtk3 1:7.0.4-4+deb11u1 amd64 -libreoffice-help-common 1:7.0.4-4+deb11u1 all -libreoffice-help-de 1:7.0.4-4+deb11u1 all -libreoffice-help-en-us 1:7.0.4-4+deb11u1 all -libreoffice-impress 1:7.0.4-4+deb11u1 amd64 -libreoffice-l10n-de 1:7.0.4-4+deb11u1 all -libreoffice-math 1:7.0.4-4+deb11u1 amd64 -libreoffice-style-colibre 1:7.0.4-4+deb11u1 all -libreoffice-writer 1:7.0.4-4+deb11u1 amd64 +libreoffice-base-core 1:7.0.4-4+deb11u3 amd64 +libreoffice-calc 1:7.0.4-4+deb11u3 amd64 +libreoffice-common 1:7.0.4-4+deb11u3 all +libreoffice-core 1:7.0.4-4+deb11u3 amd64 +libreoffice-draw 1:7.0.4-4+deb11u3 amd64 +libreoffice-gtk3 1:7.0.4-4+deb11u3 amd64 +libreoffice-help-common 1:7.0.4-4+deb11u3 all +libreoffice-help-de 1:7.0.4-4+deb11u3 all +libreoffice-help-en-us 1:7.0.4-4+deb11u3 all +libreoffice-impress 1:7.0.4-4+deb11u3 amd64 +libreoffice-l10n-de 1:7.0.4-4+deb11u3 all +libreoffice-math 1:7.0.4-4+deb11u3 amd64 +libreoffice-style-colibre 1:7.0.4-4+deb11u3 all +libreoffice-writer 1:7.0.4-4+deb11u3 amd64 -libridl-java 1:7.0.4-4+deb11u1 all +libridl-java 1:7.0.4-4+deb11u3 all -libsystemd0 247.3-7 amd64 -libsystemd0 247.3-7 i386 +libsystemd0 247.3-7+deb11u1 amd64 +libsystemd0 247.3-7+deb11u1 i386 -libudev1 247.3-7 amd64 -libudev1 247.3-7 i386 +libudev1 247.3-7+deb11u1 amd64 +libudev1 247.3-7+deb11u1 i386 -libuno-cppu3 1:7.0.4-4+deb11u1 amd64 -libuno-cppuhelpergcc3-3 1:7.0.4-4+deb11u1 amd64 -libuno-purpenvhelpergcc3-3 1:7.0.4-4+deb11u1 amd64 -libuno-sal3 1:7.0.4-4+deb11u1 amd64 -libuno-salhelpergcc3-3 1:7.0.4-4+deb11u1 amd64 -libunoloader-java 1:7.0.4-4+deb11u1 all +libuno-cppu3 1:7.0.4-4+deb11u3 amd64 +libuno-cppuhelpergcc3-3 1:7.0.4-4+deb11u3 amd64 +libuno-purpenvhelpergcc3-3 1:7.0.4-4+deb11u3 amd64 +libuno-sal3 1:7.0.4-4+deb11u3 amd64 +libuno-salhelpergcc3-3 1:7.0.4-4+deb11u3 amd64 +libunoloader-java 1:7.0.4-4+deb11u3 all +libva-glx2 2.10.0-1 amd64 +libva-glx2 2.10.0-1 i386 -libwebkit2gtk-4.0-37 2.36.6-1~deb11u1 amd64 +libwebkit2gtk-4.0-37 2.36.7-1~deb11u1 amd64 -linux-image-amd64 5.10.136-1 amd64 -linux-libc-dev 5.10.136-1 amd64 -locales 2.31-13+deb11u3 all +linux-image-5.10.0-18-amd64 5.10.140-1 amd64 +linux-image-amd64 5.10.140-1 amd64 +linux-libc-dev 5.10.140-1 amd64 +locales 2.31-13+deb11u4 all -mokutil 0.3.0+1538710437.fb6250f-1+b1 amd64 +mokutil 0.6.0-2~deb11u1 amd64 -poppler-utils 20.09.0-3.1 amd64 +poppler-utils 20.09.0-3.1+deb11u1 amd64 -publicsuffix 20211207.1025-0+deb11u1 all +publicsuffix 20220811.1734-0+deb11u1 all -python3-uno 1:7.0.4-4+deb11u1 amd64 +python3-uno 1:7.0.4-4+deb11u3 amd64 -steam-launcher 1:1.0.0.74 all -steam-libs-amd64 1:1.0.0.74 amd64 -steam-libs-i386 1:1.0.0.74 i386 +steam-launcher 1:1.0.0.75 all +steam-libs-amd64 1:1.0.0.75 amd64 +steam-libs-i386 1:1.0.0.75 i386 -systemd 247.3-7 amd64 -systemd-sysv 247.3-7 amd64 +systemd 247.3-7+deb11u1 amd64 +systemd-sysv 247.3-7+deb11u1 amd64 -thunderbird 1:91.12.0-1~deb11u1 amd64 +thunderbird 1:91.13.0-1~deb11u1 amd64 -udev 247.3-7 amd64 +udev 247.3-7+deb11u1 amd64 -uno-libs-private 1:7.0.4-4+deb11u1 amd64 +uno-libs-private 1:7.0.4-4+deb11u3 amd64 -ure 1:7.0.4-4+deb11u1 amd64 +ure 1:7.0.4-4+deb11u3 amd64 -wine-staging 7.15~bullseye-1 amd64 -wine-staging-amd64 7.15~bullseye-1 amd64 -wine-staging-i386 7.15~bullseye-1 i386 +wine-staging 7.17~bullseye-1 amd64 +wine-staging-amd64 7.17~bullseye-1 amd64 +wine-staging-i386 7.17~bullseye-1 i386 -winehq-staging 7.15~bullseye-1 amd64 +winehq-staging 7.17~bullseye-1 amd64 --- .etckeeper | 2 + apt/apt.conf.d/01autoremove-kernels | 2 +- cups/ppd/EPSON_XP_8600_Series.ppd.O | 218 ++++++++++++++++++++++++++++ cups/printers.conf | 2 +- cups/printers.conf.O | 23 ++- debian_version | 2 +- grub.d/10_linux | 10 +- grub.d/20_linux_xen | 10 +- grub.d/30_os-prober | 15 +- grub.d/30_uefi-firmware | 18 +-- grub.d/41_custom | 2 +- kernel/postinst.d/zz-update-grub | 2 +- kernel/postrm.d/zz-update-grub | 2 +- libreoffice/registry/main.xcd | 16 ++ locale.gen | 4 +- 15 files changed, 305 insertions(+), 23 deletions(-) create mode 100644 cups/ppd/EPSON_XP_8600_Series.ppd.O diff --git a/.etckeeper b/.etckeeper index 7112b4d7..05a1cc9b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -694,6 +694,8 @@ maybe chgrp 'lp' 'cups/ppd' maybe chmod 0755 'cups/ppd' maybe chgrp 'lp' 'cups/ppd/EPSON_XP_8600_Series.ppd' maybe chmod 0640 'cups/ppd/EPSON_XP_8600_Series.ppd' +maybe chgrp 'lp' 'cups/ppd/EPSON_XP_8600_Series.ppd.O' +maybe chmod 0640 'cups/ppd/EPSON_XP_8600_Series.ppd.O' maybe chgrp 'lp' 'cups/printers.conf' maybe chmod 0600 'cups/printers.conf' maybe chgrp 'lp' 'cups/printers.conf.O' diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 9fbb4491..a9deebb7 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,2 +1,2 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal -APT::LastInstalledKernel "5.10.0-17-amd64"; +APT::LastInstalledKernel "5.10.0-18-amd64"; diff --git a/cups/ppd/EPSON_XP_8600_Series.ppd.O b/cups/ppd/EPSON_XP_8600_Series.ppd.O new file mode 100644 index 00000000..d5b00d78 --- /dev/null +++ b/cups/ppd/EPSON_XP_8600_Series.ppd.O @@ -0,0 +1,218 @@ +*PPD-Adobe: "4.3" +*FormatVersion: "4.3" +*FileVersion: "1.28.7" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PSVersion: "(3010.000) 0" +*LanguageLevel: "3" +*FileSystem: False +*PCFileName: "drvless.ppd" +*Manufacturer: "EPSON" +*ModelName: "EPSON XP-8600 Series" +*Product: "(EPSON XP-8600 Series)" +*NickName: "EPSON XP-8600 Series, driverless, cups-filters 1.28.7" +*ShortNickName: "EPSON XP-8600 Series" +*DefaultOutputOrder: Normal +*ColorDevice: True +*cupsVersion: 2.3 +*cupsSNMPSupplies: False +*cupsLanguages: "en" +*APSupplies: "http://EPSON70D247.local.:80/PRESENTATION/BONJOUR" +*cupsStringsURI: "http://EPSON70D247.local.:80/LANGUAGES/IPP?LANG=de" +*cupsFilter2: "image/urf image/urf 0 -" +*cupsFilter2: "image/jpeg image/jpeg 0 -" +*cupsManualCopies: True +*OpenUI *PageSize/Media Size: PickOne +*OrderDependency: 10 AnySetup *PageSize +*DefaultPageSize: A4 +*PageSize 101.6x180.6mm/16:9 breit (4 x 7,11 Zoll): "<>setpagedevice" +*PageSize 101.6x180.6mm.Borderless/16:9 breit (4 x 7,11 Zoll) (Borderless): "<>setpagedevice" +*PageSize 120x120mm/CD/DVD: "<>setpagedevice" +*PageSize 120x120mm.Borderless/CD/DVD (Borderless): "<>setpagedevice" +*PageSize 195x270mm/16K 195 x 270 mm: "<>setpagedevice" +*PageSize 3.5x5/3.5 x 5″: "<>setpagedevice" +*PageSize 3.5x5.Borderless/3.5 x 5″ (Borderless): "<>setpagedevice" +*PageSize 4x6/4 x 6″: "<>setpagedevice" +*PageSize 4x6.Borderless/4 x 6″ (Borderless): "<>setpagedevice" +*PageSize 5x7/5 x 7″: "<>setpagedevice" +*PageSize 5x7.Borderless/5 x 7″ (Borderless): "<>setpagedevice" +*PageSize 5x8/5 x 8″: "<>setpagedevice" +*PageSize 8x10/8 x 10″: "<>setpagedevice" +*PageSize 8x10.Borderless/8 x 10″ (Borderless): "<>setpagedevice" +*PageSize A4/A4: "<>setpagedevice" +*PageSize A4.Borderless/A4 (Borderless): "<>setpagedevice" +*PageSize A5/A5: "<>setpagedevice" +*PageSize A6/A6: "<>setpagedevice" +*PageSize B5/JIS B5: "<>setpagedevice" +*PageSize B6/JIS B6: "<>setpagedevice" +*PageSize Env10/Envelope #10: "<>setpagedevice" +*PageSize EnvC6/CEnvelope 6: "<>setpagedevice" +*PageSize EnvDL/Envelope DL: "<>setpagedevice" +*PageSize FanFoldGermanLegal/Foolscap: "<>setpagedevice" +*PageSize Legal/US Legal: "<>setpagedevice" +*PageSize Letter/US Letter: "<>setpagedevice" +*PageSize Letter.Borderless/US Letter (Borderless): "<>setpagedevice" +*PageSize Postcard/Hagaki: "<>setpagedevice" +*PageSize Postcard.Borderless/Hagaki (Borderless): "<>setpagedevice" +*CloseUI: *PageSize +*OpenUI *PageRegion/Media Size: PickOne +*OrderDependency: 10 AnySetup *PageRegion +*DefaultPageRegion: A4 +*PageRegion 101.6x180.6mm/16:9 breit (4 x 7,11 Zoll): "<>setpagedevice" +*PageRegion 101.6x180.6mm.Borderless/16:9 breit (4 x 7,11 Zoll) (Borderless): "<>setpagedevice" +*PageRegion 120x120mm/CD/DVD: "<>setpagedevice" +*PageRegion 120x120mm.Borderless/CD/DVD (Borderless): "<>setpagedevice" +*PageRegion 195x270mm/16K 195 x 270 mm: "<>setpagedevice" +*PageRegion 3.5x5/3.5 x 5″: "<>setpagedevice" +*PageRegion 3.5x5.Borderless/3.5 x 5″ (Borderless): "<>setpagedevice" +*PageRegion 4x6/4 x 6″: "<>setpagedevice" +*PageRegion 4x6.Borderless/4 x 6″ (Borderless): "<>setpagedevice" +*PageRegion 5x7/5 x 7″: "<>setpagedevice" +*PageRegion 5x7.Borderless/5 x 7″ (Borderless): "<>setpagedevice" +*PageRegion 5x8/5 x 8″: "<>setpagedevice" +*PageRegion 8x10/8 x 10″: "<>setpagedevice" +*PageRegion 8x10.Borderless/8 x 10″ (Borderless): "<>setpagedevice" +*PageRegion A4/A4: "<>setpagedevice" +*PageRegion A4.Borderless/A4 (Borderless): "<>setpagedevice" +*PageRegion A5/A5: "<>setpagedevice" +*PageRegion A6/A6: "<>setpagedevice" +*PageRegion B5/JIS B5: "<>setpagedevice" +*PageRegion B6/JIS B6: "<>setpagedevice" +*PageRegion Env10/Envelope #10: "<>setpagedevice" +*PageRegion EnvC6/CEnvelope 6: "<>setpagedevice" +*PageRegion EnvDL/Envelope DL: "<>setpagedevice" +*PageRegion FanFoldGermanLegal/Foolscap: "<>setpagedevice" +*PageRegion Legal/US Legal: "<>setpagedevice" +*PageRegion Letter/US Letter: "<>setpagedevice" +*PageRegion Letter.Borderless/US Letter (Borderless): "<>setpagedevice" +*PageRegion Postcard/Hagaki: "<>setpagedevice" +*PageRegion Postcard.Borderless/Hagaki (Borderless): "<>setpagedevice" +*CloseUI: *PageRegion +*DefaultImageableArea: A4 +*DefaultPaperDimension: A4 +*ImageableArea 101.6x180.6mm: "8.503937007874 8.503937007874 279.496062992126 503.433070866142" +*PaperDimension 101.6x180.6mm: "288 511.937007874016" +*ImageableArea 101.6x180.6mm.Borderless: "0 0 288 511.937007874016" +*PaperDimension 101.6x180.6mm.Borderless: "288 511.937007874016" +*ImageableArea 120x120mm: "8.503937007874 8.503937007874 331.653543307087 331.653543307087" +*PaperDimension 120x120mm: "340.157480314961 340.157480314961" +*ImageableArea 120x120mm.Borderless: "0 0 340.157480314961 340.157480314961" +*PaperDimension 120x120mm.Borderless: "340.157480314961 340.157480314961" +*ImageableArea 195x270mm: "8.503937007874 8.503937007874 544.251968503937 756.850393700787" +*PaperDimension 195x270mm: "552.755905511811 765.354330708661" +*ImageableArea 3.5x5: "8.503937007874 8.503937007874 243.496062992126 351.496062992126" +*PaperDimension 3.5x5: "252 360" +*ImageableArea 3.5x5.Borderless: "0 0 252 360" +*PaperDimension 3.5x5.Borderless: "252 360" +*ImageableArea 4x6: "8.503937007874 8.503937007874 279.496062992126 423.496062992126" +*PaperDimension 4x6: "288 432" +*ImageableArea 4x6.Borderless: "0 0 288 432" +*PaperDimension 4x6.Borderless: "288 432" +*ImageableArea 5x7: "8.503937007874 8.503937007874 351.496062992126 495.496062992126" +*PaperDimension 5x7: "360 504" +*ImageableArea 5x7.Borderless: "0 0 360 504" +*PaperDimension 5x7.Borderless: "360 504" +*ImageableArea 5x8: "8.503937007874 8.503937007874 351.496062992126 567.496062992126" +*PaperDimension 5x8: "360 576" +*ImageableArea 8x10: "8.503937007874 8.503937007874 567.496062992126 711.496062992126" +*PaperDimension 8x10: "576 720" +*ImageableArea 8x10.Borderless: "0 0 576 720" +*PaperDimension 8x10.Borderless: "576 720" +*ImageableArea A4: "8.503937007874 8.503937007874 586.771653543307 833.385826771654" +*PaperDimension A4: "595.275590551181 841.889763779528" +*ImageableArea A4.Borderless: "0 0 595.275590551181 841.889763779528" +*PaperDimension A4.Borderless: "595.275590551181 841.889763779528" +*ImageableArea A5: "8.503937007874 8.503937007874 411.023622047244 586.771653543307" +*PaperDimension A5: "419.527559055118 595.275590551181" +*ImageableArea A6: "8.503937007874 8.503937007874 289.133858267717 411.023622047244" +*PaperDimension A6: "297.637795275591 419.527559055118" +*ImageableArea B5: "8.503937007874 8.503937007874 507.40157480315 720" +*PaperDimension B5: "515.905511811024 728.503937007874" +*ImageableArea B6: "8.503937007874 8.503937007874 354.330708661417 507.40157480315" +*PaperDimension B6: "362.834645669291 515.905511811024" +*ImageableArea Env10: "8.503937007874 8.503937007874 288.48188976378 675.496062992126" +*PaperDimension Env10: "296.985826771654 684" +*ImageableArea EnvC6: "8.503937007874 8.503937007874 314.645669291339 450.708661417323" +*PaperDimension EnvC6: "323.149606299213 459.212598425197" +*ImageableArea EnvDL: "8.503937007874 8.503937007874 303.307086614173 615.11811023622" +*PaperDimension EnvDL: "311.811023622047 623.622047244094" +*ImageableArea FanFoldGermanLegal: "8.503937007874 8.503937007874 603.496062992126 927.496062992126" +*PaperDimension FanFoldGermanLegal: "612 936" +*ImageableArea Legal: "8.503937007874 8.503937007874 603.496062992126 999.496062992126" +*PaperDimension Legal: "612 1008" +*ImageableArea Letter: "8.503937007874 8.503937007874 603.496062992126 783.496062992126" +*PaperDimension Letter: "612 792" +*ImageableArea Letter.Borderless: "0 0 612 792" +*PaperDimension Letter.Borderless: "612 792" +*ImageableArea Postcard: "8.503937007874 8.503937007874 274.96062992126 411.023622047244" +*PaperDimension Postcard: "283.464566929134 419.527559055118" +*ImageableArea Postcard.Borderless: "0 0 283.464566929134 419.527559055118" +*PaperDimension Postcard.Borderless: "283.464566929134 419.527559055118" +*HWMargins: "8.503937007874 8.503937007874 8.503937007874 8.503937007874" +*ParamCustomPageSize Width: 1 points 153.070866141732 612 +*ParamCustomPageSize Height: 2 points 243.779527559055 3401.574803149606 +*ParamCustomPageSize WidthOffset: 3 points 0 0 +*ParamCustomPageSize HeightOffset: 4 points 0 0 +*ParamCustomPageSize Orientation: 5 int 0 3 +*CustomPageSize True: "pop pop pop <>setpagedevice" +*OpenUI *InputSlot/Media Source: PickOne +*OrderDependency: 10 AnySetup *InputSlot +*DefaultInputSlot: Main +*InputSlot Auto/Automatic: "<>setpagedevice" +*InputSlot Main/Main: "<>setpagedevice" +*InputSlot Photo/Photo: "<>setpagedevice" +*InputSlot Rear/Rear: "<>setpagedevice" +*InputSlot Disc/Disc: "<>setpagedevice" +*CloseUI: *InputSlot +*OpenUI *MediaType/Media Type: PickOne +*OrderDependency: 10 AnySetup *MediaType +*DefaultMediaType: Stationery +*MediaType Stationery/Stationery: "<>setpagedevice" +*MediaType PhotographicHighGloss/High Gloss Photo Paper: "<>setpagedevice" +*MediaType Photographic/Photo Paper: "<>setpagedevice" +*MediaType PhotographicSemiGloss/Semi-Gloss Photo Paper: "<>setpagedevice" +*MediaType PhotographicGlossy/Glossy Photo Paper: "<>setpagedevice" +*MediaType PhotographicMatte/Matte Photo Paper: "<>setpagedevice" +*MediaType StationeryCoated/Coated Paper: "<>setpagedevice" +*MediaType Labels/Labels: "<>setpagedevice" +*MediaType Envelope/Envelope: "<>setpagedevice" +*MediaType Disc/Optical Disc: "<>setpagedevice" +*CloseUI: *MediaType +*% ColorModel from urf-supported +*OpenUI *ColorModel/Print Color Mode: PickOne +*OrderDependency: 10 AnySetup *ColorModel +*ColorModel RGB/Color: "<>setpagedevice" +*ColorModel Gray/Monochrome: "<>setpagedevice" +*DefaultColorModel: RGB +*CloseUI: *ColorModel +*OpenUI *Duplex/2-Sided Printing: PickOne +*OrderDependency: 10 AnySetup *Duplex +*DefaultDuplex: None +*Duplex None/Off: "<>setpagedevice" +*Duplex DuplexNoTumble/On (Portrait): "<>setpagedevice" +*Duplex DuplexTumble/On (Landscape): "<>setpagedevice" +*CloseUI: *Duplex +*cupsBackSide: Rotated +*OpenUI *OutputBin/Output Tray: PickOne +*OrderDependency: 10 AnySetup *OutputBin +*DefaultOutputBin: FaceUp +*OutputBin FaceUp/Face Up: "" +*PageStackOrder FaceUp: Normal +*CloseUI: *OutputBin +*DefaultResolution: 360dpi +*OpenUI *cupsPrintQuality/Print Quality: PickOne +*OrderDependency: 10 AnySetup *cupsPrintQuality +*DefaultcupsPrintQuality: Normal +*cupsPrintQuality Normal/Normal: "<>setpagedevice" +*cupsPrintQuality High/High: "<>setpagedevice" +*CloseUI: *cupsPrintQuality +*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 +*cupsFilter2: "application/vnd.cups-pdf application/pdf 0 -" diff --git a/cups/printers.conf b/cups/printers.conf index 39ab93ad..85e09ed8 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -11,7 +11,7 @@ MakeModel EPSON XP-8600 Series, driverless, cups-filters 1.28.7 DeviceURI implicitclass://EPSON_XP_8600_Series/ State Idle StateTime 1663565756 -ConfigTime 1663565756 +ConfigTime 1663572548 Type 36892 Accepting Yes Shared No diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 0cfcd43a..39ab93ad 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,4 +1,25 @@ # Printer configuration file for CUPS v2.3.3op2 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING -NextPrinterId 106 +NextPrinterId 107 + +PrinterId 106 +UUID urn:uuid:ab4c9bde-b3ed-3e00-60a9-e396c5be4b1f +Info EPSON_XP_8600_Series +Location +MakeModel EPSON XP-8600 Series, driverless, cups-filters 1.28.7 +DeviceURI implicitclass://EPSON_XP_8600_Series/ +State Idle +StateTime 1663565756 +ConfigTime 1663565756 +Type 36892 +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy retry-job +Option cups-browsed true + diff --git a/debian_version b/debian_version index 1c7134df..8204473e 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -11.4 +11.5 diff --git a/grub.d/10_linux b/grub.d/10_linux index b0188199..907a5145 100755 --- a/grub.d/10_linux +++ b/grub.d/10_linux @@ -368,7 +368,15 @@ while [ "x$list" != "x" ] ; do fi fi - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', + # 'yes' or 'true'. This was fixed but all of these values must be supported now. + if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then + GRUB_DISABLE_SUBMENU="true" + fi + + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen index 961fc7c2..3a27fc6f 100755 --- a/grub.d/20_linux_xen +++ b/grub.d/20_linux_xen @@ -324,7 +324,15 @@ while [ "x${xen_list}" != "x" ] ; do fi fi - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', + # 'yes' or 'true'. This was fixed but all of these values must be supported now. + if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then + GRUB_DISABLE_SUBMENU="true" + fi + + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then linux_entry "${OS}" "${version}" "${xen_version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober index 30d1140c..0445a5a4 100755 --- a/grub.d/30_os-prober +++ b/grub.d/30_os-prober @@ -41,14 +41,17 @@ EOF } if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then + grub_warn "$(gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.")" exit 0 fi -if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then +if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/null ; then # missing os-prober and/or linux-boot-prober exit 0 fi +grub_warn "$(gettext_printf "os-prober will be executed to detect other bootable partitions.\nIts output will be used to detect bootable binaries on them and create new boot entries.")" + OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`" if [ -z "${OSPROBED}" ] ; then # empty os-prober output, nothing doing @@ -272,7 +275,15 @@ EOF fi used_osprober_linux_ids="$used_osprober_linux_ids 'osprober-gnulinux-$LKERNEL-${recovery_params}-$counter-$boot_device_id'" - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', + # 'yes' or 'true'. This was fixed but all of these values must be supported now. + if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then + GRUB_DISABLE_SUBMENU="true" + fi + + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then cat << EOF menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' { EOF diff --git a/grub.d/30_uefi-firmware b/grub.d/30_uefi-firmware index 3e525ba7..73ce6e1f 100755 --- a/grub.d/30_uefi-firmware +++ b/grub.d/30_uefi-firmware @@ -2,7 +2,7 @@ set -e # grub-mkconfig helper script. -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2020 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,19 +24,17 @@ datarootdir="/usr/share" export TEXTDOMAIN=grub export TEXTDOMAINDIR="${datarootdir}/locale" -. "${datarootdir}/grub/grub-mkconfig_lib" +. "$pkgdatadir/grub-mkconfig_lib" -efi_vars_dir=/sys/firmware/efi/efivars +EFI_VARS_DIR=/sys/firmware/efi/efivars EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c -OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE" +OS_INDICATIONS="$EFI_VARS_DIR/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE" -if [ -e "$OsIndications" ] && \ - [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b5)") & 1 ))" = 1 ]; then - LABEL="System setup" +if [ -e "$OS_INDICATIONS" ] && \ + [ "$(( $(printf 0x%x \'"$(cat $OS_INDICATIONS | cut -b5)"\') & 1 ))" = 1 ]; then + LABEL="UEFI Firmware Settings" - gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2 - - onstr="$(gettext_printf "(on %s)" "${DEVICE}")" + gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2 cat << EOF menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' { diff --git a/grub.d/41_custom b/grub.d/41_custom index fcc21a98..a08363da 100755 --- a/grub.d/41_custom +++ b/grub.d/41_custom @@ -3,7 +3,7 @@ cat </dev/null 2>&1 || exit 0 +command -v update-grub >/dev/null || exit 0 if type systemd-detect-virt >/dev/null 2>&1 && systemd-detect-virt --quiet --container; then diff --git a/kernel/postrm.d/zz-update-grub b/kernel/postrm.d/zz-update-grub index 5ed065fb..95210576 100755 --- a/kernel/postrm.d/zz-update-grub +++ b/kernel/postrm.d/zz-update-grub @@ -1,7 +1,7 @@ #! /bin/sh set -e -which update-grub >/dev/null 2>&1 || exit 0 +command -v update-grub >/dev/null || exit 0 if type systemd-detect-virt >/dev/null 2>&1 && systemd-detect-virt --quiet --container; then diff --git a/libreoffice/registry/main.xcd b/libreoffice/registry/main.xcd index 6c41bbe9..3a3e4c5d 100644 --- a/libreoffice/registry/main.xcd +++ b/libreoffice/registry/main.xcd @@ -912,6 +912,7 @@ + @@ -1067,9 +1068,13 @@ false + + 0 + false + @@ -13484,6 +13489,17 @@ 3.45280 + + + EUR + + + HRK + + + 7.53450 + + diff --git a/locale.gen b/locale.gen index 2774f643..8e561857 100644 --- a/locale.gen +++ b/locale.gen @@ -113,7 +113,7 @@ # de_CH ISO-8859-1 # de_CH.UTF-8 UTF-8 # de_DE ISO-8859-1 -# de_DE.UTF-8 UTF-8 +de_DE.UTF-8 UTF-8 # de_DE@euro ISO-8859-15 # de_IT ISO-8859-1 # de_IT.UTF-8 UTF-8 @@ -500,4 +500,4 @@ # zh_TW.UTF-8 UTF-8 # zu_ZA ISO-8859-1 # zu_ZA.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 +# de_DE.UTF-8 UTF-8