From 4255c4ed001d9df542373635070e10838d16f6a6 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Tue, 23 Oct 2018 22:42:42 +0200 Subject: [PATCH] committing changes in /etc after apt run Package changes: -apturl 0.5.2+linuxmint3 all -apturl-common 0.5.2+linuxmint3 all +apturl 0.5.2+linuxmint5 all +apturl-common 0.5.2+linuxmint5 all -base-files 18.0.2 all +base-files 18.3.0 all -cinnamon 3.0.7+sarah amd64 -cinnamon-common 3.0.7+sarah all -cinnamon-control-center 3.0.1+sarah amd64 -cinnamon-control-center-data 3.0.1+sarah all -cinnamon-desktop-data 3.0.2+sarah all -cinnamon-l10n 3.0.3 all -cinnamon-screensaver 3.0.1+sarah amd64 -cinnamon-session 3.0.1+sarah amd64 -cinnamon-session-common 3.0.1+sarah all -cinnamon-settings-daemon 3.0.1+sarah amd64 -cinnamon-themes 2016.05.03 all -cjs 3.0.1+sarah amd64 +cinnamon 3.6.7+sylvia amd64 +cinnamon-common 3.6.7+sylvia all +cinnamon-control-center 3.6.5+sylvia amd64 +cinnamon-control-center-data 3.6.5+sylvia all +cinnamon-desktop-data 3.6.2+sylvia all +cinnamon-l10n 3.6.4 all +cinnamon-screensaver 3.6.1+sylvia all +cinnamon-screensaver-pam-helper 3.6.1+sylvia amd64 +cinnamon-screensaver-x-plugin 3.6.1+sylvia all +cinnamon-session 3.6.0+sylvia amd64 +cinnamon-session-common 3.6.0+sylvia all +cinnamon-settings-daemon 3.6.2+sylvia amd64 +cinnamon-themes 2017.06.20 all +cjs 3.6.1+sylvia amd64 +dcraw 9.21-0.2 amd64 -desktop-file-utils 0.22-1ubuntu5.2 amd64 +desktop-file-utils 0.22+linuxmint1 amd64 +flatpak 1.0.3-flatpak1~xenial amd64 -folder-color-switcher 1.0.9 all +folder-color-switcher 1.1.7 all -gdebi 0.9.5.7ubuntu1 all -gdebi-core 0.9.5.7ubuntu1 all +gdebi 0.9.5.7xmint5 all +gdebi-core 0.9.5.7xmint5 all +gir1.2-appstream-1.0 0.10.6-1~ubuntu16.04.2 amd64 -gir1.2-cinnamondesktop-3.0 3.0.2+sarah amd64 +gir1.2-cinnamondesktop-3.0 3.6.2+sylvia amd64 -gir1.2-cmenu-3.0 3.0.2+sarah amd64 +gir1.2-cmenu-3.0 3.6.0+sylvia amd64 -gir1.2-cvc-1.0 3.0.2+sarah amd64 +gir1.2-cvc-1.0 3.6.2+sylvia amd64 +gir1.2-flatpak-1.0 1.0.3-flatpak1~xenial amd64 -gir1.2-meta-muffin-0.0 3.0.5+sarah amd64 -gir1.2-nemo-3.0 3.0.6+sarah amd64 +gir1.2-meta-muffin-0.0 3.6.0+sylvia amd64 +gir1.2-nemo-3.0 3.6.5+sylvia amd64 +gir1.2-xapp-1.0 1.0.4+sylvia amd64 +gir1.2-xplayer-1.0 1.6.1+sylvia amd64 +gir1.2-xplayer-plparser-1.0 1.0.2+serena amd64 -gnome-calculator 1:3.18.3-0ubuntu1.16.04.1 amd64 +gnome-calculator 1:3.18.3-0ubuntu1.16.04.1.mint1 amd64 +gnome-online-accounts 3.18.3-1ubuntu2 amd64 -gnome-screenshot 3.18.0-2linuxmint1 amd64 +gnome-screenshot 3.18.0-2linuxmint2 amd64 -gnome-terminal 3.18.3-linuxmint1 amd64 -gnome-terminal-data 3.18.3-linuxmint1 all +gnome-terminal 3.18.3-linuxmint2 amd64 +gnome-terminal-data 3.18.3-linuxmint2 all +iso-flag-png 1.0.1 all +libappstream-glib8 0.5.13-1ubuntu6 amd64 +libappstream4 0.10.6-1~ubuntu16.04.2 amd64 -libcaja-extension1 1.14.2-1+sarah amd64 +libcaja-extension1 1.18.5-1+sonya amd64 -libcinnamon-control-center1 3.0.1+sarah amd64 -libcinnamon-desktop4 3.0.2+sarah amd64 -libcinnamon-menu-3-0 3.0.2+sarah amd64 +libcinnamon-control-center1 3.6.5+sylvia amd64 +libcinnamon-desktop4 3.6.2+sylvia amd64 +libcinnamon-menu-3-0 3.6.0+sylvia amd64 -libcjs0e 3.0.1+sarah amd64 +libcjs0f 3.6.1+sylvia amd64 +libcscreensaver0 3.6.1+sylvia amd64 -libcvc0 3.0.2+sarah amd64 +libcvc0 3.6.2+sylvia amd64 +libflatpak0 1.0.3-flatpak1~xenial amd64 +libgcab-1.0-0 0.7-1ubuntu0.1 amd64 -libgksu2-0 2.0.13~pre1-7linuxmint4 amd64 +libgksu2-0 2.0.13~pre1-7linuxmint5 amd64 +libgoa-backend-1.0-1 3.18.3-1ubuntu2 amd64 +libmozjs-38-0 38.2.1~rc0-0ubuntu5 amd64 -libmuffin0 3.0.5+sarah amd64 +libmuffin0 3.6.0+sylvia amd64 -libnemo-extension1 3.0.6+sarah amd64 +libnemo-extension1 3.6.5+sylvia amd64 +libostree-1-1 2018.7-flatpak2~xenial amd64 +libpeas-1.0-0-python2loader 1.16.0-1ubuntu2 amd64 +libstemmer0d 0+svn585-1 amd64 +libxapp1 1.0.4+sylvia amd64 -libxplayer-plparser18 1.0.2+sarah amd64 -libxplayer0 1.0.7+sarah amd64 +libxplayer-plparser18 1.0.2+serena amd64 +libxplayer0 1.6.1+sylvia amd64 -libxreaderdocument3 1.0.8+sarah amd64 -libxreaderview3 1.0.8+sarah amd64 +libxreaderdocument3 1.6.2+sylvia amd64 +libxreaderview3 1.6.2+sylvia amd64 -mint-artwork-cinnamon 5.2 all -mint-artwork-common 2.0.9.1 all -mint-artwork-gnome 2.6.46 all +mint-artwork-cinnamon 5.7 all +mint-artwork-common 2.1.8.1 all +mint-artwork-gnome 2.6.49 all -mint-common 1.2.6 all -mint-info-cinnamon 2016.01.11 amd64 +mint-backgrounds-sylvia 1.2 all +mint-common 1.2.9 all +mint-info-cinnamon 2017.10.27 amd64 -mint-mdm-themes-html 2.0.10 all -mint-meta-cinnamon 2016.07.23 all -mint-meta-codecs 2016.05.04 all -mint-meta-codecs-core 2016.05.04 all -mint-meta-core 2016.07.23 all +mint-mdm-themes-html 2.0.15 all +mint-meta-cinnamon 2017.09.19 all +mint-meta-codecs 2017.06.25 all +mint-meta-codecs-core 2017.06.25 all +mint-meta-core 2017.09.19 all -mint-themes 1.4.7 all -mint-themes-gtk3 3.18+8 all -mint-translations 2016.06.25 all +mint-themes 1.5.0 all +mint-themes-gtk3 3.18+17 all +mint-translations 2018.01.06 all -mint-x-icons 1.3.9 all -mint-y-icons 1.0.3 all -mint-y-theme 1.0.9 all -mintbackup 2.2.4 all -mintdrivers 1.3.3 all -mintinstall 7.7.5 all +mint-x-icons 1.4.6 all +mint-y-icons 1.1.3 all +mint-y-theme 1.2.3 all +mintbackup 2.3.2 all +mintdrivers 1.3.7 all +mintinstall 7.8.9 all -mintlocale 1.3.7 all -mintnanny 1.5.2 all -mintsources 1.6.0 all -mintstick 1.2.8 all -mintsystem 8.2.9 all -mintupdate 5.1.0.6 all -mintupgrade 17.3.11 all -mintupload 4.0.8 all -mintwelcome 2.2.2 all +mintlocale 1.4.4 all +mintnanny 1.5.4 all +mintsources 1.7.2 all +mintstick 1.3.5 all +mintsystem 8.3.4 all +mintupdate 5.3.2.5 all +mintupgrade 18.3.11 all +mintupload 4.1.1 all +mintwelcome 2.2.6 all -muffin-common 3.0.5+sarah all +muffin-common 3.6.0+sylvia all -nemo 3.0.6+sarah amd64 -nemo-data 3.0.6+sarah all -nemo-emblems 3.0.2 all -nemo-fileroller 3.0.0+sarah amd64 -nemo-folder-color-switcher 1.0.9 all -nemo-share 3.0.0+sarah amd64 +nemo 3.6.5+sylvia amd64 +nemo-data 3.6.5+sylvia all +nemo-emblems 3.6.0+sylvia all +nemo-fileroller 3.6.0+sylvia amd64 +nemo-folder-color-switcher 1.1.7 all +nemo-share 3.6.0+sylvia amd64 -nvidia-prime-applet 1.0.5 all +nvidia-prime-applet 1.0.6 all -pix 1.0.6+sarah amd64 -pix-data 1.0.6+sarah all +pix 1.6.2+sylvia amd64 +pix-data 1.6.2+sylvia all -python-nemo 3.0.0+sarah amd64 +python-nemo 3.6.0+sylvia amd64 +python-setproctitle 1.1.8-1build2 amd64 -python-software-properties 1.6.0 all +python-software-properties 1.7.2 all +python3-psutil 3.4.2-1 amd64 +python3-setproctitle 1.1.8-1build2 amd64 +python3-xapp 1.0.1 all -software-properties-common 1.6.0 all +software-properties-common 1.7.2 all -synaptic 0.83linuxmint3 amd64 +synaptic 0.83linuxmint4 amd64 -ubuntu-system-adjustments 2016.09.02 all +ubuntu-system-adjustments 2017.05.21 all -xapps-common 1.0.0 all +xapps-common 1.0.4+sylvia all +xdg-desktop-portal 1.0.2-flatpak1~xenial amd64 +xdg-desktop-portal-gtk 1.0.2-flatpak1~xenial amd64 -xed 1.0.6+sarah amd64 -xed-common 1.0.6+sarah all +xed 1.6.3+sylvia amd64 +xed-common 1.6.3+sylvia all -xplayer 1.0.7+sarah amd64 -xplayer-common 1.0.7+sarah all -xplayer-mozilla 1.0.7+sarah amd64 -xplayer-plugins-extra 1.0.7+sarah amd64 +xplayer 1.6.1+sylvia amd64 +xplayer-common 1.6.1+sylvia all +xplayer-plugins 1.6.1+sylvia amd64 +xplayer-plugins-extra 1.6.1+sylvia amd64 -xreader 1.0.8+sarah amd64 -xreader-common 1.0.8+sarah all +xreader 1.6.2+sylvia amd64 +xreader-common 1.6.2+sylvia all -xviewer 1.0.6+sarah amd64 -xviewer-plugins 1.0.3+sarah amd64 +xviewer 1.6.1+sylvia amd64 +xviewer-plugins 1.2.0+serena amd64 --- .etckeeper | 30 ++++++++- X11/Xsession.d/65flatpak | 12 ++++ .../org.freedesktop.Flatpak.SystemHelper.conf | 25 ++++++++ default/grub.d/50_linuxmint.cfg | 16 ++--- gconf/gconf.xml.defaults/%gconf-tree.xml | 64 +++++++++---------- gnome/defaults.list | 1 + issue | 2 +- issue.net | 2 +- .../99_linuxmint.conf | 20 ++++++ lightdm/lightdm.conf.d/70-linuxmint.conf | 2 + linuxmint/adjustments/15-mint-mime.overwrite | 1 - .../15-ubuntu-system-adjustments.execute | 18 +++--- .../15-ubuntu-system-adjustments.menu | 5 -- linuxmint/info | 12 ++-- lsb-release | 6 +- mailcap | 7 +- profile.d/flatpak.sh | 7 ++ sgml/muffin-common.cat | 1 - ...amon-settings-daemon-a11y-keyboard.desktop | 9 +++ ...amon-settings-daemon-a11y-settings.desktop | 9 +++ ...cinnamon-settings-daemon-automount.desktop | 9 +++ ...innamon-settings-daemon-background.desktop | 9 +++ ...cinnamon-settings-daemon-clipboard.desktop | 9 +++ .../cinnamon-settings-daemon-color.desktop | 9 +++ .../cinnamon-settings-daemon-cursor.desktop | 9 +++ ...namon-settings-daemon-housekeeping.desktop | 9 +++ .../cinnamon-settings-daemon-keyboard.desktop | 9 +++ ...innamon-settings-daemon-media-keys.desktop | 9 +++ .../cinnamon-settings-daemon-mouse.desktop | 9 +++ ...nnamon-settings-daemon-orientation.desktop | 9 +++ .../cinnamon-settings-daemon-power.desktop | 9 +++ ...ettings-daemon-print-notifications.desktop | 9 +++ ...-settings-daemon-screensaver-proxy.desktop | 9 +++ ...cinnamon-settings-daemon-smartcard.desktop | 9 +++ .../cinnamon-settings-daemon-sound.desktop | 9 +++ .../cinnamon-settings-daemon-wacom.desktop | 9 +++ .../cinnamon-settings-daemon-xrandr.desktop | 9 +++ ...cinnamon-settings-daemon-xsettings.desktop | 9 +++ .../mintinstall-update-flatpak.desktop | 11 ++++ xdg/autostart/mintupload.desktop | 2 +- xdg/menus/cinnamon-applications.menu | 5 -- 41 files changed, 350 insertions(+), 79 deletions(-) create mode 100644 X11/Xsession.d/65flatpak create mode 100644 dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf create mode 100644 lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf create mode 100644 lightdm/lightdm.conf.d/70-linuxmint.conf create mode 100644 profile.d/flatpak.sh delete mode 100644 sgml/muffin-common.cat create mode 100644 xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-automount.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-background.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-clipboard.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-color.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-cursor.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-keyboard.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-media-keys.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-mouse.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-orientation.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-power.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-smartcard.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-sound.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-wacom.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-xrandr.desktop create mode 100644 xdg/autostart/cinnamon-settings-daemon-xsettings.desktop create mode 100644 xdg/autostart/mintinstall-update-flatpak.desktop diff --git a/.etckeeper b/.etckeeper index 7550e668..a14628da 100755 --- a/.etckeeper +++ b/.etckeeper @@ -129,6 +129,7 @@ maybe chmod 0644 'X11/Xsession.d/55cinnamon-session_gnomerc' maybe chmod 0644 'X11/Xsession.d/60x11-common_localhost' maybe chmod 0644 'X11/Xsession.d/60x11-common_xdg_path' maybe chmod 0644 'X11/Xsession.d/60xdg-user-dirs-update' +maybe chmod 0644 'X11/Xsession.d/65flatpak' maybe chmod 0644 'X11/Xsession.d/70gconfd_path-on-session' maybe chmod 0644 'X11/Xsession.d/70im-config_launch' maybe chmod 0644 'X11/Xsession.d/75dbus_dbus-launch' @@ -2017,6 +2018,7 @@ maybe chmod 0644 'dbus-1/system.d/org.debian.AptXapianIndex.conf' maybe chmod 0644 'dbus-1/system.d/org.debian.apt.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.Accounts.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ColorManager.conf' +maybe chmod 0644 'dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ModemManager1.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.NetworkManager.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.PackageKit-aptd.conf' @@ -3251,6 +3253,11 @@ maybe chmod 0755 'libreoffice' maybe chmod 0644 'libreoffice/psprint.conf' maybe chmod 0644 'libreoffice/soffice.sh' maybe chmod 0644 'libreoffice/sofficerc' +maybe chmod 0755 'lightdm' +maybe chmod 0755 'lightdm/lightdm-gtk-greeter.conf.d' +maybe chmod 0644 'lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf' +maybe chmod 0755 'lightdm/lightdm.conf.d' +maybe chmod 0644 'lightdm/lightdm.conf.d/70-linuxmint.conf' maybe chmod 0755 'lighttpd' maybe chmod 0755 'lighttpd/conf-available' maybe chmod 0644 'lighttpd/conf-available/90-javascript-alias.conf' @@ -4089,6 +4096,7 @@ maybe chmod 0644 'profile' maybe chmod 0755 'profile.d' maybe chmod 0644 'profile.d/bash_completion.sh' maybe chmod 0644 'profile.d/cedilla-portuguese.sh' +maybe chmod 0644 'profile.d/flatpak.sh' maybe chmod 0644 'profile.d/ssh_mail.sh' maybe chmod 0644 'profile.d/vte-2.91.sh' maybe chmod 0644 'profile.d/vte.sh' @@ -4322,7 +4330,6 @@ maybe chmod 0644 'sgml/docbook-xml/4.4/dbgenent.mod' maybe chmod 0755 'sgml/docbook-xml/4.5' maybe chmod 0644 'sgml/docbook-xml/4.5/dbgenent.mod' maybe chmod 0644 'sgml/metacity-common.cat' -maybe chmod 0644 'sgml/muffin-common.cat' maybe chmod 0644 'sgml/sgml-data.cat' maybe chmod 0644 'sgml/xml-core.cat' maybe chgrp 'shadow' 'shadow' @@ -4648,6 +4655,26 @@ maybe chmod 0644 'xdg/Trolltech.conf' maybe chmod 0755 'xdg/autostart' maybe chmod 0644 'xdg/autostart/at-spi-dbus-bus.desktop' maybe chmod 0644 'xdg/autostart/caribou-autostart.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-automount.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-background.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-clipboard.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-color.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-cursor.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-keyboard.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-media-keys.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-mouse.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-orientation.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-power.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-smartcard.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-sound.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-wacom.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-xrandr.desktop' +maybe chmod 0644 'xdg/autostart/cinnamon-settings-daemon-xsettings.desktop' maybe chmod 0644 'xdg/autostart/cinnamon-sound-applet.desktop' maybe chmod 0644 'xdg/autostart/gnome-keyring-pkcs11.desktop' maybe chmod 0644 'xdg/autostart/gnome-keyring-secrets.desktop' @@ -4657,6 +4684,7 @@ maybe chmod 0644 'xdg/autostart/gnome-user-share-obexpush.desktop' maybe chmod 0644 'xdg/autostart/gnome-user-share-webdav.desktop' maybe chmod 0644 'xdg/autostart/gsettings-data-convert.desktop' maybe chmod 0644 'xdg/autostart/mint-ctrl-alt-backspace.desktop' +maybe chmod 0644 'xdg/autostart/mintinstall-update-flatpak.desktop' maybe chmod 0644 'xdg/autostart/mintupdate.desktop' maybe chmod 0644 'xdg/autostart/mintupload.desktop' maybe chmod 0644 'xdg/autostart/mintwelcome.desktop' diff --git a/X11/Xsession.d/65flatpak b/X11/Xsession.d/65flatpak new file mode 100644 index 00000000..42a38277 --- /dev/null +++ b/X11/Xsession.d/65flatpak @@ -0,0 +1,12 @@ +# This file is sourced by Xsession(5), not executed. +# Add additionnal the additonal snappy desktop path + +if [ -z "$XDG_DATA_DIRS" ]; then + # 60x11-common_xdg_path does not always set XDG_DATA_DIRS + # so we ensure we have sensible defaults here (LP: #1575014) + # as a workaround + XDG_DATA_DIRS=$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/ +else + XDG_DATA_DIRS=$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share/:"$XDG_DATA_DIRS" +fi +export XDG_DATA_DIRS diff --git a/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf b/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf new file mode 100644 index 00000000..4aac5b8c --- /dev/null +++ b/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/default/grub.d/50_linuxmint.cfg b/default/grub.d/50_linuxmint.cfg index 130e036c..d8103311 100644 --- a/default/grub.d/50_linuxmint.cfg +++ b/default/grub.d/50_linuxmint.cfg @@ -1,7 +1,7 @@ #! /bin/sh set -e -# Set distributor to "Ubuntu" +# Set distributor to "Ubuntu" # # In Mint 16: # shim and grub come with hardcoded ubuntu strings upstream, without this EFI installation is broken @@ -9,17 +9,13 @@ set -e # # In Mint 17: # Despite the bug report being marked as fixed, the situation is the same. Grub was patched by Ubuntu -# to assign the "ubuntu" distributor ID when it was given "Kubuntu". That results in Kubuntu finally +# to assign the "ubuntu" distributor ID when it was given "Kubuntu". That results in Kubuntu finally # getting EFI to work out of the box but still using "ubuntu" as far as grub-install is concerned. # So we'll stick to "Ubuntu" for this iteration. # -# The remaining issues are almost the same: -# -# - Branding issue in Linux Mint (our EFI name is "Ubuntu" because anything else won't work) -# - Conflict between Linux Mint and Ubuntu (in multi-boot situations -# they use the same EFI name so EFI implementations can't list them both). -# That should also be a problem with derivatives, and also a problem with -# multiple installations of the same operating system (for instance in the case of Mint editions). -# +# In Mint 18: +# Some packages are still hardcoded with the "ubuntu" path.. fwupdate for instance. +# Visually, the grub boot menuentry name is set for derivatives in 10_linux, +# but underneath the EFI path remains "ubuntu" for everything to work properly. GRUB_DISTRIBUTOR="Ubuntu" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 9ac4f93e..14084ae5 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -30,20 +30,20 @@ - + menu:minimize,maximize,close - - + + Sans Bold 10 - + Mint-X - + standard @@ -52,7 +52,7 @@ - + 000000ff @@ -62,7 +62,7 @@ - + @@ -71,14 +71,14 @@ - + - + splash/linuxmint.png @@ -88,10 +88,10 @@ - + #b5fb0019 - + #aafb009f @@ -100,10 +100,10 @@ - + #abfb004f - + #a9fb009f @@ -113,29 +113,29 @@ - - + + #525252 - + - - - + + + - + LinuxMint - + :minimize,maximize,close @@ -147,46 +147,46 @@ - + thunderbird %s - - + + Mint-X - + Mint-X - + solid - + #000000000000 - + #000000000000 - + zoom - + /usr/share/backgrounds/linuxmint/default_background.jpg - + - + Mint-X diff --git a/gnome/defaults.list b/gnome/defaults.list index 6a873f3f..c35c05ef 100644 --- a/gnome/defaults.list +++ b/gnome/defaults.list @@ -20,6 +20,7 @@ application/vnd.sun.xml.math=libreoffice-math.desktop application/vnd.sun.xml.writer=libreoffice-writer.desktop application/vnd.sun.xml.writer.template=libreoffice-writer.desktop application/vnd.sun.xml.writer.global=libreoffice-writer.desktop +application/vnd.oasis.opendocument.database=libreoffice-base.desktop application/vnd.oasis.opendocument.formula=libreoffice-math.desktop application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop diff --git a/issue b/issue index 3db77dca..e9f3d138 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Linux Mint 18 Sarah \n \l +Linux Mint 18.3 Sylvia \n \l diff --git a/issue.net b/issue.net index 67af845b..851f1e3c 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Linux Mint 18 Sarah \ No newline at end of file +Linux Mint 18.3 Sylvia \ No newline at end of file diff --git a/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf b/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf new file mode 100644 index 00000000..d4124d24 --- /dev/null +++ b/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf @@ -0,0 +1,20 @@ +[greeter] +background=/usr/share/backgrounds/linuxmint/default_background.jpg +theme-name=Mint-X +icon-theme-name=Mint-X +font-name=Ubuntu 11 +xft-antialias=true +xft-dpi=96 +xft-hintstyle=hintslight +xft-rgba=rgb +indicators=~host;~spacer;~clock;~spacer;~session;~a11y;~language;~power +keyboard=onboard +reader=orca +position = 50%,center 50%,center +default-user-image = #avatar-default +screensaver-timeout = 60 +a11y-states=contrast;font;keyboard;reader +user-background = false +clock-format = %a %d %b, %H:%M + + diff --git a/lightdm/lightdm.conf.d/70-linuxmint.conf b/lightdm/lightdm.conf.d/70-linuxmint.conf new file mode 100644 index 00000000..925e254e --- /dev/null +++ b/lightdm/lightdm.conf.d/70-linuxmint.conf @@ -0,0 +1,2 @@ +[SeatDefaults] +user-session=cinnamon \ No newline at end of file diff --git a/linuxmint/adjustments/15-mint-mime.overwrite b/linuxmint/adjustments/15-mint-mime.overwrite index 03c5b5a4..e69de29b 100644 --- a/linuxmint/adjustments/15-mint-mime.overwrite +++ b/linuxmint/adjustments/15-mint-mime.overwrite @@ -1 +0,0 @@ -/usr/share/linuxmint/common/artwork/mime/defaults.list /etc/gnome/defaults.list diff --git a/linuxmint/adjustments/15-ubuntu-system-adjustments.execute b/linuxmint/adjustments/15-ubuntu-system-adjustments.execute index b817aafc..c41ff4e1 100755 --- a/linuxmint/adjustments/15-ubuntu-system-adjustments.execute +++ b/linuxmint/adjustments/15-ubuntu-system-adjustments.execute @@ -3,15 +3,15 @@ import os import commands import syslog -try: - if os.path.exists("/etc/grub.d/10_linux"): - if os.path.exists("/etc/linuxmint/info"): - mint_grub_title = commands.getoutput("grep GRUB_TITLE /etc/linuxmint/info | awk -F = '{print $2}'") - else: - mint_grub_title = "Linux Mint" - os.system("sed -i -e 's@OS=\"${GRUB_DISTRIBUTOR}\"@OS=\"%s\"@g' /etc/grub.d/10_linux" % mint_grub_title) -except Exception, detail: - syslog.syslog("Couldn't adjust /etc/grub.d/10_linux: %s" % detail) +# try: +# if os.path.exists("/etc/grub.d/10_linux"): +# if os.path.exists("/etc/linuxmint/info"): +# mint_grub_title = commands.getoutput("grep GRUB_TITLE /etc/linuxmint/info | awk -F = '{print $2}'") +# else: +# mint_grub_title = "Linux Mint" +# os.system("sed -i -e 's@OS=\"${GRUB_DISTRIBUTOR}\"@OS=\"%s\"@g' /etc/grub.d/10_linux" % mint_grub_title) +# except Exception, detail: +# syslog.syslog("Couldn't adjust /etc/grub.d/10_linux: %s" % detail) try: if os.path.exists("/etc/X11/Xsession.d/98vboxadd-xclient"): diff --git a/linuxmint/adjustments/15-ubuntu-system-adjustments.menu b/linuxmint/adjustments/15-ubuntu-system-adjustments.menu index 91331deb..fa920b97 100644 --- a/linuxmint/adjustments/15-ubuntu-system-adjustments.menu +++ b/linuxmint/adjustments/15-ubuntu-system-adjustments.menu @@ -6,17 +6,12 @@ hide /usr/share/applications/display-im6.desktop hide /usr/share/applications/display-im6.q16.desktop categories /usr/share/applications/libreoffice-draw.desktop Office; categories /usr/share/applications/libreoffice-math.desktop Office;Spreadsheet; -categories /usr/share/applications/evince.desktop GNOME;GTK;Utility;Viewer; -categories /usr/share/applications/atril.desktop GNOME;GTK;Utility;Viewer; categories /usr/share/applications/mate-dictionary.desktop GNOME;GTK;Utility;Viewer; categories /usr/share/applications/mate-color-select.desktop GNOME;GTK;Utility;Viewer; categories /usr/share/applications/orca.desktop GNOME;GTK;Utility; -rename /usr/share/applications/atril.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/atril.desktop rename /usr/share/applications/caja-browser.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/caja-browser.desktop rename /usr/share/applications/engrampa.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/engrampa.desktop -rename /usr/share/applications/eom.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/eom.desktop rename /usr/share/applications/mate-terminal.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/mate-terminal.desktop -rename /usr/share/applications/pluma.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/pluma.desktop rename /usr/share/applications/mate-dictionary.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/mate-dictionary.desktop rename /usr/share/applications/mate-disk-usage-analyzer.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/mate-disk-usage-analyzer.desktop rename /usr/share/applications/mate-system-monitor.desktop /usr/share/ubuntu-system-adjustments/renamed-menu-entries/mate-system-monitor.desktop diff --git a/linuxmint/info b/linuxmint/info index 4852eb50..24293b95 100644 --- a/linuxmint/info +++ b/linuxmint/info @@ -1,10 +1,10 @@ -RELEASE=18 -CODENAME=sarah +RELEASE=18.3 +CODENAME=sylvia EDITION="Cinnamon 64-bit" -DESCRIPTION="Linux Mint 18 Sarah" +DESCRIPTION="Linux Mint 18.3 Sylvia" DESKTOP=Gnome TOOLKIT=GTK -NEW_FEATURES_URL=http://www.linuxmint.com/rel_sarah_cinnamon_whatsnew.php -RELEASE_NOTES_URL=http://www.linuxmint.com/rel_sarah_cinnamon.php +NEW_FEATURES_URL=http://www.linuxmint.com/rel_sylvia_cinnamon_whatsnew.php +RELEASE_NOTES_URL=http://www.linuxmint.com/rel_sylvia_cinnamon.php USER_GUIDE_URL=help:linuxmint -GRUB_TITLE=Linux Mint 18 Cinnamon 64-bit +GRUB_TITLE=Linux Mint 18.3 Cinnamon 64-bit diff --git a/lsb-release b/lsb-release index 2b08e8c8..b7e63abd 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=LinuxMint -DISTRIB_RELEASE=18 -DISTRIB_CODENAME=sarah -DISTRIB_DESCRIPTION="Linux Mint 18 Sarah" +DISTRIB_RELEASE=18.3 +DISTRIB_CODENAME=sylvia +DISTRIB_DESCRIPTION="Linux Mint 18.3 Sylvia" diff --git a/mailcap b/mailcap index edf16c34..6b9e4f51 100644 --- a/mailcap +++ b/mailcap @@ -432,12 +432,11 @@ x-scheme-handler/ghelp; yelp %s; test=test -n "$DISPLAY" x-scheme-handler/help; yelp %s; test=test -n "$DISPLAY" x-scheme-handler/info; yelp %s; test=test -n "$DISPLAY" x-scheme-handler/man; yelp %s; test=test -n "$DISPLAY" -application/x-backup; mintBackup %s; test=test -n "$DISPLAY" application/x-ms-dos-executable; mono %s; test=test -n "$DISPLAY" application/x-ms-dos-executable; mono %s; needsterminal x-content/unix-software; nemo-autorun-software %s; test=test -n "$DISPLAY" -inode/directory; nemo %s; test=test -n "$DISPLAY" -application/x-gnome-saved-search; nemo %s; test=test -n "$DISPLAY" +inode/directory; nemo trash:/// %s; test=test -n "$DISPLAY" +application/x-gnome-saved-search; nemo trash:/// %s; test=test -n "$DISPLAY" application/x-openbox-theme; obconf %s; test=test -n "$DISPLAY" application/x-java-archive; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY" application/java-archive; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY" @@ -666,11 +665,13 @@ application/x-dvi; xreader %s; test=test -n "$DISPLAY" application/x-bzdvi; xreader %s; test=test -n "$DISPLAY" application/x-gzdvi; xreader %s; test=test -n "$DISPLAY" image/vnd.djvu; xreader %s; test=test -n "$DISPLAY" +image/vnd.djvu+multipage; xreader %s; test=test -n "$DISPLAY" image/tiff; xreader %s; test=test -n "$DISPLAY" application/x-cbr; xreader %s; test=test -n "$DISPLAY" application/x-cbz; xreader %s; test=test -n "$DISPLAY" application/x-cb7; xreader %s; test=test -n "$DISPLAY" application/x-cbt; xreader %s; test=test -n "$DISPLAY" +application/vnd.comicbook+zip; xreader %s; test=test -n "$DISPLAY" application/oxps; xreader %s; test=test -n "$DISPLAY" application/vnd.ms-xpsdocument; xreader %s; test=test -n "$DISPLAY" application/epub+zip; xreader %s; test=test -n "$DISPLAY" diff --git a/profile.d/flatpak.sh b/profile.d/flatpak.sh new file mode 100644 index 00000000..ce183f58 --- /dev/null +++ b/profile.d/flatpak.sh @@ -0,0 +1,7 @@ +# /etc/profile.d/flatpak.sh - set XDG_DATA_DIRS + +if [ "${XDG_DATA_DIRS#*flatpak}" = "${XDG_DATA_DIRS}" ]; then + XDG_DATA_DIRS="${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak/exports/share:/var/lib/flatpak/exports/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" +fi + +export XDG_DATA_DIRS diff --git a/sgml/muffin-common.cat b/sgml/muffin-common.cat deleted file mode 100644 index 59fbe459..00000000 --- a/sgml/muffin-common.cat +++ /dev/null @@ -1 +0,0 @@ -CATALOG /usr/share/sgml/muffin-common/catalog diff --git a/xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop b/xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop new file mode 100644 index 00000000..2ef93ce6 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - a11y-keyboard +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-a11y-keyboard +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop b/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop new file mode 100644 index 00000000..0cb15c10 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - a11y-settings +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-a11y-settings +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-automount.desktop b/xdg/autostart/cinnamon-settings-daemon-automount.desktop new file mode 100644 index 00000000..76f8aedb --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-automount.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - automount +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-automount +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-background.desktop b/xdg/autostart/cinnamon-settings-daemon-background.desktop new file mode 100644 index 00000000..99998f24 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-background.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - background +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-background +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-clipboard.desktop b/xdg/autostart/cinnamon-settings-daemon-clipboard.desktop new file mode 100644 index 00000000..79763b1b --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-clipboard.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - clipboard +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-clipboard +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-color.desktop b/xdg/autostart/cinnamon-settings-daemon-color.desktop new file mode 100644 index 00000000..ec377316 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-color.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - color +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-color +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-cursor.desktop b/xdg/autostart/cinnamon-settings-daemon-cursor.desktop new file mode 100644 index 00000000..d262ddd9 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-cursor.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - cursor +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-cursor +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop b/xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop new file mode 100644 index 00000000..ad5962d5 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - housekeeping +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-housekeeping +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-keyboard.desktop b/xdg/autostart/cinnamon-settings-daemon-keyboard.desktop new file mode 100644 index 00000000..84a531ab --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-keyboard.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - keyboard +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-keyboard +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-media-keys.desktop b/xdg/autostart/cinnamon-settings-daemon-media-keys.desktop new file mode 100644 index 00000000..8e0d444d --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-media-keys.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - media-keys +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-media-keys +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-mouse.desktop b/xdg/autostart/cinnamon-settings-daemon-mouse.desktop new file mode 100644 index 00000000..568aa126 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-mouse.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - mouse +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-mouse +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-orientation.desktop b/xdg/autostart/cinnamon-settings-daemon-orientation.desktop new file mode 100644 index 00000000..9e278a95 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-orientation.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - orientation +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-orientation +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-power.desktop b/xdg/autostart/cinnamon-settings-daemon-power.desktop new file mode 100644 index 00000000..6835e060 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-power.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - power +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-power +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop b/xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop new file mode 100644 index 00000000..21e51b3d --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - print-notifications +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-print-notifications +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop b/xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop new file mode 100644 index 00000000..97c935b1 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - screensaver-proxy +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-screensaver-proxy +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-smartcard.desktop b/xdg/autostart/cinnamon-settings-daemon-smartcard.desktop new file mode 100644 index 00000000..6309f597 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-smartcard.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - smartcard +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-smartcard +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-sound.desktop b/xdg/autostart/cinnamon-settings-daemon-sound.desktop new file mode 100644 index 00000000..a35756f6 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-sound.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - sound +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-sound +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-wacom.desktop b/xdg/autostart/cinnamon-settings-daemon-wacom.desktop new file mode 100644 index 00000000..3faf0349 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-wacom.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - wacom +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-wacom +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-xrandr.desktop b/xdg/autostart/cinnamon-settings-daemon-xrandr.desktop new file mode 100644 index 00000000..c8321dd8 --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-xrandr.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - xrandr +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-xrandr +OnlyShowIn=X-Cinnamon; +NoDisplay=false +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/cinnamon-settings-daemon-xsettings.desktop b/xdg/autostart/cinnamon-settings-daemon-xsettings.desktop new file mode 100644 index 00000000..dd1fe33e --- /dev/null +++ b/xdg/autostart/cinnamon-settings-daemon-xsettings.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Cinnamon Settings Daemon - xsettings +Exec=/usr/lib/x86_64-linux-gnu/cinnamon-settings-daemon/csd-xsettings +OnlyShowIn=X-Cinnamon; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/xdg/autostart/mintinstall-update-flatpak.desktop b/xdg/autostart/mintinstall-update-flatpak.desktop new file mode 100644 index 00000000..2e964b0e --- /dev/null +++ b/xdg/autostart/mintinstall-update-flatpak.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Flatpak +Comment=Apply Flatpak updates +Icon=stock_lock +Exec=mintinstall-update-flatpak +Terminal=false +Type=Application +Categories= +X-GNOME-Autostart-Delay=20 +X-MATE-Autostart-Delay=20 diff --git a/xdg/autostart/mintupload.desktop b/xdg/autostart/mintupload.desktop index d3a20873..1c4a5dc4 100644 --- a/xdg/autostart/mintupload.desktop +++ b/xdg/autostart/mintupload.desktop @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=mintUpload Comment=Linux Mint Upload Manager -Icon=/usr/share/pixmaps/mintupload/icon.svg +Icon=mintupload Exec=/usr/lib/linuxmint/mintupload/launch-file-uploader.py Terminal=false Type=Application diff --git a/xdg/menus/cinnamon-applications.menu b/xdg/menus/cinnamon-applications.menu index 1e4410a0..caf60627 100644 --- a/xdg/menus/cinnamon-applications.menu +++ b/xdg/menus/cinnamon-applications.menu @@ -6,11 +6,6 @@ Applications cinnamon-menu-applications.directory - - - /etc/X11/applnk - /usr/share/cinnamon/apps - -- 2.43.0