]> git.hoellein.online Git - homeserver/commitdiff
committing changes in /etc after apt run
authormhoellein <mhoellein@freenet.de>
Tue, 23 Oct 2018 20:42:42 +0000 (22:42 +0200)
committermhoellein <mhoellein@freenet.de>
Tue, 23 Oct 2018 20:42:42 +0000 (22:42 +0200)
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

41 files changed:
.etckeeper
X11/Xsession.d/65flatpak [new file with mode: 0644]
dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf [new file with mode: 0644]
default/grub.d/50_linuxmint.cfg
gconf/gconf.xml.defaults/%gconf-tree.xml
gnome/defaults.list
issue
issue.net
lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf [new file with mode: 0644]
lightdm/lightdm.conf.d/70-linuxmint.conf [new file with mode: 0644]
linuxmint/adjustments/15-mint-mime.overwrite
linuxmint/adjustments/15-ubuntu-system-adjustments.execute
linuxmint/adjustments/15-ubuntu-system-adjustments.menu
linuxmint/info
lsb-release
mailcap
profile.d/flatpak.sh [new file with mode: 0644]
sgml/muffin-common.cat [deleted file]
xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-automount.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-background.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-clipboard.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-color.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-cursor.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-keyboard.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-media-keys.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-mouse.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-orientation.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-power.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-smartcard.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-sound.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-wacom.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-xrandr.desktop [new file with mode: 0644]
xdg/autostart/cinnamon-settings-daemon-xsettings.desktop [new file with mode: 0644]
xdg/autostart/mintinstall-update-flatpak.desktop [new file with mode: 0644]
xdg/autostart/mintupload.desktop
xdg/menus/cinnamon-applications.menu

index 7550e668759e4cf28d21afa130bf537d3bc577f3..a14628da0c26db1be820287924ce8dddcd01afda 100755 (executable)
@@ -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 (file)
index 0000000..42a3827
--- /dev/null
@@ -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 (file)
index 0000000..4aac5b8
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- This configuration file specifies the required security policies
+       for the the flatpak system helper to work. -->
+
+  <policy user="root">
+    <allow own="org.freedesktop.Flatpak.SystemHelper"/>
+  </policy>
+
+ <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
+  <policy context="default">
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
+           send_interface="org.freedesktop.Flatpak.SystemHelper"/>
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_destination="org.freedesktop.Flatpak.SystemHelper"
+           send_interface="org.freedesktop.DBus.Peer"/>
+  </policy>
+
+</busconfig>
index 130e036cf000ae08d795e766dde16bd50b890daa..d8103311146c0baea866d37cfa305e7b63895c63 100644 (file)
@@ -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"
index 9ac4f93e00ce5cb6f90dfb7cde36a1bed1083943..14084ae5e54022271d5b9396e2aab851ec135bd8 100644 (file)
        <dir name="apps">
                <dir name="metacity">
                        <dir name="general">
-                               <entry name="button_layout" mtime="1540310731" type="string">
+                               <entry name="button_layout" mtime="1540327263" type="string">
                                        <stringvalue>menu:minimize,maximize,close</stringvalue>
                                </entry>
-                               <entry name="num_workspaces" mtime="1540310730" type="int" value="4"/>
-                               <entry name="titlebar_font" mtime="1540310730" type="string">
+                               <entry name="num_workspaces" mtime="1540327262" type="int" value="4"/>
+                               <entry name="titlebar_font" mtime="1540327262" type="string">
                                        <stringvalue>Sans Bold 10</stringvalue>
                                </entry>
-                               <entry name="theme" mtime="1540310730" type="string">
+                               <entry name="theme" mtime="1540327262" type="string">
                                        <stringvalue>Mint-X</stringvalue>
                                </entry>
                        </dir>
                </dir>
                <dir name="notification-daemon">
-                       <entry name="theme" mtime="1540310730" type="string">
+                       <entry name="theme" mtime="1540327262" type="string">
                                <stringvalue>standard</stringvalue>
                        </entry>
                </dir>
@@ -52,7 +52,7 @@
                                <dir name="cube">
                                        <dir name="screen0">
                                                <dir name="options">
-                                                       <entry name="color" mtime="1540310731" type="string">
+                                                       <entry name="color" mtime="1540327262" type="string">
                                                                <stringvalue>000000ff</stringvalue>
                                                        </entry>
                                                </dir>
@@ -62,7 +62,7 @@
                        <dir name="general">
                                <dir name="screen0">
                                        <dir name="options">
-                                               <entry name="hsize" mtime="1540310730" type="int" value="4"/>
+                                               <entry name="hsize" mtime="1540327262" type="int" value="4"/>
                                        </dir>
                                </dir>
                        </dir>
                        <dir name="preferences">
                                <dir name="editor">
                                        <dir name="save">
-                                               <entry name="create_backup_copy" mtime="1540310731" type="bool" value="false"/>
+                                               <entry name="create_backup_copy" mtime="1540327263" type="bool" value="false"/>
                                        </dir>
                                </dir>
                        </dir>
                </dir>
                <dir name="gnome-session">
                        <dir name="options">
-                               <entry name="splash_image" mtime="1540310730" type="string">
+                               <entry name="splash_image" mtime="1540327262" type="string">
                                        <stringvalue>splash/linuxmint.png</stringvalue>
                                </entry>
                        </dir>
                                <dir name="resize">
                                        <dir name="screen0">
                                                <dir name="options">
-                                                       <entry name="fill_color" mtime="1540310731" type="string">
+                                                       <entry name="fill_color" mtime="1540327263" type="string">
                                                                <stringvalue>#b5fb0019</stringvalue>
                                                        </entry>
-                                                       <entry name="border_color" mtime="1540310731" type="string">
+                                                       <entry name="border_color" mtime="1540327263" type="string">
                                                                <stringvalue>#aafb009f</stringvalue>
                                                        </entry>
                                                </dir>
                                <dir name="grid">
                                        <dir name="screen0">
                                                <dir name="options">
-                                                       <entry name="fill_color" mtime="1540310731" type="string">
+                                                       <entry name="fill_color" mtime="1540327263" type="string">
                                                                <stringvalue>#abfb004f</stringvalue>
                                                        </entry>
-                                                       <entry name="outline_color" mtime="1540310731" type="string">
+                                                       <entry name="outline_color" mtime="1540327263" type="string">
                                                                <stringvalue>#a9fb009f</stringvalue>
                                                        </entry>
                                                </dir>
                </dir>
                <dir name="nautilus">
                        <dir name="preferences">
-                               <entry name="background_set" mtime="1540310731" type="bool" value="true"/>
-                               <entry name="background_color" mtime="1540310731" type="string">
+                               <entry name="background_set" mtime="1540327263" type="bool" value="true"/>
+                               <entry name="background_color" mtime="1540327263" type="string">
                                        <stringvalue>#525252</stringvalue>
                                </entry>
-                               <entry name="enable_delete" mtime="1540310731" type="bool" value="true"/>
+                               <entry name="enable_delete" mtime="1540327262" type="bool" value="true"/>
                        </dir>
                        <dir name="desktop">
-                               <entry name="volumes_visible" mtime="1540310731" type="bool" value="true"/>
-                               <entry name="home_icon_visible" mtime="1540310731" type="bool" value="true"/>
-                               <entry name="computer_icon_visible" mtime="1540310731" type="bool" value="true"/>
+                               <entry name="volumes_visible" mtime="1540327262" type="bool" value="true"/>
+                               <entry name="home_icon_visible" mtime="1540327262" type="bool" value="true"/>
+                               <entry name="computer_icon_visible" mtime="1540327262" type="bool" value="true"/>
                        </dir>
                </dir>
        </dir>
        <dir name="desktop">
                <dir name="gnome">
                        <dir name="sound">
-                               <entry name="theme_name" mtime="1540310730" type="string">
+                               <entry name="theme_name" mtime="1540327262" type="string">
                                        <stringvalue>LinuxMint</stringvalue>
                                </entry>
                        </dir>
                        <dir name="shell">
                                <dir name="windows">
-                                       <entry name="button_layout" mtime="1540310731" type="string">
+                                       <entry name="button_layout" mtime="1540327263" type="string">
                                                <stringvalue>:minimize,maximize,close</stringvalue>
                                        </entry>
                                </dir>
                                        <entry name="enabled" mtime="1505385868" schema="/schemas/desktop/gnome/url-handlers/vnclicenseserver/enabled"/>
                                </dir>
                                <dir name="mailto">
-                                       <entry name="command" mtime="1540310731" type="string">
+                                       <entry name="command" mtime="1540327263" type="string">
                                                <stringvalue>thunderbird %s</stringvalue>
                                        </entry>
                                </dir>
                        </dir>
                        <dir name="interface">
-                               <entry name="menus_have_icons" mtime="1540310731" type="bool" value="true"/>
-                               <entry name="icon_theme" mtime="1540310730" type="string">
+                               <entry name="menus_have_icons" mtime="1540327263" type="bool" value="true"/>
+                               <entry name="icon_theme" mtime="1540327262" type="string">
                                        <stringvalue>Mint-X</stringvalue>
                                </entry>
-                               <entry name="gtk_theme" mtime="1540310730" type="string">
+                               <entry name="gtk_theme" mtime="1540327262" type="string">
                                        <stringvalue>Mint-X</stringvalue>
                                </entry>
                        </dir>
                        <dir name="background">
-                               <entry name="color_shading_type" mtime="1540310730" type="string">
+                               <entry name="color_shading_type" mtime="1540327262" type="string">
                                        <stringvalue>solid</stringvalue>
                                </entry>
-                               <entry name="secondary_color" mtime="1540310730" type="string">
+                               <entry name="secondary_color" mtime="1540327262" type="string">
                                        <stringvalue>#000000000000</stringvalue>
                                </entry>
-                               <entry name="primary_color" mtime="1540310730" type="string">
+                               <entry name="primary_color" mtime="1540327262" type="string">
                                        <stringvalue>#000000000000</stringvalue>
                                </entry>
-                               <entry name="picture_options" mtime="1540310731" type="string">
+                               <entry name="picture_options" mtime="1540327263" type="string">
                                        <stringvalue>zoom</stringvalue>
                                </entry>
-                               <entry name="picture_filename" mtime="1540310730" type="string">
+                               <entry name="picture_filename" mtime="1540327262" type="string">
                                        <stringvalue>/usr/share/backgrounds/linuxmint/default_background.jpg</stringvalue>
                                </entry>
                        </dir>
                </dir>
                <dir name="linuxmint">
                        <dir name="terminal">
-                               <entry name="show_fortunes" mtime="1540310731" type="bool" value="false"/>
+                               <entry name="show_fortunes" mtime="1540327263" type="bool" value="false"/>
                        </dir>
                </dir>
                <dir name="cinnamon">
                        <dir name="windows">
-                               <entry name="theme" mtime="1540310731" type="string">
+                               <entry name="theme" mtime="1540327263" type="string">
                                        <stringvalue>Mint-X</stringvalue>
                                </entry>
                        </dir>
index 6a873f3fe8bbc30b8066c00b4dfe598db888b7d3..c35c05efff25acf2631612cbe3e753d9d3f29f1e 100644 (file)
@@ -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 3db77dca80d6c42234b2230bcb39c682fffa9d6c..e9f3d138739fa904f618be804ca2dd9b3265c2d7 100644 (file)
--- a/issue
+++ b/issue
@@ -1,2 +1,2 @@
-Linux Mint 18 Sarah \n \l
+Linux Mint 18.3 Sylvia \n \l
 
index 67af845b134dacad72301117bb1c21d24221ad2e..851f1e3c4a8f27c16cdfcade9d05b7cbc57cf63e 100644 (file)
--- 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 (file)
index 0000000..d4124d2
--- /dev/null
@@ -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 (file)
index 0000000..925e254
--- /dev/null
@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=cinnamon
\ No newline at end of file
index 03c5b5a4881cd75d3b9b56d0222b0aac9b82f4dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-/usr/share/linuxmint/common/artwork/mime/defaults.list /etc/gnome/defaults.list
index b817aafc8d97c3d854d83ccdf0c00aacf01b94c8..c41ff4e186bb28c979cf174302bf8f6a5eaa02fc 100755 (executable)
@@ -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"):
index 91331debe59fa60828605daa10a010649f6a9cec..fa920b97e85121fd765f5957a5cf9964db5d03c2 100644 (file)
@@ -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
index 4852eb501e6498e869fcae0d4ed97e9ccf98194f..24293b95fe30a5bb15b4c6a6deab9d64b739e83d 100644 (file)
@@ -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
index 2b08e8c805f432ebc77cfd20e767729345cdab40..b7e63abd9656c5a4b631771d5048a547ac62142b 100644 (file)
@@ -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 edf16c34651750e3d7e9a12ebe4eba1c0e1234d4..6b9e4f514ecb4698192d044a5a5e661ca4b290ae 100644 (file)
--- 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 (file)
index 0000000..ce183f5
--- /dev/null
@@ -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 (file)
index 59fbe45..0000000
+++ /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 (file)
index 0000000..2ef93ce
--- /dev/null
@@ -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 (file)
index 0000000..0cb15c1
--- /dev/null
@@ -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 (file)
index 0000000..76f8aed
--- /dev/null
@@ -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 (file)
index 0000000..99998f2
--- /dev/null
@@ -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 (file)
index 0000000..79763b1
--- /dev/null
@@ -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 (file)
index 0000000..ec37731
--- /dev/null
@@ -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 (file)
index 0000000..d262ddd
--- /dev/null
@@ -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 (file)
index 0000000..ad5962d
--- /dev/null
@@ -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 (file)
index 0000000..84a531a
--- /dev/null
@@ -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 (file)
index 0000000..8e0d444
--- /dev/null
@@ -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 (file)
index 0000000..568aa12
--- /dev/null
@@ -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 (file)
index 0000000..9e278a9
--- /dev/null
@@ -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 (file)
index 0000000..6835e06
--- /dev/null
@@ -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 (file)
index 0000000..21e51b3
--- /dev/null
@@ -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 (file)
index 0000000..97c935b
--- /dev/null
@@ -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 (file)
index 0000000..6309f59
--- /dev/null
@@ -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 (file)
index 0000000..a35756f
--- /dev/null
@@ -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 (file)
index 0000000..3faf034
--- /dev/null
@@ -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 (file)
index 0000000..c8321dd
--- /dev/null
@@ -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 (file)
index 0000000..dd1fe33
--- /dev/null
@@ -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 (file)
index 0000000..2e964b0
--- /dev/null
@@ -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
index d3a208735ad18c5f708ad6a0172f0a58ec3f5459..1c4a5dc4b36d48c5f7a17ccd41e88da286d1952e 100644 (file)
@@ -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
index 1e4410a0d264549fe14bae0aae59265179f6d975..caf60627d5d1305575988d0658a17a27e306b9df 100644 (file)
@@ -6,11 +6,6 @@
   <Name>Applications</Name>
   <Directory>cinnamon-menu-applications.directory</Directory>
 
-  <!-- Scan legacy dirs first, as later items take priority -->
-  <KDELegacyDirs/>
-  <LegacyDir>/etc/X11/applnk</LegacyDir>
-  <LegacyDir>/usr/share/cinnamon/apps</LegacyDir>
-
   <!-- Read standard .directory and .desktop file locations -->
   <DefaultAppDirs/>
   <DefaultDirectoryDirs/>