]> Frank Brehm's Git Trees - config/bruni/etc-mint-new1.git/commitdiff
committing changes in /etc after apt run
authorFrank Brehm <frank@brehm-online.com>
Sun, 3 May 2020 15:37:15 +0000 (17:37 +0200)
committerFrank Brehm <root@nadja.home.brehm-online.com>
Sun, 3 May 2020 15:37:15 +0000 (17:37 +0200)
Package changes:
+apache2-bin 2.4.29-1ubuntu4.13 amd64
+apt-config-icons 0.12.0-3ubuntu1 all
+baobab 3.28.0-1 amd64
+brasero-common 3.12.1-4ubuntu2 all
+caribou 0.4.21-5 amd64
+desktop-base 8.0.2ubuntu1 all
+dvd+rw-tools 7.1-12 amd64
+eog 3.28.1-1 amd64
+evince 3.28.4-0ubuntu1.2 amd64
+evince-common 3.28.4-0ubuntu1.2 all
+evolution 3.28.5-0ubuntu0.18.04.2 amd64
+evolution-common 3.28.5-0ubuntu0.18.04.2 all
+evolution-plugins 3.28.5-0ubuntu0.18.04.2 amd64
+file-roller 3.28.0-1ubuntu1.2 amd64
+folks-common 0.11.4-1ubuntu1 all
+fonts-cantarell 0.0.25-4 all
+gdm3 3.28.3-0ubuntu18.04.4 amd64
+gedit 3.28.1-1ubuntu1.2 amd64
+gedit-common 3.28.1-1ubuntu1.2 all
+gedit-plugin-bookmarks 3.28.1-1 amd64
+gedit-plugin-bracket-completion 3.28.1-1 amd64
+gedit-plugin-character-map 3.28.1-1 amd64
+gedit-plugin-code-comment 3.28.1-1 amd64
+gedit-plugin-color-picker 3.28.1-1 amd64
+gedit-plugin-color-schemer 3.28.1-1 amd64
+gedit-plugin-commander 3.28.1-1 amd64
+gedit-plugin-dashboard 3.28.1-1 amd64
+gedit-plugin-draw-spaces 3.28.1-1 amd64
+gedit-plugin-find-in-files 3.28.1-1 amd64
+gedit-plugin-git 3.28.1-1 amd64
+gedit-plugin-join-lines 3.28.1-1 amd64
+gedit-plugin-multi-edit 3.28.1-1 amd64
+gedit-plugin-smart-spaces 3.28.1-1 amd64
+gedit-plugin-synctex 3.28.1-1 amd64
+gedit-plugin-terminal 3.28.1-1 amd64
+gedit-plugin-translate 3.28.1-1 amd64
+gedit-plugin-word-completion 3.28.1-1 amd64
+gedit-plugin-zeitgeist 3.28.1-1 amd64
+gedit-plugins 3.28.1-1 all
+gedit-plugins-common 3.28.1-1 amd64
+gir1.2-caribou-1.0 0.4.21-5 amd64
+gir1.2-champlain-0.12 0.12.16-2 amd64
+gir1.2-clutter-1.0 1.26.2+dfsg-4 amd64
+gir1.2-clutter-gst-3.0 3.0.26-1 amd64
+gir1.2-cogl-1.0 1.22.2-3ubuntu1 amd64
+gir1.2-coglpango-1.0 1.22.2-3ubuntu1 amd64
+gir1.2-evince-3.0 3.28.4-0ubuntu1.2 amd64
+gir1.2-gck-1 3.28.0-1 amd64
+gir1.2-gcr-3 3.28.0-1 amd64
+gir1.2-gdata-0.0 0.17.9-2 amd64
+gir1.2-gdesktopenums-3.0 3.28.0-1ubuntu1 amd64
+gir1.2-gdm-1.0 3.28.3-0ubuntu18.04.4 amd64
+gir1.2-geoclue-2.0 2.4.7-1ubuntu1 amd64
+gir1.2-geocodeglib-1.0 3.25.4.1-4ubuntu0.18.04.1 amd64
+gir1.2-gepub-0.6 0.6.0-1 amd64
+gir1.2-gfbgraph-0.2 0.2.3-2 amd64
+gir1.2-ggit-1.0 0.26.2-1 amd64
+gir1.2-gmenu-3.0 3.13.3-11ubuntu1.1 amd64
+gir1.2-gnomedesktop-3.0 3.28.2-0ubuntu1.5 amd64
+gir1.2-goa-1.0 3.28.0-0ubuntu2mint1 amd64
+gir1.2-grilo-0.3 0.3.4-1 amd64
+gir1.2-gtkchamplain-0.12 0.12.16-2 amd64
+gir1.2-gtkclutter-1.0 1.8.4-3 amd64
+gir1.2-gucharmap-2.90 1:10.0.4-1 amd64
+gir1.2-gweather-3.0 3.28.2-1~ubuntu18.04.1 amd64
+gir1.2-mediaart-2.0 1.9.4-1 amd64
+gir1.2-mutter-2 3.28.4-0ubuntu18.04.2 amd64
+gir1.2-nm-1.0 1.10.6-2ubuntu1.4 amd64
+gir1.2-nma-1.0 1.8.10-2ubuntu3mint1 amd64
+gir1.2-rest-0.7 0.8.0-2 amd64
+gir1.2-rsvg-2.0 2.40.20-2 amd64
+gir1.2-totem-1.0 3.26.0-0ubuntu6.2 amd64
+gir1.2-totemplparser-1.0 3.26.0-1ubuntu2 amd64
+gir1.2-tracker-2.0 2.0.3-1ubuntu4 amd64
+gir1.2-zeitgeist-2.0 1.0-0.1ubuntu1 amd64
+gir1.2-zpj-0.0 0.0.3-4 amd64
+gjs 1.52.5-0ubuntu18.04.1 amd64
+gnome 1:3.22+9 amd64
+gnome-backgrounds 3.28.0-1 all
+gnome-calendar 3.28.2-0ubuntu0.18.04.1mint1+tessa amd64
+gnome-characters 3.28.2-0ubuntu1 amd64
+gnome-clocks 3.28.0-1 amd64
+gnome-color-manager 3.28.0-1 amd64
+gnome-contacts 3.28.1-0ubuntu1 amd64
+gnome-control-center 1:3.28.2-0ubuntu0.18.04.6 amd64
+gnome-control-center-data 1:3.28.2-0ubuntu0.18.04.6 all
+gnome-core 1:3.22+9 amd64
+gnome-documents 3.28.0-1 amd64
+gnome-font-viewer 3.28.0-1 amd64
+gnome-getting-started-docs 3.28.2-0ubuntu0.1 all
+gnome-logs 3.28.0-1linuxmint1 amd64
+gnome-maps 3.28.1-1 amd64
+gnome-menus 3.13.3-11ubuntu1.1 amd64
+gnome-music 3.28.1-1 amd64
+gnome-online-accounts 3.28.0-0ubuntu2mint1 amd64
+gnome-online-miners 3.26.0-3 amd64
+gnome-screenshot 3.25.0-1linuxmint3 amd64
+gnome-session 3.28.1-0ubuntu3 amd64
+gnome-session-bin 3.28.1-0ubuntu3 amd64
+gnome-session-common 3.28.1-0ubuntu3 all
+gnome-settings-daemon 3.28.1-0ubuntu1.3 amd64
+gnome-shell 3.28.4-0ubuntu18.04.3 amd64
+gnome-shell-common 3.28.4-0ubuntu18.04.3 all
+gnome-shell-extensions 3.28.0-2 all
+gnome-software 3.28.1-0ubuntu4.18.04.15 amd64
+gnome-software-common 3.28.1-0ubuntu4.18.04.15 all
+gnome-sound-recorder 3.28.1-1 amd64
+gnome-sushi 3.24.0-3 amd64
+gnome-system-monitor 3.28.2-0ubuntu1 amd64
+gnome-terminal 3.28.1-1ubuntu1mint2 amd64
+gnome-terminal-data 3.28.1-1ubuntu1mint2 all
+gnome-todo 3.28.1-1 amd64
+gnome-todo-common 3.28.1-1 all
+gnome-tweaks 3.28.1-1 all
+gnome-user-docs 3.28.2+git20180715-0ubuntu0.1 all
+gnome-user-share 3.18.3-3 amd64
+gnome-weather 3.26.0-4 all
+grilo-plugins-0.3 0.3.5-1ubuntu1 all
+grilo-plugins-0.3-base 0.3.5-1ubuntu1 amd64
+grilo-plugins-0.3-extra 0.3.5-1ubuntu1 amd64
+inkscape 0.92.3-1 amd64
+language-selector-common 0.188.3 all
+language-selector-gnome 0.188.3 all
+libapache2-mod-dnssd 0.6-3.2 amd64
+libapr1 1.6.3-2 amd64
+libaprutil1 1.6.1-2 amd64
+libaprutil1-dbd-sqlite3 1.6.1-2 amd64
+libaprutil1-ldap 1.6.1-2 amd64
+libavahi-gobject0 0.7-3.1ubuntu1.2 amd64
+libavahi-ui-gtk3-0 0.7-3.1ubuntu1.2 amd64
+libbrasero-media3-1 3.12.1-4ubuntu2 amd64
+libburn4 1.4.8-1 amd64
+libcaribou-common 0.4.21-5 all
+libcaribou0 0.4.21-5 amd64
+libcolord-gtk1 0.1.26-2 amd64
+libdazzle-1.0-0 3.28.1-1 amd64
+libedataserverui-1.2-2 3.28.5-0ubuntu0.18.04.2 amd64
+libevdocument3-4 3.28.4-0ubuntu1.2 amd64
+libevolution 3.28.5-0ubuntu0.18.04.2 amd64
+libevview3-3 3.28.4-0ubuntu1.2 amd64
+libfolks-eds25 0.11.4-1ubuntu1 amd64
+libfolks25 0.11.4-1ubuntu1 amd64
+libfreerdp2-2 2.0.0~git20170725.1.1648deb+dfsg1-7ubuntu0.1 amd64
+libgdm1 3.28.3-0ubuntu18.04.4 amd64
+libgepub-0.6-0 0.6.0-1 amd64
+libgexiv2-2 0.10.8-1 amd64
+libgfbgraph-0.2-0 0.2.3-2 amd64
+libgit2-26 0.26.0+dfsg.1-1.1ubuntu0.2 amd64
+libgit2-glib-1.0-0 0.26.2-1 amd64
+libgjs0g 1.52.5-0ubuntu18.04.1 amd64
+libgnome-autoar-gtk-0-0 0.2.3-1 amd64
+libgnome-menu-3-0 3.13.3-11ubuntu1.1 amd64
+libgnome-todo 3.28.1-1 amd64
+libgoa-backend-1.0-1 3.28.0-0ubuntu2mint1 amd64
+libgom-1.0-0 0.3.3-4 amd64
+libgsf-1-114 1.14.41-2 amd64
+libgsf-1-common 1.14.41-2 all
+libgsf-bin 1.14.41-2 amd64
+libgsl23 2.4+dfsg-6 amd64
+libgslcblas0 2.4+dfsg-6 amd64
+libgsound0 1.0.2-2 amd64
+libgtk-vnc-2.0-0 0.7.2-1 amd64
+libgtkspell0 2.0.16-1.2 amd64
+libgtkspell3-3-0 3.0.9-2 amd64
+libgupnp-av-1.0-2 0.12.10-1 amd64
+libgupnp-dlna-2.0-3 0.10.5-3 amd64
+libgvnc-1.0-0 0.7.2-1 amd64
+libhttp-parser2.7.1 2.7.1-2 amd64
+libisofs6 1.4.8-1 amd64
+libjte1 1.20-2ubuntu2 amd64
+liblua5.3-0 5.3.3-1ubuntu0.18.04.1 amd64
+libmagick++-6.q16-7 8:6.9.7.4+dfsg-16ubuntu6.8 amd64
+libmediaart-2.0-0 1.9.4-1 amd64
+libmozjs-52-0 52.9.1-0ubuntu0.18.04.1 amd64
+libmusicbrainz5-2 5.1.0+git20150707-7 amd64
+libmusicbrainz5cc2v5 5.1.0+git20150707-7 amd64
+libmutter-2-0 3.28.4-0ubuntu18.04.2 amd64
+libphodav-2.0-0 2.2-2 amd64
+libphodav-2.0-common 2.2-2 all
+libpotrace0 1.14-2 amd64
+libquvi-0.9-0.9.3 0.9.3-1.2 amd64
+libquvi-scripts-0.9 0.9.20131130-1.1 all
+librygel-core-2.6-2 0.36.1-1 amd64
+librygel-db-2.6-2 0.36.1-1 amd64
+librygel-renderer-2.6-2 0.36.1-1 amd64
+librygel-renderer-gst-2.6-2 0.36.1-1 amd64
+librygel-server-2.6-2 0.36.1-1 amd64
+libspice-client-glib-2.0-8 0.34-1.1build1 amd64
+libspice-client-gtk-3.0-5 0.34-1.1build1 amd64
+libtotem-plparser-videosite 3.26.0-1ubuntu2 amd64
+libtotem0 3.26.0-0ubuntu6.2 amd64
+libtracker-control-2.0-0 2.0.3-1ubuntu4 amd64
+libtracker-miner-2.0-0 2.0.3-1ubuntu4 amd64
+libusbredirhost1 0.7.1-1 amd64
+libwhoopsie-preferences0 0.19 amd64
+libwinpr2-2 2.0.0~git20170725.1.1648deb+dfsg1-7ubuntu0.1 amd64
+libxcb-res0 1.13-2~ubuntu18.04 amd64
+libytnef0 1.9.2-2 amd64
+libzapojit-0.0-0 0.0.3-4 amd64
+lua-bitop 1.0.2-5 amd64
+lua-expat 1.3.0-4 amd64
+lua-json 1.3.3-2 all
+lua-lpeg 1.0.0-2ubuntu0.18.04.1 amd64
+lua-socket 3.0~rc1+git+ac3201d-4 amd64
+mutter 3.28.4-0ubuntu18.04.2 amd64
+mutter-common 3.28.4-0ubuntu18.04.2 all
+nautilus-sendto 3.8.6-2 amd64
+python3-macaroonbakery 1.1.3-1 all
+python3-nacl 1.1.2-1build1 amd64
+python3-protobuf 3.0.0-9.1ubuntu1 amd64
+python3-pymacaroons 0.13.0-1 all
+python3-rfc3339 1.0-4 all
+rhythmbox-plugin-cdrecorder 3.4.2-4ubuntu1 amd64
+rygel 0.36.1-1 amd64
+rygel-playbin 0.36.1-1 amd64
+rygel-tracker 0.36.1-1 amd64
-sessioninstaller 0.20+bzr150-0ubuntu4.1 all
+shotwell 0.28.4-0ubuntu1 amd64
+shotwell-common 0.28.4-0ubuntu1 all
+software-properties-gtk 1.9.5 all
+spice-client-glib-usb-acl-helper 0.34-1.1build1 amd64
+totem 3.26.0-0ubuntu6.2 amd64
+totem-common 3.26.0-0ubuntu6.2 all
+totem-plugins 3.26.0-0ubuntu6.2 amd64
+tracker 2.0.3-1ubuntu4 amd64
+ubuntu-docs 18.04.4 all
+ubuntu-wallpapers 18.04.1-0ubuntu1 all
+ubuntu-wallpapers-bionic 18.04.1-0ubuntu1 all
+vinagre 3.22.0-5 amd64
+vino 3.22.0-3ubuntu1 amd64
+whoopsie-preferences 0.19 amd64

98 files changed:
.etckeeper
X11/Xsession.d/55gnome-session_gnomerc [new file with mode: 0644]
alternatives/desktop-background [new symlink]
alternatives/desktop-background.xml [new symlink]
alternatives/desktop-grub [new symlink]
alternatives/desktop-splash [new symlink]
alternatives/gdm3.css [new symlink]
alternatives/gnome-text-editor [new symlink]
alternatives/gnome-text-editor.1.gz [new symlink]
alternatives/x-terminal-emulator
alternatives/x-terminal-emulator.1.gz
apache2/mods-available/dnssd.conf [new file with mode: 0644]
apache2/mods-available/dnssd.load [new file with mode: 0644]
apparmor.d/abstractions/evince [new file with mode: 0644]
apparmor.d/local/usr.bin.evince [new file with mode: 0644]
apparmor.d/usr.bin.evince [new file with mode: 0644]
apt/apt.conf.d/60icons [new file with mode: 0644]
dbus-1/system.d/com.ubuntu.LanguageSelector.conf [new file with mode: 0644]
dbus-1/system.d/com.ubuntu.WhoopsiePreferences.conf [new file with mode: 0644]
dbus-1/system.d/gdm.conf [new file with mode: 0644]
default/kdm.d/10_desktop-base [new file with mode: 0644]
fonts/conf.avail/30-cjk-aliases.conf [new file with mode: 0644]
fonts/conf.avail/64-language-selector-prefer.conf [new file with mode: 0644]
fonts/conf.avail/69-language-selector-ja.conf [new file with mode: 0644]
fonts/conf.avail/69-language-selector-zh-cn.conf [new file with mode: 0644]
fonts/conf.avail/69-language-selector-zh-hk.conf [new file with mode: 0644]
fonts/conf.avail/69-language-selector-zh-mo.conf [new file with mode: 0644]
fonts/conf.avail/69-language-selector-zh-sg.conf [new file with mode: 0644]
fonts/conf.avail/69-language-selector-zh-tw.conf [new file with mode: 0644]
fonts/conf.avail/99-language-selector-zh.conf [new file with mode: 0644]
fonts/conf.d/30-cjk-aliases.conf [new symlink]
fonts/conf.d/31-cantarell.conf [new symlink]
fonts/conf.d/64-language-selector-prefer.conf [new symlink]
fonts/conf.d/69-language-selector-ja.conf [new symlink]
fonts/conf.d/69-language-selector-zh-cn.conf [new symlink]
fonts/conf.d/69-language-selector-zh-hk.conf [new symlink]
fonts/conf.d/69-language-selector-zh-mo.conf [new symlink]
fonts/conf.d/69-language-selector-zh-sg.conf [new symlink]
fonts/conf.d/69-language-selector-zh-tw.conf [new symlink]
fonts/conf.d/99-language-selector-zh.conf [new symlink]
gdm3/Init/Default [new file with mode: 0755]
gdm3/PostLogin/Default.sample [new file with mode: 0755]
gdm3/PostSession/Default [new file with mode: 0755]
gdm3/PreSession/Default [new file with mode: 0755]
gdm3/Prime/Default [new file with mode: 0755]
gdm3/PrimeOff/Default [new file with mode: 0755]
gdm3/Xsession [new file with mode: 0755]
gdm3/config-error-dialog.sh [new file with mode: 0644]
gdm3/custom.conf [new file with mode: 0644]
gdm3/greeter.dconf-defaults [new file with mode: 0644]
gnome/menus.blacklist [new file with mode: 0644]
group
group-
gshadow
gshadow-
init.d/gdm3 [new file with mode: 0755]
insserv.conf.d/gdm3 [new file with mode: 0644]
mailcap
pam.d/gdm-autologin [new file with mode: 0644]
pam.d/gdm-fingerprint [new file with mode: 0644]
pam.d/gdm-launch-environment [new file with mode: 0644]
pam.d/gdm-password [new file with mode: 0644]
passwd
passwd-
profile.d/cedilla-portuguese.sh [new file with mode: 0644]
profile.d/xdg_dirs_desktop_session.sh [new file with mode: 0644]
rc0.d/K01gdm3 [new symlink]
rc1.d/K01gdm3 [new symlink]
rc2.d/S01gdm3 [new symlink]
rc3.d/S01gdm3 [new symlink]
rc4.d/S01gdm3 [new symlink]
rc5.d/S01gdm3 [new symlink]
rc6.d/K01gdm3 [new symlink]
rygel.conf [new file with mode: 0644]
shadow
shadow-
xdg/autostart/caribou-autostart.desktop [new file with mode: 0644]
xdg/autostart/gnome-software-service.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.Evolution-alarm-notify.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Color.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Power.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop [new file with mode: 0644]
xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop [new file with mode: 0644]
xdg/autostart/tracker-store.desktop [new file with mode: 0644]
xdg/menus/gnome-applications.menu [new file with mode: 0644]

index 8fa9628540cb4a205a106d36cbfadce1d7a29f9b..9da11258c7a89c12380f2260eedfb7a7dcde32a6 100755 (executable)
@@ -124,6 +124,7 @@ maybe chmod 0644 'X11/Xsession.d/30x11-common_xresources'
 maybe chmod 0644 'X11/Xsession.d/35x11-common_xhost-local'
 maybe chmod 0644 'X11/Xsession.d/40x11-common_xsessionrc'
 maybe chmod 0644 'X11/Xsession.d/50x11-common_determine-startup'
+maybe chmod 0644 'X11/Xsession.d/55gnome-session_gnomerc'
 maybe chmod 0644 'X11/Xsession.d/55numlockx'
 maybe chmod 0644 'X11/Xsession.d/60x11-common_localhost'
 maybe chmod 0644 'X11/Xsession.d/60x11-common_xdg_path'
@@ -218,6 +219,9 @@ maybe chmod 0644 'anacrontab'
 maybe chmod 0755 'apache2'
 maybe chmod 0755 'apache2/conf-available'
 maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
+maybe chmod 0755 'apache2/mods-available'
+maybe chmod 0644 'apache2/mods-available/dnssd.conf'
+maybe chmod 0644 'apache2/mods-available/dnssd.load'
 maybe chmod 0644 'apg.conf'
 maybe chmod 0755 'apm'
 maybe chmod 0755 'apm/event.d'
@@ -254,6 +258,7 @@ maybe chmod 0644 'apparmor.d/abstractions/dbus-strict'
 maybe chmod 0644 'apparmor.d/abstractions/dconf'
 maybe chmod 0644 'apparmor.d/abstractions/dovecot-common'
 maybe chmod 0644 'apparmor.d/abstractions/enchant'
+maybe chmod 0644 'apparmor.d/abstractions/evince'
 maybe chmod 0644 'apparmor.d/abstractions/fcitx'
 maybe chmod 0644 'apparmor.d/abstractions/fcitx-strict'
 maybe chmod 0644 'apparmor.d/abstractions/fonts'
@@ -337,6 +342,7 @@ maybe chmod 0644 'apparmor.d/lightdm-guest-session'
 maybe chmod 0755 'apparmor.d/local'
 maybe chmod 0644 'apparmor.d/local/README'
 maybe chmod 0644 'apparmor.d/local/sbin.dhclient'
+maybe chmod 0644 'apparmor.d/local/usr.bin.evince'
 maybe chmod 0644 'apparmor.d/local/usr.bin.firefox'
 maybe chmod 0644 'apparmor.d/local/usr.bin.man'
 maybe chmod 0644 'apparmor.d/local/usr.lib.libreoffice.program.oosplash'
@@ -370,6 +376,7 @@ maybe chmod 0644 'apparmor.d/tunables/sys'
 maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs'
 maybe chmod 0755 'apparmor.d/tunables/xdg-user-dirs.d'
 maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs.d/site.local'
+maybe chmod 0644 'apparmor.d/usr.bin.evince'
 maybe chmod 0644 'apparmor.d/usr.bin.firefox'
 maybe chmod 0644 'apparmor.d/usr.bin.man'
 maybe chmod 0644 'apparmor.d/usr.lib.libreoffice.program.oosplash'
@@ -413,6 +420,7 @@ maybe chmod 0644 'apt/apt.conf.d/20dbus'
 maybe chmod 0644 'apt/apt.conf.d/20packagekit'
 maybe chmod 0644 'apt/apt.conf.d/50appstream'
 maybe chmod 0644 'apt/apt.conf.d/50command-not-found'
+maybe chmod 0644 'apt/apt.conf.d/60icons'
 maybe chmod 0644 'apt/apt.conf.d/70debconf'
 maybe chmod 0644 'apt/apt.conf.d/90mintsystem'
 maybe chmod 0644 'apt/apt.conf.d/99synaptic'
@@ -1050,8 +1058,11 @@ maybe chmod 0644 'dbus-1/system.d/bluetooth.conf'
 maybe chmod 0644 'dbus-1/system.d/com.hp.hplip.conf'
 maybe chmod 0644 'dbus-1/system.d/com.redhat.NewPrinterNotification.conf'
 maybe chmod 0644 'dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf'
+maybe chmod 0644 'dbus-1/system.d/com.ubuntu.LanguageSelector.conf'
 maybe chmod 0644 'dbus-1/system.d/com.ubuntu.SystemService.conf'
+maybe chmod 0644 'dbus-1/system.d/com.ubuntu.WhoopsiePreferences.conf'
 maybe chmod 0644 'dbus-1/system.d/dnsmasq.conf'
+maybe chmod 0644 'dbus-1/system.d/gdm.conf'
 maybe chmod 0644 'dbus-1/system.d/kerneloops.conf'
 maybe chmod 0644 'dbus-1/system.d/net.hadess.SensorProxy.conf'
 maybe chmod 0644 'dbus-1/system.d/nm-dispatcher.conf'
@@ -1112,6 +1123,8 @@ maybe chmod 0644 'default/hddtemp'
 maybe chmod 0644 'default/im-config'
 maybe chmod 0644 'default/intel-microcode'
 maybe chmod 0644 'default/irqbalance'
+maybe chmod 0755 'default/kdm.d'
+maybe chmod 0644 'default/kdm.d/10_desktop-base'
 maybe chmod 0644 'default/kerneloops'
 maybe chmod 0644 'default/keyboard'
 maybe chmod 0644 'default/locale'
@@ -1278,6 +1291,7 @@ maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-sans.conf'
 maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-serif.conf'
 maybe chmod 0644 'fonts/conf.avail/20-unhint-small-vera.conf'
 maybe chmod 0644 'fonts/conf.avail/25-unhint-nonlatin.conf'
+maybe chmod 0644 'fonts/conf.avail/30-cjk-aliases.conf'
 maybe chmod 0644 'fonts/conf.avail/30-droid-noto-mono.conf'
 maybe chmod 0644 'fonts/conf.avail/30-droid-noto.conf'
 maybe chmod 0644 'fonts/conf.avail/30-metric-aliases.conf'
@@ -1297,6 +1311,7 @@ maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-serif.conf'
 maybe chmod 0644 'fonts/conf.avail/59-lohit-devanagari.conf'
 maybe chmod 0644 'fonts/conf.avail/60-generic.conf'
 maybe chmod 0644 'fonts/conf.avail/60-latin.conf'
+maybe chmod 0644 'fonts/conf.avail/64-language-selector-prefer.conf'
 maybe chmod 0644 'fonts/conf.avail/65-0-fonts-beng-extra.conf'
 maybe chmod 0644 'fonts/conf.avail/65-0-fonts-deva-extra.conf'
 maybe chmod 0644 'fonts/conf.avail/65-0-fonts-gubbi.conf'
@@ -1333,12 +1348,19 @@ maybe chmod 0644 'fonts/conf.avail/67-smc-keraleeyam.conf'
 maybe chmod 0644 'fonts/conf.avail/67-smc-raghumalayalamsans.conf'
 maybe chmod 0644 'fonts/conf.avail/67-smc-suruma.conf'
 maybe chmod 0644 'fonts/conf.avail/67-smc-uroob.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-ja.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-cn.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-hk.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-mo.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-sg.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-tw.conf'
 maybe chmod 0644 'fonts/conf.avail/69-unifont.conf'
 maybe chmod 0644 'fonts/conf.avail/70-force-bitmaps.conf'
 maybe chmod 0644 'fonts/conf.avail/70-no-bitmaps.conf'
 maybe chmod 0644 'fonts/conf.avail/70-yes-bitmaps.conf'
 maybe chmod 0644 'fonts/conf.avail/80-delicious.conf'
 maybe chmod 0644 'fonts/conf.avail/90-synthetic.conf'
+maybe chmod 0644 'fonts/conf.avail/99-language-selector-zh.conf'
 maybe chmod 0755 'fonts/conf.d'
 maybe chmod 0644 'fonts/conf.d/65-khmer.conf'
 maybe chmod 0644 'fonts/conf.d/README'
@@ -1367,6 +1389,23 @@ maybe chmod 0755 'gconf/gconf.xml.mandatory'
 maybe chmod 0644 'gconf/gconf.xml.mandatory/%gconf-tree.xml'
 maybe chmod 0755 'gdb'
 maybe chmod 0644 'gdb/gdbinit'
+maybe chmod 0755 'gdm3'
+maybe chmod 0755 'gdm3/Init'
+maybe chmod 0755 'gdm3/Init/Default'
+maybe chmod 0755 'gdm3/PostLogin'
+maybe chmod 0755 'gdm3/PostLogin/Default.sample'
+maybe chmod 0755 'gdm3/PostSession'
+maybe chmod 0755 'gdm3/PostSession/Default'
+maybe chmod 0755 'gdm3/PreSession'
+maybe chmod 0755 'gdm3/PreSession/Default'
+maybe chmod 0755 'gdm3/Prime'
+maybe chmod 0755 'gdm3/Prime/Default'
+maybe chmod 0755 'gdm3/PrimeOff'
+maybe chmod 0755 'gdm3/PrimeOff/Default'
+maybe chmod 0755 'gdm3/Xsession'
+maybe chmod 0644 'gdm3/config-error-dialog.sh'
+maybe chmod 0644 'gdm3/custom.conf'
+maybe chmod 0644 'gdm3/greeter.dconf-defaults'
 maybe chmod 0755 'geoclue'
 maybe chmod 0644 'geoclue/geoclue.conf'
 maybe chmod 0755 'ghostscript'
@@ -1401,6 +1440,7 @@ maybe chmod 0755 'gnome-vfs-2.0'
 maybe chmod 0755 'gnome-vfs-2.0/modules'
 maybe chmod 0644 'gnome-vfs-2.0/modules/default-modules.conf'
 maybe chmod 0644 'gnome/defaults.list'
+maybe chmod 0644 'gnome/menus.blacklist'
 maybe chmod 0755 'groff'
 maybe chmod 0644 'groff/man.local'
 maybe chmod 0644 'groff/mdoc.local'
@@ -1720,6 +1760,7 @@ maybe chmod 0755 'init.d/cups-browsed'
 maybe chmod 0755 'init.d/dbus'
 maybe chmod 0755 'init.d/dns-clean'
 maybe chmod 0755 'init.d/ebtables'
+maybe chmod 0755 'init.d/gdm3'
 maybe chmod 0755 'init.d/grub-common'
 maybe chmod 0755 'init.d/hddtemp'
 maybe chmod 0755 'init.d/hwclock.sh'
@@ -1777,6 +1818,7 @@ maybe chmod 0644 'initramfs-tools/update-initramfs.conf'
 maybe chmod 0644 'inputrc'
 maybe chmod 0755 'insserv.conf.d'
 maybe chmod 0644 'insserv.conf.d/bind9'
+maybe chmod 0644 'insserv.conf.d/gdm3'
 maybe chmod 0644 'insserv.conf.d/postfix'
 maybe chmod 0644 'inxi.conf'
 maybe chmod 0755 'iproute2'
@@ -2047,6 +2089,10 @@ maybe chmod 0644 'pam.d/common-session'
 maybe chmod 0644 'pam.d/common-session-noninteractive'
 maybe chmod 0644 'pam.d/cron'
 maybe chmod 0644 'pam.d/cups'
+maybe chmod 0644 'pam.d/gdm-autologin'
+maybe chmod 0644 'pam.d/gdm-fingerprint'
+maybe chmod 0644 'pam.d/gdm-launch-environment'
+maybe chmod 0644 'pam.d/gdm-password'
 maybe chmod 0644 'pam.d/lightdm'
 maybe chmod 0644 'pam.d/lightdm-autologin'
 maybe chmod 0644 'pam.d/lightdm-greeter'
@@ -2164,12 +2210,14 @@ maybe chmod 0755 'profile.d'
 maybe chmod 0644 'profile.d/01-locale-fix.sh'
 maybe chmod 0644 'profile.d/Z97-byobu.sh'
 maybe chmod 0644 'profile.d/bash_completion.sh'
+maybe chmod 0644 'profile.d/cedilla-portuguese.sh'
 maybe chown 'frank' 'profile.d/fbrehm.sh'
 maybe chgrp 'users' 'profile.d/fbrehm.sh'
 maybe chmod 0644 'profile.d/fbrehm.sh'
 maybe chmod 0644 'profile.d/flatpak.sh'
 maybe chmod 0644 'profile.d/input-method-config.sh'
 maybe chmod 0644 'profile.d/vte-2.91.sh'
+maybe chmod 0644 'profile.d/xdg_dirs_desktop_session.sh'
 maybe chmod 0644 'protocols'
 maybe chmod 0755 'pulse'
 maybe chmod 0644 'pulse/client.conf'
@@ -2210,6 +2258,7 @@ maybe chmod 0644 'rsyslog.d/20-ufw.conf'
 maybe chmod 0644 'rsyslog.d/50-default.conf'
 maybe chmod 0644 'rsyslog.d/70-fb.conf'
 maybe chmod 0644 'rsyslog.d/postfix.conf'
+maybe chmod 0644 'rygel.conf'
 maybe chmod 0644 's-nail.rc'
 maybe chmod 0755 'samba'
 maybe chmod 0644 'samba/gdbcommands'
@@ -2549,9 +2598,11 @@ maybe chmod 0755 'xdg/autostart'
 maybe chmod 0644 'xdg/autostart/at-spi-dbus-bus.desktop'
 maybe chmod 0644 'xdg/autostart/blueberry-obex-agent.desktop'
 maybe chmod 0644 'xdg/autostart/blueberry-tray.desktop'
+maybe chmod 0644 'xdg/autostart/caribou-autostart.desktop'
 maybe chmod 0644 'xdg/autostart/gnome-keyring-pkcs11.desktop'
 maybe chmod 0644 'xdg/autostart/gnome-keyring-secrets.desktop'
 maybe chmod 0644 'xdg/autostart/gnome-keyring-ssh.desktop'
+maybe chmod 0644 'xdg/autostart/gnome-software-service.desktop'
 maybe chmod 0644 'xdg/autostart/gsettings-data-convert.desktop'
 maybe chmod 0644 'xdg/autostart/indicator-application.desktop'
 maybe chmod 0644 'xdg/autostart/indicator-messages.desktop'
@@ -2569,15 +2620,35 @@ maybe chmod 0644 'xdg/autostart/nm-applet.desktop'
 maybe chmod 0644 'xdg/autostart/nvidia-prime.desktop'
 maybe chmod 0644 'xdg/autostart/onboard-autostart.desktop'
 maybe chmod 0644 'xdg/autostart/orca-autostart.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.Evolution-alarm-notify.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Color.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop'
 maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.DiskUtilityNotify.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Power.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop'
+maybe chmod 0644 'xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop'
 maybe chmod 0644 'xdg/autostart/polkit-gnome-authentication-agent-1.desktop'
 maybe chmod 0644 'xdg/autostart/polkit-mate-authentication-agent-1.desktop'
 maybe chmod 0644 'xdg/autostart/print-applet.desktop'
 maybe chmod 0644 'xdg/autostart/pulseaudio.desktop'
 maybe chmod 0644 'xdg/autostart/smart-notifier.desktop'
+maybe chmod 0644 'xdg/autostart/tracker-store.desktop'
 maybe chmod 0644 'xdg/autostart/user-dirs-update-gtk.desktop'
 maybe chmod 0644 'xdg/autostart/xdg-user-dirs.desktop'
 maybe chmod 0755 'xdg/menus'
+maybe chmod 0644 'xdg/menus/gnome-applications.menu'
 maybe chmod 0644 'xdg/menus/mate-applications.menu'
 maybe chmod 0644 'xdg/menus/mate-preferences-categories.menu'
 maybe chmod 0644 'xdg/menus/mate-screensavers.menu'
diff --git a/X11/Xsession.d/55gnome-session_gnomerc b/X11/Xsession.d/55gnome-session_gnomerc
new file mode 100644 (file)
index 0000000..57b945f
--- /dev/null
@@ -0,0 +1,23 @@
+# If we are running the GNOME session, source ~/.gnomerc
+
+BASESTARTUP=${STARTUP%% *}
+BASESTARTUP=${BASESTARTUP##*/}
+if [ "$BASESTARTUP" = x-session-manager ]; then
+    BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
+fi
+case "$BASESTARTUP" in
+  gnome-session*)
+    GNOMERC=$HOME/.gnomerc
+    if [ -r "$GNOMERC" ]; then
+      . "$GNOMERC"
+    fi
+    # We prepend /usr/share/gnome since its defaults.list actually points 
+    # to /etc so it is configurable.
+    if [ -z "$XDG_DATA_DIRS" ]; then
+      XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+    elif [ -n "${XDG_DATA_DIRS##*/usr/share/gnome*}" ]; then
+      XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+    fi
+    export XDG_DATA_DIRS
+    ;;
+esac
diff --git a/alternatives/desktop-background b/alternatives/desktop-background
new file mode 120000 (symlink)
index 0000000..b9d5245
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/images/desktop-base/lines-wallpaper_1920x1080.svg
\ No newline at end of file
diff --git a/alternatives/desktop-background.xml b/alternatives/desktop-background.xml
new file mode 120000 (symlink)
index 0000000..d707100
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/images/desktop-base/lines.xml
\ No newline at end of file
diff --git a/alternatives/desktop-grub b/alternatives/desktop-grub
new file mode 120000 (symlink)
index 0000000..aa84da8
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/images/desktop-base/lines-grub.png
\ No newline at end of file
diff --git a/alternatives/desktop-splash b/alternatives/desktop-splash
new file mode 120000 (symlink)
index 0000000..35a3b0d
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/images/desktop-base/spacefun-splash.svg
\ No newline at end of file
diff --git a/alternatives/gdm3.css b/alternatives/gdm3.css
new file mode 120000 (symlink)
index 0000000..ff9ffd1
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/gnome-shell/theme/ubuntu.css
\ No newline at end of file
diff --git a/alternatives/gnome-text-editor b/alternatives/gnome-text-editor
new file mode 120000 (symlink)
index 0000000..7a912e8
--- /dev/null
@@ -0,0 +1 @@
+/usr/bin/gedit
\ No newline at end of file
diff --git a/alternatives/gnome-text-editor.1.gz b/alternatives/gnome-text-editor.1.gz
new file mode 120000 (symlink)
index 0000000..b56d8f2
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/man/man1/gedit.1.gz
\ No newline at end of file
index 515f9eb808b20771bd1b4fe3d8031c83459621ea..c7472e90c5504f64da25db75937cef57f9323fb8 120000 (symlink)
@@ -1 +1 @@
-/usr/bin/mate-terminal.wrapper
\ No newline at end of file
+/usr/bin/gnome-terminal.wrapper
\ No newline at end of file
index ffb7dec0fa64ffad7fb51d1897bb3394bff3a222..8bf4292ea76e187c564694d32310e8aa52e4b6bd 120000 (symlink)
@@ -1 +1 @@
-/usr/share/man/man1/mate-terminal.1.gz
\ No newline at end of file
+/usr/share/man/man1/gnome-terminal.1.gz
\ No newline at end of file
diff --git a/apache2/mods-available/dnssd.conf b/apache2/mods-available/dnssd.conf
new file mode 100644 (file)
index 0000000..cfe8b9c
--- /dev/null
@@ -0,0 +1,6 @@
+# This is the config file for mod_dnssd.
+
+<IfModule mod_dnssd.c>
+       DNSSDEnable On
+</IfModule>
+
diff --git a/apache2/mods-available/dnssd.load b/apache2/mods-available/dnssd.load
new file mode 100644 (file)
index 0000000..bd6913b
--- /dev/null
@@ -0,0 +1 @@
+LoadModule dnssd_module /usr/lib/apache2/modules/mod_dnssd.so
diff --git a/apparmor.d/abstractions/evince b/apparmor.d/abstractions/evince
new file mode 100644 (file)
index 0000000..45d412f
--- /dev/null
@@ -0,0 +1,130 @@
+# vim:syntax=apparmor
+#
+# abstraction used by evince binaries
+#
+
+  #include <abstractions/gnome>
+  #include <abstractions/p11-kit>
+  #include <abstractions/ubuntu-helpers>
+
+  @{PROC}/[0-9]*/fd/ r,
+  @{PROC}/[0-9]*/mountinfo r,
+  owner @{PROC}/[0-9]*/auxv r,
+  owner @{PROC}/[0-9]*/status r,
+
+  # Doesn't seem to be required, but noisy. Maybe allow 'r' for 'b*' if needed.
+  # Possibly move to an abstraction if anything else needs it.
+  deny /run/udev/data/** r,
+
+  # move out to the gnome abstraction if anyone else needs these
+  /etc/udev/udev.conf r,
+  /sys/devices/**/block/**/uevent r,
+
+  # apport
+  /etc/default/apport r,
+
+  # XFCE
+  /etc/xfce4/defaults.list r,
+
+  # Lubuntu
+  /etc/xdg/lubuntu/applications/defaults.list r,
+
+  # evince specific
+  /etc/ r,
+  /etc/fstab r,
+  /etc/texmf/ r,
+  /etc/texmf/** r,
+  /etc/xpdf/* r,
+  owner @{HOME}/.config/evince/   rw,
+  owner @{HOME}/.config/evince/** rwkl,
+
+  /usr/bin/gs-esp ixr,
+  /usr/bin/mktexpk Cx -> sanitized_helper,
+  /usr/bin/mktextfm Cx -> sanitized_helper,
+  /usr/bin/dvipdfm Cx -> sanitized_helper,
+  /usr/bin/dvipdfmx Cx -> sanitized_helper,
+
+  # supported archivers
+  /{usr/,}bin/gzip ixr,
+  /{usr/,}bin/bzip2 ixr,
+  /usr/bin/unrar* ixr,
+  /usr/bin/unzip ixr,
+  /usr/bin/7zr ixr,
+  /usr/lib/p7zip/7zr ixr,
+  /usr/bin/7za ixr,
+  /usr/lib/p7zip/7za ixr,
+  /usr/bin/zipnote ixr,
+  /{usr/,}bin/tar ixr,
+  /usr/bin/xz ixr,
+
+  # allow read access to anything in /usr/share, for plugins and input methods
+  /usr/local/share/** r,
+  /usr/share/** r,
+  /usr/lib/ghostscript/** mr,
+  /var/lib/ghostscript/** r,
+  /var/lib/texmf/** r,
+
+  # from http://live.gnome.org/Evince/SupportedDocumentFormats. Allow
+  # read for all supported file formats
+  /**.[bB][mM][pP]     r,
+  /**.[dD][jJ][vV][uU] r,
+  /**.[dD][vV][iI]     r,
+  /**.[gG][iI][fF]     r,
+  /**.[jJ][pP][gG]     r,
+  /**.[jJ][pP][eE][gG] r,
+  /**.[oO][dD][pP]     r,
+  /**.[fFpP][dD][fF]   r,
+  /**.[pP][nN][mM]     r,
+  /**.[pP][nN][gG]     r,
+  /**.[pP][sS]         r,
+  /**.[eE][pP][sS]     r,
+  /**.[eE][pP][sS][fFiI23] r,
+  /**.[tT][iI][fF]     r,
+  /**.[tT][iI][fF][fF] r,
+  /**.[xX][pP][mM]     r,
+  /**.[gG][zZ]         r,
+  /**.[bB][zZ]2        r,
+  /**.[cC][bB][rRzZ7]  r,
+  /**.[xX][zZ]         r,
+
+  # Use abstractions/private-files instead of abstractions/private-files-strict
+  # and add the sensitive files manually to work around LP: #451422. The goal
+  # is to disallow access to the .mozilla folder in general, but to allow
+  # access to the Cache directory, which the browser may tell evince to open
+  # from directly.
+
+  #include <abstractions/private-files>
+  audit deny @{HOME}/.gnupg/{,**} mrwkl,
+  audit deny @{HOME}/.ssh/{,**} mrwkl,
+  audit deny @{HOME}/.gnome2_private/{,**} mrwkl,
+  audit deny @{HOME}/.gnome2/ w,
+  audit deny @{HOME}/.gnome2/keyrings/{,**} mrwkl,
+  audit deny @{HOME}/.kde/{,share/,share/apps/} w,
+  audit deny @{HOME}/.kde/share/apps/kwallet/{,**} mrwkl,
+  audit deny @{HOME}/.pki/{,nssdb/} w,
+  audit deny @{HOME}/.pki/nssdb/{,**} wl,
+
+  audit deny @{HOME}/.mozilla/{,**/} w,
+  audit deny @{HOME}/.mozilla/*/*/* mrwkl,
+  audit deny @{HOME}/.mozilla/**/bookmarkbackups/{,**} mrwkl,
+  audit deny @{HOME}/.mozilla/**/chrome/{,**} mrwkl,
+  audit deny @{HOME}/.mozilla/**/extensions/{,**} mrwkl,
+  audit deny @{HOME}/.mozilla/**/gm_scripts/{,**} mrwkl,
+
+  audit deny @{HOME}/.config/ w,
+  audit deny @{HOME}/.config/chromium/{,**} mrwkl,
+  audit deny @{HOME}/.config/evolution/{,**} mrwkl,
+  audit deny @{HOME}/.evolution/{,**} mrwkl,
+  audit deny @{HOME}/.kde/{,share/,share/apps/} w,
+  audit deny @{HOME}/.kde/share/config/{,**} mrwkl,
+  audit deny @{HOME}/.kde/share/apps/kmail/{,**} mrwkl,
+  audit deny @{HOME}/.{,mozilla-}thunderbird/{,**/} w,
+  audit deny @{HOME}/.{,mozilla-}thunderbird/*/* mrwkl,
+  audit deny @{HOME}/.{,mozilla-}thunderbird/*/[^C][^a][^c][^h][^e]*/{,**} mrwkl,
+
+  # When LP: #451422 is fixed, change the above to simply be:
+  ##include <abstractions/private-files-strict>
+  #owner @{HOME}/.mozilla/**/*Cache/* r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.evince>
diff --git a/apparmor.d/local/usr.bin.evince b/apparmor.d/local/usr.bin.evince
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/apparmor.d/usr.bin.evince b/apparmor.d/usr.bin.evince
new file mode 100644 (file)
index 0000000..1233adc
--- /dev/null
@@ -0,0 +1,322 @@
+# vim:syntax=apparmor
+
+# evince is not written with application confinement in mind and is designed to
+# operate within a trusted desktop session where anything running within the
+# user's session is trusted. That said, evince will often process untrusted
+# input (PDFs, images, etc). Ideally evince would be written in such a way that
+# image processing is separate from the main process and that processing
+# happens in a restrictive sandbox, but unfortunately that is not currently the
+# case. Because evince will process untrusted input, this profile aims to
+# provide some hardening, but considering evince's design and other factors such
+# as X, gsettings, accessibility, translations, DBus session and system
+# services, etc, complete confinement is not possible.
+
+#include <tunables/global>
+
+/usr/bin/evince {
+  #include <abstractions/audio>
+  #include <abstractions/bash>
+  #include <abstractions/cups-client>
+  #include <abstractions/dbus-accessibility>
+  #include <abstractions/evince>
+  #include <abstractions/ibus>
+  #include <abstractions/nameservice>
+
+  #include <abstractions/ubuntu-browsers>
+  #include <abstractions/ubuntu-console-browsers>
+  #include <abstractions/ubuntu-email>
+  #include <abstractions/ubuntu-console-email>
+  #include <abstractions/ubuntu-media-players>
+
+  # For now, let evince talk to any session services over dbus. We can
+  # blacklist any problematic ones (but note, evince uses libsecret :\)
+  #include <abstractions/dbus-session>
+
+  #include <abstractions/dbus-strict>
+  dbus (receive) bus=system,
+  # Allow getting information from various system services
+  dbus (send)
+      bus=system
+      member="Get*"
+      peer=(label=unconfined),
+  # Allow talking to avahi with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.Avahi{,.*}",
+  # Allow talking to colord with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.ColorManager{,.*}",
+
+  # Terminals for using console applications. These abstractions should ideally
+  # have 'ix' to restrict access to what only evince is allowed to do
+  #include <abstractions/ubuntu-gnome-terminal>
+
+  # By default, we won't support launching a terminal program in Xterm or
+  # KDE's konsole. It opens up too many unnecessary files for most users.
+  # People who need this functionality can uncomment the following:
+  ##include <abstractions/ubuntu-xterm>
+  ##include <abstractions/ubuntu-konsole>
+
+  /usr/bin/evince rmPx,
+  /usr/bin/evince-previewer Px,
+  /usr/bin/yelp Cx -> sanitized_helper,
+  /usr/bin/bug-buddy px,
+  # 'Show Containing Folder' (LP: #1022962)
+  /usr/bin/nautilus Cx -> sanitized_helper, # Gnome
+  /usr/bin/pcmanfm Cx -> sanitized_helper,  # LXDE
+  /usr/bin/krusader Cx -> sanitized_helper, # KDE
+  /usr/bin/thunar Cx -> sanitized_helper,   # XFCE
+
+  # For Xubuntu to launch the browser
+  /usr/bin/exo-open ixr,
+  /usr/lib/@{multiarch}/xfce4/exo-1/exo-helper-1 ixr,
+  /etc/xdg/xdg-xubuntu/xfce4/helpers.rc r,
+  /etc/xdg/xfce4/helpers.rc r,
+
+  # For text attachments
+  /usr/bin/gedit ixr,
+
+  # For Send to
+  /usr/bin/nautilus-sendto Cx -> sanitized_helper,
+
+  # GLib desktop launch helper (used under the hood by g_app_info_launch)
+  /usr/lib/@{multiarch}/glib-[0-9]*/gio-launch-desktop rmix,
+  /usr/bin/env ixr,
+
+  # allow directory listings (ie 'r' on directories) so browsing via the file
+  # dialog works
+  / r,
+  /**/ r,
+
+  # This is need for saving files in your home directory without an extension.
+  # Changing this to '@{HOME}/** r' makes it require an extension and more
+  # secure (but with 'rw', we still have abstractions/private-files-strict in
+  # effect).
+  owner @{HOME}/** rw,
+  owner /media/**  rw,
+  owner @{HOME}/.local/share/gvfs-metadata/** l,
+  owner /{,var/}run/user/*/gvfs-metadata/** l,
+
+  owner @{HOME}/.gnome2/evince/*       rwl,
+  owner @{HOME}/.gnome2/accels/        rw,
+  owner @{HOME}/.gnome2/accelsevince   rw,
+  owner @{HOME}/.gnome2/accels/evince  rw,
+
+  # Maybe add to an abstraction?
+  /etc/dconf/**                                       r,
+  owner @{HOME}/.cache/dconf/user                     rw,
+  owner @{HOME}/.config/dconf/user                    r,
+  owner /{,var/}run/user/*/dconf/                     w,
+  owner /{,var/}run/user/*/dconf/user                 rw,
+  owner /{,var/}run/user/*/dconf-service/keyfile/     w,
+  owner /{,var/}run/user/*/dconf-service/keyfile/user rw,
+
+  owner /{,var/}run/user/*/at-spi2-*/   rw,
+  owner /{,var/}run/user/*/at-spi2-*/** rw,
+
+  # from http://live.gnome.org/Evince/SupportedDocumentFormats. Allow
+  # read and write for all supported file formats
+  /**.[bB][mM][pP]     rw,
+  /**.[dD][jJ][vV][uU] rw,
+  /**.[dD][vV][iI]     rw,
+  /**.[gG][iI][fF]     rw,
+  /**.[jJ][pP][gG]     rw,
+  /**.[jJ][pP][eE][gG] rw,
+  /**.[oO][dD][pP]     rw,
+  /**.[fFpP][dD][fF]   rw,
+  /**.[pP][nN][mM]     rw,
+  /**.[pP][nN][gG]     rw,
+  /**.[pP][sS]         rw,
+  /**.[eE][pP][sS]     rw,
+  /**.[tT][iI][fF]     rw,
+  /**.[tT][iI][fF][fF] rw,
+  /**.[xX][pP][mM]     rw,
+  /**.[gG][zZ]         rw,
+  /**.[bB][zZ]2        rw,
+  /**.[cC][bB][rRzZ7]  rw,
+  /**.[xX][zZ]         rw,
+
+  # evince creates a temporary stream file like '.goutputstream-XXXXXX' in the
+  # directory a file is saved. This allows that behavior.
+  owner /**/.goutputstream-* w,
+}
+
+/usr/bin/evince-previewer {
+  #include <abstractions/audio>
+  #include <abstractions/bash>
+  #include <abstractions/cups-client>
+  #include <abstractions/dbus-accessibility>
+  #include <abstractions/evince>
+  #include <abstractions/ibus>
+  #include <abstractions/nameservice>
+
+  #include <abstractions/ubuntu-browsers>
+  #include <abstractions/ubuntu-console-browsers>
+  #include <abstractions/ubuntu-email>
+  #include <abstractions/ubuntu-console-email>
+  #include <abstractions/ubuntu-media-players>
+
+  # For now, let evince talk to any session services over dbus. We can
+  # blacklist any problematic ones (but note, evince uses libsecret :\)
+  #include <abstractions/dbus-session>
+
+  #include <abstractions/dbus-strict>
+  dbus (receive) bus=system,
+  # Allow getting information from various system services
+  dbus (send)
+      bus=system
+      member="Get*"
+      peer=(label=unconfined),
+  # Allow talking to avahi with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.Avahi{,.*}",
+  # Allow talking to colord with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.ColorManager{,.*}",
+
+
+  # Terminals for using console applications. These abstractions should ideally
+  # have 'ix' to restrict access to what only evince is allowed to do
+  #include <abstractions/ubuntu-gnome-terminal>
+
+  # By default, we won't support launching a terminal program in Xterm or
+  # KDE's konsole. It opens up too many unnecessary files for most users.
+  # People who need this functionality can uncomment the following:
+  ##include <abstractions/ubuntu-xterm>
+
+  /usr/bin/evince-previewer mr,
+  /usr/bin/yelp Cx -> sanitized_helper,
+  /usr/bin/bug-buddy px,
+
+  # Lenient, but remember we still have abstractions/private-files-strict in
+  # effect). Write is needed for 'print to file' from the previewer.
+  @{HOME}/ r,
+  @{HOME}/** rw,
+
+  # Maybe add to an abstraction?
+  owner /{,var/}run/user/*/dconf/          w,
+  owner /{,var/}run/user/*/dconf/user      rw,
+}
+
+/usr/bin/evince-thumbnailer {
+  #include <abstractions/base>
+  #include <abstractions/private-files-strict>
+
+  #include <abstractions/fonts>
+  deny @{HOME}/.{,cache/}fontconfig/** wl,
+  deny @{HOME}/missfont.log wl,
+
+  #include <abstractions/dbus-session-strict>
+  dbus (receive) bus=session,
+  dbus (send)
+    bus=session
+    path="/org/gtk/vfs/mounttracker"
+    interface="org.gtk.vfs.MountTracker"
+    member="ListMountableInfo"
+    peer=(label=unconfined),
+
+  # updating gvfs-metadata for thumbnails is unneeded, so explicitly deny it
+  deny dbus (send)
+    bus=session
+    path="/org/gtk/vfs/metadata"
+    interface="org.gtk.vfs.Metadata"
+    member="GetTreeFromDevice"
+    peer=(label=unconfined),
+  deny @{HOME}/.local/share/gvfs-metadata/* r,
+
+  # The thumbnailer doesn't need access to everything in the nameservice
+  # abstraction. Allow reading of /etc/passwd and /etc/group, but suppress
+  # logging denial of nsswitch.conf.
+  /etc/passwd r,
+  /etc/group r,
+  deny /etc/nsswitch.conf r,
+
+  # TCP/UDP network access for NFS
+  network inet  stream,
+  network inet6 stream,
+  network inet  dgram,
+  network inet6 dgram,
+
+  /etc/papersize r,
+
+  /usr/bin/evince-thumbnailer mr,
+
+  /etc/texmf/ r,
+  /etc/texmf/** r,
+  /etc/xpdf/* r,
+
+  /usr/bin/gs-esp ixr,
+  /usr/bin/mktexpk Cx -> sanitized_helper,
+  /usr/bin/mktextfm Cx -> sanitized_helper,
+  /usr/bin/dvipdfm Cx -> sanitized_helper,
+  /usr/bin/dvipdfmx Cx -> sanitized_helper,
+
+  # supported archivers
+  /{usr/,}bin/gzip ixr,
+  /{usr/,}bin/bzip2 ixr,
+  /usr/bin/unrar* ixr,
+  /usr/bin/unzip ixr,
+  /usr/bin/7zr ixr,
+  /usr/lib/p7zip/7zr ixr,
+  /usr/bin/7za ixr,
+  /usr/lib/p7zip/7za ixr,
+  /usr/bin/zipnote ixr,
+  /{usr/,}bin/tar ixr,
+  /usr/bin/xz ixr,
+
+  # miscellaneous access for the above
+  owner @{PROC}/@{pid}/fd/ r,
+  owner @{PROC}/@{pid}/mountinfo r,
+  /sys/devices/system/cpu/ r,
+
+  # allow read access to anything in /usr/share, for plugins and input methods
+  /usr/local/share/** r,
+  /usr/share/** r,
+  /usr/lib/ghostscript/** mr,
+  /var/lib/ghostscript/** r,
+  /var/lib/texmf/** r,
+
+  # from http://live.gnome.org/Evince/SupportedDocumentFormats. Allow
+  # read for all supported file formats
+  /**.[bB][mM][pP]     r,
+  /**.[dD][jJ][vV][uU] r,
+  /**.[dD][vV][iI]     r,
+  /**.[gG][iI][fF]     r,
+  /**.[jJ][pP][gG]     r,
+  /**.[jJ][pP][eE][gG] r,
+  /**.[oO][dD][pP]     r,
+  /**.[fFpP][dD][fF]   r,
+  /**.[pP][nN][mM]     r,
+  /**.[pP][nN][gG]     r,
+  /**.[pP][sS]         r,
+  /**.[eE][pP][sS]     r,
+  /**.[eE][pP][sS][fFiI23] r,
+  /**.[tT][iI][fF]     r,
+  /**.[tT][iI][fF][fF] r,
+  /**.[xX][pP][mM]     r,
+  /**.[gG][zZ]         r,
+  /**.[bB][zZ]2        r,
+  /**.[cC][bB][rRzZ7]  r,
+  /**.[xX][zZ]         r,
+
+  owner @{HOME}/.texlive*/** r,
+  owner @{HOME}/.texmf*/** r,
+  owner @{HOME}/.local/share/{,flatpak/exports/share/}mime/** r,
+  owner @{HOME}/.local/share/{,flatpak/exports/share/}mime/** r,
+
+  # With the network rules above, this allows data exfiltration for files
+  # not covered by private-files-strict.
+  @{HOME}/ r,
+  owner @{HOME}/[^.]** r,
+  owner /media/**  r,
+
+  owner /tmp/.gnome_desktop_thumbnail* w,
+  owner /tmp/gnome-desktop-thumbnailer* w,
+  owner /tmp/evince-thumbnailer*/{,**} rw,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.evince>
+}
diff --git a/apt/apt.conf.d/60icons b/apt/apt.conf.d/60icons
new file mode 100644 (file)
index 0000000..a49e958
--- /dev/null
@@ -0,0 +1,16 @@
+## This file enables the download of small-size 64x64px
+## icons for use in software centers like GNOME Software
+## and Plasma Discover.
+##
+## The icons are required for software centers to function
+## correctly. Applications without an icon will not be
+## displayed at all.
+
+Acquire::IndexTargets {
+    deb::DEP-11-icons-small  {
+        DefaultEnabled "true";
+    };
+    deb::DEP-11-icons  {
+        DefaultEnabled "true";
+    };
+};
diff --git a/dbus-1/system.d/com.ubuntu.LanguageSelector.conf b/dbus-1/system.d/com.ubuntu.LanguageSelector.conf
new file mode 100644 (file)
index 0000000..891d825
--- /dev/null
@@ -0,0 +1,22 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="com.ubuntu.LanguageSelector"/>
+        </policy>
+
+       <policy context="default">
+               <allow send_interface="com.ubuntu.LanguageSelector"/>
+               <allow receive_interface="com.ubuntu.LanguageSelector"
+                      receive_sender="com.ubuntu.LanguageSelector"/>
+
+               <allow send_destination="com.ubuntu.LanguageSelector"
+                      send_interface="org.freedesktop.DBus.Introspectable"/>
+               <allow send_destination="com.ubuntu.LanguageSelector"
+                      send_interface="org.freedesktop.DBus.Properties"/>
+
+       </policy>
+
+</busconfig>
+
diff --git a/dbus-1/system.d/com.ubuntu.WhoopsiePreferences.conf b/dbus-1/system.d/com.ubuntu.WhoopsiePreferences.conf
new file mode 100644 (file)
index 0000000..653b70a
--- /dev/null
@@ -0,0 +1,26 @@
+<!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 configuring the crash daemon. -->
+
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="com.ubuntu.WhoopsiePreferences"/>
+  </policy>
+
+  <!-- Allow anyone to invoke methods (further constrained by
+       PolicyKit privileges -->
+  <policy context="default">
+    <allow send_destination="com.ubuntu.WhoopsiePreferences" 
+           send_interface="com.ubuntu.WhoopsiePreferences"/>
+    <allow send_destination="com.ubuntu.WhoopsiePreferences" 
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_destination="com.ubuntu.WhoopsiePreferences" 
+           send_interface="org.freedesktop.DBus.Properties"/>
+  </policy>
+
+</busconfig>
+
diff --git a/dbus-1/system.d/gdm.conf b/dbus-1/system.d/gdm.conf
new file mode 100644 (file)
index 0000000..1e2695b
--- /dev/null
@@ -0,0 +1,81 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="org.gnome.DisplayManager"/>
+
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Manager"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Settings"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.freedesktop.DBus.Properties" />
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+
+  </policy>
+
+  <policy context="default">
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Display"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Settings"/>
+    <deny send_destination="org.gnome.DisplayManager"
+          send_interface="org.gnome.DisplayManager.Session"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.freedesktop.DBus.ObjectManager"/>
+    <allow send_destination="org.gnome.DisplayManager"
+          send_interface="org.freedesktop.DBus.Properties"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Manager"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
+           send_member="GetId"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
+           send_member="GetRemoteHostname"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
+           send_member="GetSeatId"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
+           send_member="GetX11DisplayName"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
+           send_member="GetX11DisplayNumber"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"
+           send_member="IsLocal"/>
+
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"
+           send_member="CreateTransientDisplay"/>
+  </policy>
+
+  <policy user="gdm">
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Manager"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Display"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.LocalDisplayFactory"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.gnome.DisplayManager.Settings"/>
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.freedesktop.DBus.Properties" />
+    <allow send_destination="org.gnome.DisplayManager"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+  </policy>
+
+</busconfig>
diff --git a/default/kdm.d/10_desktop-base b/default/kdm.d/10_desktop-base
new file mode 100644 (file)
index 0000000..434b518
--- /dev/null
@@ -0,0 +1,3 @@
+USETHEME="true"
+THEME="/usr/share/kde4/apps/kdm/themes/lines"
+WALLPAPER="/usr/share/kde4/apps/kdm/themes/lines/background.svg"
diff --git a/fonts/conf.avail/30-cjk-aliases.conf b/fonts/conf.avail/30-cjk-aliases.conf
new file mode 100644 (file)
index 0000000..497d2bf
--- /dev/null
@@ -0,0 +1,569 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Aliases for Korean fonts -->
+    <alias>
+        <family>Batang</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>바탕</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>BatangChe</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>바탕체</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+       <family>Myeongjo</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>명조</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MyeongjoChe</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>명조체</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>AR MingtiM KSC</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Adobe 명조 Std M</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Adobe Myeongjo Std M</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+           <family>NanumMyeongjo</family>
+            <family>UnBatang</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Gungsuh</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+            <family>UnGungseo</family> 
+           <family>NanumMyeongjo</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>궁서</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+            <family>UnGungseo</family> 
+           <family>NanumMyeongjo</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>GungsuhChe</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+            <family>UnGungseo</family> 
+           <family>NanumMyeongjo</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>궁서체</family>
+        <accept>
+           <family>Noto Serif CJK KR</family>
+            <family>UnGungseo</family> 
+           <family>NanumMyeongjo</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Dotum</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>돋움</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Gothic</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>고딕</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+       <family>Malgun Gothic</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>맑은 고딕</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+       <family>Gulim</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>굴림</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+       <family>AppleGothic</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>애플고딕</family>
+        <accept>
+           <family>Noto Sans CJK KR</family>
+           <family>NanumGothic</family>
+            <family>UnDotum</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>DotumChe</family>
+        <accept>
+           <family>Noto Sans Mono CJK KR</family>
+           <family>NanumGothicCoding</family>
+           <family>NanumGothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>돋움체</family>
+        <accept>
+           <family>Noto Sans Mono CJK KR</family>
+           <family>NanumGothicCoding</family>
+           <family>NanumGothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>GothicChe</family>
+        <accept>
+           <family>Noto Sans Mono CJK KR</family>
+           <family>NanumGothicCoding</family>
+           <family>NanumGothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>고딕체</family>
+        <accept>
+           <family>Noto Sans Mono CJK KR</family>
+           <family>NanumGothicCoding</family>
+           <family>NanumGothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>GulimChe</family>
+        <accept>
+           <family>Noto Sans Mono CJK KR</family>
+           <family>NanumGothicCoding</family>
+           <family>NanumGothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>굴림체</family>
+        <accept>
+           <family>Noto Sans Mono CJK KR</family>
+           <family>NanumGothicCoding</family>
+           <family>NanumGothic</family>
+        </accept>
+    </alias>
+<!-- Aliases for Japanese Windows fonts -->
+    <alias>
+        <family>MS Gothic</family>
+        <accept>
+            <family>Noto Sans Mono CJK JP</family>
+            <family>TakaoGothic</family>
+            <family>IPAGothic</family>
+            <family>IPAMonaGothic</family>
+            <family>VL Gothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS ゴシック</family>
+        <accept>
+            <family>Noto Sans Mono CJK JP</family>
+            <family>TakaoGothic</family>
+            <family>IPAGothic</family>
+            <family>IPAMonaGothic</family>
+            <family>VL Gothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS PGothic</family>
+        <accept>
+            <family>Noto Sans CJK JP</family>
+            <family>IPAMonaPGothic</family>
+            <family>TakaoPGothic</family>
+            <family>IPAPGothic</family>
+            <family>VL PGothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS Pゴシック</family>
+        <accept>
+            <family>Noto Sans CJK JP</family>
+            <family>IPAMonaPGothic</family>
+            <family>TakaoPGothic</family>
+            <family>IPAPGothic</family>
+            <family>VL PGothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS UIGothic</family>
+        <accept>
+            <family>Noto Sans CJK JP</family>
+            <family>IPAMonaPGothic</family>
+            <family>TakaoPGothic</family>
+            <family>IPAPGothic</family>
+            <family>VL PGothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Meiryo UI</family>
+        <accept>
+            <family>Noto Sans CJK JP</family>
+            <family>IPAMonaPGothic</family>
+            <family>TakaoPGothic</family>
+            <family>IPAPGothic</family>
+            <family>VL PGothic</family>
+            <family>Sazanami Gothic</family>
+            <family>Kochi Gothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS Mincho</family>
+        <accept>
+            <family>Noto Serif CJK JP</family>
+            <family>TakaoMincho</family>
+            <family>IPAMincho</family>
+            <family>IPAMonaMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS 明朝</family>
+        <accept>
+            <family>Noto Serif CJK JP</family>
+            <family>TakaoMincho</family>
+            <family>IPAMincho</family>
+            <family>IPAMonaMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>AR MinchoL JIS</family>
+        <accept>
+            <family>Noto Serif CJK JP</family>
+            <family>TakaoMincho</family>
+            <family>IPAMincho</family>
+            <family>IPAMonaMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS PMincho</family>
+        <accept>
+            <family>Noto Serif CJK JP</family>
+            <family>IPAMonaPMincho</family>
+            <family>TakaoPMincho</family>
+            <family>IPAPMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MS P明朝</family>
+        <accept>
+            <family>Noto Serif CJK JP</family>
+            <family>IPAMonaPMincho</family>
+            <family>TakaoPMincho</family>
+            <family>IPAPMincho</family>
+            <family>Sazanami Mincho</family>
+            <family>Kochi Mincho</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Meiryo</family>
+        <accept>
+            <family>IPAexGothic</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>メイリオ</family>
+        <accept>
+            <family>IPAexGothic</family>
+        </accept>
+    </alias>
+<!-- Aliases for Simplified Chinese Windows fonts -->
+    <alias>
+        <family>SimSun</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>NSimSun</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>SimSun-18030</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>NSimSun-18030</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>宋体</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>新宋体</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>AR MingtiM GB</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>HYSong</family>
+            <family>AR PL UMing CN</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>KaiTi</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>AR PL UKai CN</family>
+            <family>AR PL ZenKai Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>楷体</family>
+        <accept>
+            <family>Noto Serif CJK SC</family>
+            <family>AR PL UKai CN</family>
+            <family>AR PL ZenKai Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Microsoft YaHei</family>
+        <accept>
+            <family>Noto Sans CJK SC</family>
+            <family>WenQuanYi Micro Hei</family>
+            <family>WenQuanYi Zen Hei</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>微软雅黑</family>
+        <accept>
+            <family>Noto Sans CJK SC</family>
+            <family>WenQuanYi Micro Hei</family>
+            <family>WenQuanYi Zen Hei</family>
+        </accept>
+    </alias>
+<!-- Aliases for Traditional Chinese Windows fonts -->
+    <alias>
+        <family>MingLiU</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UMing TW</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>細明體</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UMing TW</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>PMingLiU</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UMing TW</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>新細明體</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UMing TW</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>AR MingtiM BIG-5</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UMing TW</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>DFKai\-SB</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UKai TW</family>
+            <family>AR PL ZenKai Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>標楷體</family>
+        <accept>
+            <family>Noto Serif CJK TC</family>
+            <family>AR PL UKai TW</family>
+            <family>AR PL ZenKai Uni</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>Microsoft JhengHei</family>
+        <accept>
+            <family>Noto Sans CJK TC</family>
+            <family>WenQuanYi Micro Hei</family>
+            <family>WenQuanYi Zen Hei</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>微軟正黑體</family>
+        <accept>
+            <family>Noto Sans CJK TC</family>
+            <family>WenQuanYi Micro Hei</family>
+            <family>WenQuanYi Zen Hei</family>
+        </accept>
+    </alias>
+<!-- Alias for HKSCS -->
+    <alias>
+        <family>Ming (for ISO10646)</family>
+        <accept>
+            <family>AR PL UMing HK</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>MingLiU_HKSCS</family>
+        <accept>
+            <family>AR PL UMing HK</family>
+        </accept>
+    </alias>
+    <alias>
+        <family>細明體_HKSCS</family>
+        <accept>
+            <family>AR PL UMing HK</family>
+        </accept>
+    </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/64-language-selector-prefer.conf b/fonts/conf.avail/64-language-selector-prefer.conf
new file mode 100644 (file)
index 0000000..8cf9d25
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <alias>
+               <family>sans-serif</family>
+               <prefer>
+                       <family>Noto Sans CJK JP</family>
+                       <family>Noto Sans CJK KR</family>
+                       <family>Noto Sans CJK SC</family>
+                       <family>Noto Sans CJK TC</family>
+                       <family>Noto Sans CJK HK</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>serif</family>
+               <prefer>
+                       <family>Noto Serif CJK JP</family>
+                       <family>Noto Serif CJK KR</family>
+                       <family>Noto Serif CJK SC</family>
+                       <family>Noto Serif CJK TC</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>monospace</family>
+               <prefer>
+                       <family>Noto Sans Mono CJK JP</family>
+                       <family>Noto Sans Mono CJK KR</family>
+                       <family>Noto Sans Mono CJK SC</family>
+                       <family>Noto Sans Mono CJK TC</family>
+                       <family>Noto Sans Mono CJK HK</family>
+               </prefer>
+       </alias>
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-ja.conf b/fonts/conf.avail/69-language-selector-ja.conf
new file mode 100644 (file)
index 0000000..d562429
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <match target="font">
+               <test name="family" compare="contains">
+                       <string>Noto Sans CJK JP</string>
+               </test>
+               <test qual="all" name="pixelsize" compare="less_eq">
+                       <double>18</double>
+               </test>
+               <edit mode="assign" name="embeddedbitmap">
+                       <bool>false</bool>
+               </edit>
+               <edit mode="assign" name="hintstyle">
+                       <const>hintnone</const>
+               </edit>
+       </match>
+       <match target="font">
+               <test name="family" compare="contains">
+                       <string>Noto Serif CJK JP</string>
+               </test>
+               <test qual="all" name="pixelsize" compare="less_eq">
+                       <double>18</double>
+               </test>
+               <edit mode="assign" name="embeddedbitmap">
+                       <bool>false</bool>
+               </edit>
+               <edit mode="assign" name="hintstyle">
+                       <const>hintnone</const>
+               </edit>
+       </match>
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-zh-cn.conf b/fonts/conf.avail/69-language-selector-zh-cn.conf
new file mode 100644 (file)
index 0000000..254249a
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <match target="pattern">
+        <test name="lang">
+            <string>zh-cn</string>
+        </test>
+               <test qual="any" name="family">
+                       <string>serif</string>
+               </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK SC</string>
+                       <string>HYSong</string>
+                       <string>AR PL UMing CN</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>WenQuanYi Bitmap Song</string>
+                       <string>AR PL UKai CN</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans-serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-cn</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Sans CJK SC</string>
+                       <string>WenQuanYi Zen Hei</string>
+                       <string>HYSong</string>
+                       <string>AR PL UMing CN</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>AR PL UKai CN</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>monospace</string>
+               </test>
+        <test name="lang">
+            <string>zh-cn</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Sans Mono</string>
+                       <string>Noto Sans Mono CJK SC</string>
+                       <string>WenQuanYi Zen Hei Mono</string>
+                       <string>HYSong</string>
+                       <string>AR PL UMing CN</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>AR PL UKai CN</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-zh-hk.conf b/fonts/conf.avail/69-language-selector-zh-hk.conf
new file mode 100644 (file)
index 0000000..cc277be
--- /dev/null
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-hk</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK TC</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>WenQuanYi Bitmap Song</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans-serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-hk</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Sans CJK HK</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>monospace</string>
+               </test>
+        <test name="lang">
+            <string>zh-hk</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Sans Mono</string>
+                       <string>Noto Sans Mono CJK HK</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-zh-mo.conf b/fonts/conf.avail/69-language-selector-zh-mo.conf
new file mode 100644 (file)
index 0000000..57af177
--- /dev/null
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-mo</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK TC</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>WenQuanYi Bitmap Song</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans-serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-mo</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Bitstream Vera Sans</string>
+                       <string>Noto Sans CJK TC</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>monospace</string>
+               </test>
+        <test name="lang">
+            <string>zh-mo</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Bitstream Vera Sans Mono</string>
+                       <string>DejaVu Sans Mono</string>
+                       <string>Noto Sans Mono CJK TC</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-zh-sg.conf b/fonts/conf.avail/69-language-selector-zh-sg.conf
new file mode 100644 (file)
index 0000000..13693e6
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-sg</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK SC</string>
+                       <string>HYSong</string>
+                       <string>AR PL UMing CN</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>WenQuanYi Bitmap Song</string>
+                       <string>AR PL UKai CN</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans-serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-sg</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Sans CJK SC</string>
+                       <string>WenQuanYi Zen Hei</string>
+                       <string>HYSong</string>
+                       <string>AR PL UMing CN</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>AR PL UKai CN</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>monospace</string>
+               </test>
+        <test name="lang">
+            <string>zh-sg</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Sans Mono</string>
+                       <string>Noto Sans Mono CJK SC</string>
+                       <string>WenQuanYi Zen Hei Mono</string>
+                       <string>HYSong</string>
+                       <string>AR PL UMing CN</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>AR PL UKai CN</string>
+                       <string>AR PL ZenKai Uni</string>
+               </edit>
+       </match> 
+
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-zh-tw.conf b/fonts/conf.avail/69-language-selector-zh-tw.conf
new file mode 100644 (file)
index 0000000..6cd0500
--- /dev/null
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <!-- Set fonts selection order for Chinese users -->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK TC</string>
+                       <string>AR PL UMing TW</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>WenQuanYi Bitmap Song</string>
+                       <string>AR PL UKai TW</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+                       <string>DejaVu Serif</string>
+                       <string>Bitstream Vera Serif</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans-serif</string>
+               </test>
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Sans CJK TC</string>
+                       <string>WenQuanYi Zen Hei</string>
+                       <string>AR PL UMing TW</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>AR PL UKai TW</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+                       <string>DejaVu Sans</string>
+                       <string>Bitstream Vera Sans</string>
+               </edit>
+       </match> 
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>monospace</string>
+               </test>
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+               <edit name="family" mode="prepend" binding="strong">
+                       <string>DejaVu Sans Mono</string>
+                       <string>Noto Sans Mono CJK TC</string>
+                       <string>WenQuanYi Zen Hei Mono</string>
+                       <string>AR PL UMing TW</string>
+                       <string>AR PL UMing HK</string>
+                       <string>AR PL New Sung</string>
+                       <string>HYSong</string>
+                       <string>AR PL UKai TW</string>
+                       <string>AR PL UKai HK</string>
+                       <string>AR PL ZenKai Uni</string>
+                       <string>DejaVu Sans Mono</string>
+                       <string>Bitstream Vera Sans Mono</string>
+               </edit>
+       </match>
+
+</fontconfig>
diff --git a/fonts/conf.avail/99-language-selector-zh.conf b/fonts/conf.avail/99-language-selector-zh.conf
new file mode 100644 (file)
index 0000000..18e5f0c
--- /dev/null
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <match target="font" >
+               <test name="family" compare="contains" >
+                       <string>Song</string>
+               </test> 
+                <!-- check to see if the font is just regular -->
+                <test name="weight" compare="less_eq">
+                        <int>100</int>
+               </test>
+               <test compare="more_eq" target="pattern" name="weight" >
+                       <int>180</int>
+               </test>
+               <edit mode="assign" name="embolden" >
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+       <match target="font" >
+               <test name="family" compare="contains" >
+                       <string>Sun</string>
+               </test> 
+                <!-- check to see if the font is just regular -->
+                <test name="weight" compare="less_eq">
+                        <int>100</int>
+               </test>
+               <test compare="more_eq" target="pattern" name="weight" >
+                       <int>180</int>
+               </test>
+               <edit mode="assign" name="embolden" >
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+       <match target="font" >
+               <test name="family" compare="contains" >
+                       <string>Kai</string>
+               </test> 
+                <!-- check to see if the font is just regular -->
+                <test name="weight" compare="less_eq">
+                        <int>100</int>
+               </test>
+               <test compare="more_eq" target="pattern" name="weight" >
+                       <int>180</int>
+               </test>
+               <edit mode="assign" name="embolden" >
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+       <match target="font" >
+               <test name="family" compare="contains" >
+                       <string>Ming</string>
+               </test> 
+                <!-- check to see if the font is just regular -->
+                <test name="weight" compare="less_eq">
+                        <int>100</int>
+               </test>
+               <test compare="more_eq" target="pattern" name="weight" >
+                       <int>180</int>
+               </test>
+               <edit mode="assign" name="embolden" >
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+</fontconfig>
diff --git a/fonts/conf.d/30-cjk-aliases.conf b/fonts/conf.d/30-cjk-aliases.conf
new file mode 120000 (symlink)
index 0000000..81247d5
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/30-cjk-aliases.conf
\ No newline at end of file
diff --git a/fonts/conf.d/31-cantarell.conf b/fonts/conf.d/31-cantarell.conf
new file mode 120000 (symlink)
index 0000000..96fab3c
--- /dev/null
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/31-cantarell.conf
\ No newline at end of file
diff --git a/fonts/conf.d/64-language-selector-prefer.conf b/fonts/conf.d/64-language-selector-prefer.conf
new file mode 120000 (symlink)
index 0000000..95dbf21
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/64-language-selector-prefer.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-ja.conf b/fonts/conf.d/69-language-selector-ja.conf
new file mode 120000 (symlink)
index 0000000..7136c20
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-ja.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-zh-cn.conf b/fonts/conf.d/69-language-selector-zh-cn.conf
new file mode 120000 (symlink)
index 0000000..609f792
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-zh-cn.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-zh-hk.conf b/fonts/conf.d/69-language-selector-zh-hk.conf
new file mode 120000 (symlink)
index 0000000..ae709b8
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-zh-hk.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-zh-mo.conf b/fonts/conf.d/69-language-selector-zh-mo.conf
new file mode 120000 (symlink)
index 0000000..4a4d83a
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-zh-mo.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-zh-sg.conf b/fonts/conf.d/69-language-selector-zh-sg.conf
new file mode 120000 (symlink)
index 0000000..f5b2881
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-zh-sg.conf
\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-zh-tw.conf b/fonts/conf.d/69-language-selector-zh-tw.conf
new file mode 120000 (symlink)
index 0000000..977b8f3
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-zh-tw.conf
\ No newline at end of file
diff --git a/fonts/conf.d/99-language-selector-zh.conf b/fonts/conf.d/99-language-selector-zh.conf
new file mode 120000 (symlink)
index 0000000..23ec678
--- /dev/null
@@ -0,0 +1 @@
+../conf.avail/99-language-selector-zh.conf
\ No newline at end of file
diff --git a/gdm3/Init/Default b/gdm3/Init/Default
new file mode 100755 (executable)
index 0000000..a8e6993
--- /dev/null
@@ -0,0 +1,89 @@
+#!/bin/sh
+# Stolen from the debian kdm setup, aren't I sneaky
+# Plus a lot of fun stuff added
+#  -George
+
+PATH="/usr/bin:$PATH"
+OLD_IFS=$IFS
+
+gdmwhich () {
+  COMMAND="$1"
+  OUTPUT=
+  IFS=:
+  for dir in $PATH
+  do
+    if test -x "$dir/$COMMAND" ; then
+      if test "x$OUTPUT" = "x" ; then
+        OUTPUT="$dir/$COMMAND"
+      fi
+    fi
+  done
+  IFS=$OLD_IFS
+  echo "$OUTPUT"
+}
+
+sysresources=/etc/X11/Xresources
+
+# merge in defaults
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+sysmodmap=/etc/X11/Xmodmap
+
+XMODMAP=`gdmwhich xmodmap`
+if [ "x$XMODMAP" != "x" ] ; then
+  if [ "x$GDM_PARENT_DISPLAY" = "x" ]; then
+    if [ -f $sysmodmap ]; then
+      $XMODMAP $sysmodmap
+    fi
+  else
+    ( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $XMODMAP -pke ) | $XMODMAP -
+  fi
+
+  #
+  # Switch Sun's Alt and Meta mod mappings
+  #
+
+  UNAME=`gdmwhich uname`
+  PROCESSOR=`$UNAME -p`
+  if [ "x$PROCESSOR" = "xsparc" ]; then
+    if $XMODMAP | grep mod4 | grep Alt > /dev/null 2>/dev/null
+    then
+      $XMODMAP -e "clear Mod1" \
+               -e "clear Mod4" \
+               -e "add Mod1 = Alt_L" \
+               -e "add Mod1 = Alt_R" \
+               -e "add Mod4 = Meta_L" \
+               -e "add Mod4 = Meta_R"
+    fi
+  fi
+fi
+
+SETXKBMAP=`gdmwhich setxkbmap`
+if [ "x$SETXKBMAP" != "x" ] ; then
+  # FIXME: is this all right?  Is this completely on crack?
+  # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
+  # FIXME: This should be done in code.  Or there must be an easier way ...
+  if [ -n "$GDM_PARENT_DISPLAY" ]; then
+    XKBSETUP=`( DISPLAY=$GDM_PARENT_DISPLAY XAUTHORITY=$GDM_PARENT_XAUTHORITY $SETXKBMAP -v )`
+    if [ -n "$XKBSETUP" ]; then
+      XKBKEYMAP=`echo "$XKBSETUP" | grep '^keymap' | awk '{ print $2 }'`
+      XKBTYPES=`echo "$XKBSETUP" | grep '^types' | awk '{ print $2 }'`
+      XKBCOMPAT=`echo "$XKBSETUP" | grep '^compat' | awk '{ print $2 }'`
+      XKBSYMBOLS=`echo "$XKBSETUP" | grep '^symbols' | awk '{ print $2 }'`
+      XKBGEOMETRY=`echo "$XKBSETUP" | grep '^geometry' | awk '{ print $2 }'`
+      if [ -n "$XKBKEYMAP" ]; then
+        $SETXKBMAP -keymap "$XKBKEYMAP"
+      elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" -a -n "$XKBGEOMETRY" ]; then
+        $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS" -geometry "$XKBGEOMETRY"
+      elif [ -n "$XKBTYPES" -a -n "$XKBCOMPAT" -a -n "$XKBSYMBOLS" ]; then
+        $SETXKBMAP -types "$XKBTYPES" -compat "$XKBCOMPAT" -symbols "$XKBSYMBOLS"
+      elif [ -n "$XKBSYMBOLS" ]; then
+        $SETXKBMAP -symbols "$XKBSYMBOLS"
+      fi
+    fi
+  fi
+fi
+
+exit 0
diff --git a/gdm3/PostLogin/Default.sample b/gdm3/PostLogin/Default.sample
new file mode 100755 (executable)
index 0000000..efc6394
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Note: this is a sample and will not be run as is.  Change the name of this
+# file to <gdmconfdir>/PostLogin/Default for this script to be run.  This
+# script will be run before any setup is run on behalf of the user and is
+# useful if you for example need to do some setup to create a home directory
+# for the user or something like that.  $HOME, $LOGIN and such will all be
+# set appropriately and this script is run as root.
diff --git a/gdm3/PostSession/Default b/gdm3/PostSession/Default
new file mode 100755 (executable)
index 0000000..c52d3c2
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0
diff --git a/gdm3/PreSession/Default b/gdm3/PreSession/Default
new file mode 100755 (executable)
index 0000000..23e5b86
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# Note that any setup should come before the sessreg command as
+# that must be 'exec'ed for the pid to be correct (sessreg uses the parent
+# pid)
+#
+# Note that output goes into the .xsession-errors file for easy debugging
+#
+PATH="/usr/bin:$PATH"
diff --git a/gdm3/Prime/Default b/gdm3/Prime/Default
new file mode 100755 (executable)
index 0000000..30caf03
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+primeoffload=/sbin/prime-offload
+if [ -f "$primeoffload" ]; then
+    $primeoffload
+fi
diff --git a/gdm3/PrimeOff/Default b/gdm3/PrimeOff/Default
new file mode 100755 (executable)
index 0000000..5a61c3c
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+primeswitch=/sbin/prime-switch
+if [ -f "$primeswitch" ]; then
+    $primeswitch
+fi
diff --git a/gdm3/Xsession b/gdm3/Xsession
new file mode 100755 (executable)
index 0000000..d7114ff
--- /dev/null
@@ -0,0 +1,237 @@
+#!/bin/bash
+#
+# This is SORT OF LIKE an X session, but not quite.  You get a command as the
+# first argument (it could be multiple words, so run it with "eval").  As a
+# special case, the command can be:
+#  default - Run the appropriate Xclients startup (see the code below)
+#  custom - Run ~/.xsession and if that's not available run 'default'
+#
+# (Note that other arguments could also follow, but only the command one is
+# right now relevant and supported)
+#
+# The output is ALREADY redirected to .xsession-errors in GDM.  This way
+# .xsession-errors actually gets more output such as if the PreSession script
+# is failing.  This also prevents DoS attacks if some app in the users session
+# can be prodded to dump lots of stuff on the stdout/stderr.  We wish to be
+# robust don't we?  In case you wish to use an existing script for other DM's,
+# you can just not redirect when GDMSESSION is set.  GDMSESSION will always
+# be set from gdm.
+#
+# Also note that this is not run as a login shell, this is just executed.
+# This is why we source the profile files below.
+#
+# based on:
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+command="$@"
+
+# this will go into the .xsession-errors along with all other echo's
+# good for debugging where things went wrong
+echo "$0: Beginning session setup..."
+
+# temporary storage of error messages
+ERR=$(mktemp --tmpdir config-err-XXXXXX)
+
+source_with_error_check () {
+  CONFIG_FILE="$1"
+  . "$CONFIG_FILE" 2>"$ERR"
+  if [ -s "$ERR" ]; then
+    . /etc/gdm3/config-error-dialog.sh
+  fi
+  cat "$ERR" >&2
+  truncate -s 0 "$ERR"
+}
+
+# First read /etc/profile and .profile
+for file in /etc/profile "$HOME/.profile"; do
+  if [ -f "$file" ]; then
+    source_with_error_check "$file"
+  fi
+done
+
+# Second read /etc/xprofile and .xprofile for X specific setup
+for file in /etc/xprofile "$HOME/.xprofile"; do
+  if [ -f "$file" ]; then
+    source_with_error_check "$file"
+  fi
+done
+
+# Translation stuff
+if [ -x "/usr/lib/gdm3/gdmtranslate" ] ; then
+  gdmtranslate="/usr/lib/gdm3/gdmtranslate"
+else
+  gdmtranslate=
+fi
+
+# Note that this should only go to zenity dialogs which always expect utf8
+gettextfunc () {
+  if [ "x$gdmtranslate" != "x" ] ; then
+    "$gdmtranslate" --utf8 "$1"
+  else
+    echo "$1"
+  fi
+}
+
+OLD_IFS=$IFS
+
+gdmwhich () {
+  COMMAND="$1"
+  OUTPUT=
+  IFS=:
+  for dir in $PATH
+  do
+    if test -x "$dir/$COMMAND" ; then
+      if test "x$OUTPUT" = "x" ; then
+        OUTPUT="$dir/$COMMAND"
+      fi
+    fi
+  done
+  IFS=$OLD_IFS 
+  echo "$OUTPUT"
+}
+
+zenity=`gdmwhich zenity`
+
+# Note: ~/.xsession-errors is now done in the daemon so that it
+# works for ALL sessions (except ones named 'Failsafe')
+
+# clean up after xbanner
+freetemp=`gdmwhich freetemp`
+if [ -n "$freetemp" ] ; then
+       "$freetemp"
+fi
+
+userresources="$HOME/.Xresources"
+usermodmap="$HOME/.Xmodmap"
+userxkbmap="$HOME/.Xkbmap"
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -nocpp -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -nocpp -merge "$sysresources"
+elif [ -d "$sysresources" ]; then
+    # directory of Xresources files on Debian/Ubuntu
+    for i in `ls "$sysresources"` ; do
+        if [ -r "$sysresources/$i"  -a -f "$sysresources/$i" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+            xrdb -nocpp -merge "$sysresources/$i"
+        fi
+    done
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -nocpp -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+xhost +si:localuser:`id -un` || :
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for i in /etc/X11/xinit/xinitrc.d/* ; do
+        if [ -x "$i" -a ! -d "$i" ]; then
+           . "$i"
+        fi
+    done
+fi
+
+# run /etc/X11/Xsession.d/
+OPTIONFILE=/etc/X11/Xsession.options
+USERXSESSION=$HOME/.xsession
+USERXSESSIONRC=$HOME/.xsessionrc
+ALTUSERXSESSION=$HOME/.Xsession
+if [ -d /etc/X11/Xsession.d ]; then
+    for i in `ls /etc/X11/Xsession.d/` ; do
+        if [ -r "/etc/X11/Xsession.d/$i"  -a -f "/etc/X11/Xsession.d/$i" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+           . "/etc/X11/Xsession.d/$i"
+        fi
+    done
+fi
+
+if [ "x$command" = "xdefault" ] ; then
+  if [ -x "$HOME/.Xclients" ]; then
+    command="$HOME/.Xclients"
+  elif [ -x /etc/X11/xinit/Xclients ]; then
+    command="/etc/X11/xinit/Xclients"
+  elif [ -x /etc/X11/Xclients ]; then
+    command="/etc/X11/Xclients"
+  else
+    if [ -n "$zenity" ] ; then
+       disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is above them.  To get out of this mode type 'exit' in the window."`
+      "$zenity" --info --text "$disptext"
+    else
+      echo "$0: Cannot find Xclients"
+    fi
+    exec xterm -geometry 80x24+0+0
+  fi
+fi
+
+# add ssh-agent if found
+sshagent="`gdmwhich ssh-agent`"
+if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+    command="$sshagent -- $command"
+elif [ -z "$sshagent" ] ; then
+    echo "$0: ssh-agent not found!"
+fi
+
+echo "$0: Setup done, will execute: $command"
+
+eval exec $command
+
+echo "$0: Executing $command failed, will run xterm"
+
+if [ -n "$zenity" ] ; then
+       disptext=`gettextfunc "Failed to start the session, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is above them.  To get out of this mode type 'exit' in the window."`
+       "$zenity" --info --text "$disptext"
+fi
+
+exec xterm -geometry 80x24+0+0
diff --git a/gdm3/config-error-dialog.sh b/gdm3/config-error-dialog.sh
new file mode 100644 (file)
index 0000000..08cb7b9
--- /dev/null
@@ -0,0 +1,29 @@
+# Copyright (C) 2014 Canonical Ltd
+# Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 3 of the License.
+#
+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
+
+# This file may be sourced by the function source_with_error_check() in
+# /etc/gdm/Xsession
+
+export TEXTDOMAIN=gdm
+. /usr/bin/gettext.sh
+
+PARA1=$(eval_gettext 'Error found when loading $CONFIG_FILE:')
+PARA2=$(gettext 'As a result the session will not be configured correctly.
+You should fix the problem as soon as feasible.')
+
+TEXT="$PARA1\n\n$(fold -s $ERR)\n\n$PARA2"
+
+if [ -x /usr/bin/kdialog ]; then
+       TEXT_FILE=$(mktemp --tmpdir config-err-kdialog-XXXXXX)
+       echo -n "$TEXT" > "$TEXT_FILE"
+       kdialog --textbox "$TEXT_FILE" 500 300
+       rm -f "$TEXT_FILE"
+elif [ -x /usr/bin/zenity ]; then
+       zenity --warning --no-wrap --text="$TEXT"
+fi
diff --git a/gdm3/custom.conf b/gdm3/custom.conf
new file mode 100644 (file)
index 0000000..92eeb5e
--- /dev/null
@@ -0,0 +1,29 @@
+# GDM configuration storage
+#
+# See /usr/share/gdm/gdm.schemas for a list of available options.
+
+[daemon]
+# Uncoment the line below to force the login screen to use Xorg
+#WaylandEnable=false
+
+# Enabling automatic login
+#  AutomaticLoginEnable = true
+#  AutomaticLogin = user1
+
+# Enabling timed login
+#  TimedLoginEnable = true
+#  TimedLogin = user1
+#  TimedLoginDelay = 10
+
+[security]
+
+[xdmcp]
+
+[chooser]
+
+[debug]
+# Uncomment the line below to turn on debugging
+# More verbose logs
+# Additionally lets the X server dump core if it crashes
+#Enable=true
+
diff --git a/gdm3/greeter.dconf-defaults b/gdm3/greeter.dconf-defaults
new file mode 100644 (file)
index 0000000..62fa3b0
--- /dev/null
@@ -0,0 +1,35 @@
+# These are the options for the greeter session that can be set 
+# through GSettings. Any GSettings setting that is used by the 
+# greeter session can be set here.
+
+# Note that you must configure the path used by dconf to store the 
+# configuration, not the GSettings path.
+
+
+# Theming options
+# ===============
+#  - Change the GTK+ theme
+# [org/gnome/desktop/interface]
+# gtk-theme='Adwaita'
+#  - Use another background
+# [org/gnome/desktop/background]
+# picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg'
+# picture-options='zoom'
+#  - Or no background at all
+# [org/gnome/desktop/background]
+# picture-options='none'
+# primary-color='#000000'
+
+# Login manager options
+# =====================
+#[org/gnome/login-screen]
+#logo='/usr/share/icons/hicolor/48x48/emblems/emblem-debian-white.png'
+#fallback-logo='/usr/share/icons/hicolor/48x48/emblems/emblem-debian-white.png'
+
+# - Disable user list
+# disable-user-list=true
+# - Disable restart buttons
+# disable-restart-buttons=true
+# - Show a login welcome message
+# banner-message-enable=true
+# banner-message-text='Welcome'
diff --git a/gnome/menus.blacklist b/gnome/menus.blacklist
new file mode 100644 (file)
index 0000000..9af4fa2
--- /dev/null
@@ -0,0 +1,220 @@
+# openjdk-8
+openjdk-8-policytool.desktop
+
+# openjdk-9
+openjdk-9-policytool.desktop
+
+# icedtea
+itweb-settings.desktop
+
+# Oracle Java
+sun_java.desktop
+
+# imagemagick (Bug #677318)
+display-im6.desktop
+display-im6.q16.desktop
+
+# kde4libs (Bug #673362)
+kde4/kmailservice.desktop
+kde4/ktelnetservice.desktop
+
+# kdeaccessibility
+kde4/jovieapp.desktop
+kde4/kmag.desktop
+kde4/kmousetool.desktop
+kde4/kmouth.desktop
+
+# kdeadmin
+kde4/kuser.desktop
+kde4/ksystemlog.desktop
+
+# kdebase
+kde4/dolphin.desktop
+kde4/keditbookmarks.desktop
+kde4/kdepasswd.desktop
+kde4/kfmclient.desktop
+kde4/kfmclient_dir.desktop
+kde4/kfmclient_html.desktop
+kde4/kfmclient_war.desktop
+kde4/konqbrowser.desktop
+kde4/konquerorsu.desktop
+kde4/konsole.desktop
+kde4/kwrite.desktop
+
+# kdebase-runtime (Bug #673361)
+kde4/nepomukbackup.desktop
+kde4/nepomukcontroller.desktop
+
+# kdebase-workspace
+kde4/kfontview.desktop
+kde4/ksysguard.desktop
+kde4/systemsettings.desktop
+
+# kdeedu - no equivalents in GNOME
+
+# kdegames - only those which have equivalents in gnome-games
+kde4/kblocks.desktop
+kde4/kfourinline.desktop
+kde4/killbots.desktop
+kde4/kiriki.desktop
+kde4/klickety.desktop
+kde4/ksame.desktop
+kde4/klines.desktop
+kde4/kmahjongg.desktop
+kde4/kmines.desktop
+kde4/kpat.desktop
+kde4/kreversi.desktop
+kde4/ksudoku.desktop
+kde4/kdesnake.desktop
+kde4/ktron.desktop
+
+# kdegraphics
+kde4/gwenview.desktop
+kde4/kcolorchooser.desktop
+kde4/kolourpaint.desktop
+kde4/kruler.desktop
+kde4/ksnapshot.desktop
+kde4/okular.desktop
+kde4/okularApplication_comicbook.desktop
+kde4/okularApplication_dvi.desktop
+kde4/okularApplication_fax.desktop
+kde4/okularApplication_fb.desktop
+kde4/okularApplication_ghostview.desktop
+kde4/okularApplication_kimgio.desktop
+kde4/okularApplication_mobi.desktop
+kde4/okularApplication_ooo.desktop
+kde4/okularApplication_pdf.desktop
+kde4/okularApplication_plucker.desktop
+kde4/okularApplication_xps.desktop
+kde4/okularApplication_chm.desktop
+kde4/okularApplication_djvu.desktop
+kde4/okularApplication_epub.desktop
+kde4/okularApplication_tiff.desktop
+
+# kdemultimedia
+kde4/dragonplayer.desktop
+kde4/juk.desktop
+kde4/kmix.desktop
+kde4/kscd.desktop
+
+# kdenetwork
+kde4/kget.desktop
+kde4/kopete.desktop
+kde4/kppplogview.desktop
+kde4/Kppp.desktop
+kde4/krdc.desktop
+kde4/krfb.desktop
+
+# kdepim
+kde4/akonadiconsole.desktop
+kde4/akregator.desktop
+kde4/blogilo.desktop
+kde4/kaddressbook.desktop
+kde4/kalarm.desktop
+kde4/groupwarewizard.desktop
+kde4/Kjots.desktop
+kde4/kleopatra.desktop
+kde4/kleopatra_import.desktop
+kde4/KMail.desktop
+kde4/kmail_view.desktop
+kde4/KNode.desktop
+kde4/knotes.desktop
+kde4/konsolekalendar.desktop
+kde4/Kontact.desktop
+kde4/kontact-admin.desktop
+kde4/korganizer-import.desktop
+kde4/korganizer.desktop
+kde4/ktimetracker.desktop
+kde4/akonaditray.desktop
+
+# kdesdk
+kde4/cervisia.desktop
+kde4/kapptemplate.desktop
+kde4/ktesnippets_editor.desktop
+kde4/kate.desktop
+kde4/kcachegrind.desktop
+kde4/kompare.desktop
+kde4/kuiviewer.desktop
+kde4/lokalize.desktop
+kde4/okteta.desktop
+kde4/umbrello.desktop
+
+# kdetoys
+kde4/amor.desktop
+kde4/kteatime.desktop
+
+# kdeutils
+kde4/ark.desktop
+kde4/filelight.desktop
+kde4/kcalc.desktop
+kde4/KCharSelect.desktop
+kde4/kwikdisk.desktop
+kde4/kdf.desktop
+kde4/KFloppy.desktop
+kde4/kgpg.desktop
+kde4/krcdnotifieritem.desktop
+kde4/ktimer.desktop
+kde4/kwalletmanager.desktop
+kde4/kwalletmanager-kwalletd.desktop
+kde4/sweeper.desktop
+
+# kdewebdev
+kde4/kfilereplace.desktop
+kde4/kimagemapeditor.desktop
+kde4/klinkstatus.desktop
+
+# Other KDE-only stuff that have GNOME equivalents in the standard install
+Kino.desktop
+qtconfig-qt4.desktop
+
+# Viewers only belong in the MIME associations, not in the menu
+djvulibre-djview4.desktop
+xpdf.desktop
+
+# Bazaar preferences don't belong in the menu
+bazaar-properties.desktop
+# Neither do notification area icons, they should be autostarted on demand
+bzr-notify.desktop
+
+# xscreensaver
+xscreensaver-properties.desktop
+
+# IDLE - we don't need one entry for each Python version
+idle-python2.6.desktop
+
+# XTerm (Bug #856858)
+debian-xterm.desktop
+debian-uxterm.desktop
+
+# XFCE (Bug #673363, #673360)
+Thunar-bulk-rename.desktop
+Thunar.desktop
+thunar-volman-settings.desktop
+thunar-settings.desktop
+
+xfce4-appfinder.desktop
+xfce4-dict.desktop
+xfce4-screenshooter.desktop
+xfce4-sensors.desktop
+
+# ViM
+vim.desktop
+
+# prerex
+prerex.desktop
+vprerex.desktop
+
+# Cinnamon
+blueman-manager.desktop
+nemo.desktop
+
+# KDE5/Plasma
+org.kde.kaddressbook.desktop
+org.kde.contactthemeeditor.desktop
+org.kde.headerthemeeditor.desktop
+org.kde.contactprintthemeeditor.desktop
+org.kde.importwizard.desktop
+org.kde.pimsettingexporter.desktop
+org.kde.ktnef.desktop
+org.kde.klipper.desktop
+org.kde.spectacle.desktop
diff --git a/group b/group
index 9686163a8c8c3d86a65f710754fe33ef264a65e8..fe82e87a49024337be1f06c4d64d8699f2fd3ed3 100644 (file)
--- a/group
+++ b/group
@@ -72,3 +72,4 @@ plex:x:963:frank
 kvm:x:133:
 rdma:x:134:
 _chrony:x:135:
+gdm:x:118:
diff --git a/group- b/group-
index a9796b2f2a739f3b8a3874f1ca9996dab8deb526..9686163a8c8c3d86a65f710754fe33ef264a65e8 100644 (file)
--- a/group-
+++ b/group-
@@ -54,7 +54,6 @@ avahi-autoipd:x:114:
 ssh:x:115:
 bluetooth:x:116:
 systemd-coredump:x:117:
-ntp:x:118:
 lightdm:x:119:
 nopasswdlogin:x:120:
 scanner:x:121:saned
diff --git a/gshadow b/gshadow
index 44bfc4cc1675cd318648a44b33970a72dc6f6ad3..a0df27c29420eb25af4ef561871fa07cb4a90094 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -72,3 +72,4 @@ plex:!::frank
 kvm:!::
 rdma:!::
 _chrony:!::
+gdm:!::
index cac2586ee064632f6278346d9283e33f08dd1d72..44bfc4cc1675cd318648a44b33970a72dc6f6ad3 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -54,7 +54,6 @@ avahi-autoipd:!::
 ssh:!::
 bluetooth:!::
 systemd-coredump:!::
-ntp:!::
 lightdm:!::
 nopasswdlogin:!::
 scanner:!::saned
diff --git a/init.d/gdm3 b/init.d/gdm3
new file mode 100755 (executable)
index 0000000..df234a8
--- /dev/null
@@ -0,0 +1,93 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          gdm3
+# Should-Start:      console-screen dbus network-manager
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: GNOME Display Manager
+# Description:       Debian init script for the GNOME Display Manager
+### END INIT INFO
+#
+# Author:       Ryan Murray <rmurray@debian.org>
+#
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/gdm3
+PIDFILE=/var/run/gdm3.pid
+
+test -x $DAEMON || exit 0
+
+if [ -r /etc/default/locale ]; then
+  . /etc/default/locale
+  export LANG LANGUAGE
+fi
+
+. /lib/lsb/init-functions
+
+# To start gdm even if it is not the default display manager, change
+# HEED_DEFAULT_DISPLAY_MANAGER to "false."
+HEED_DEFAULT_DISPLAY_MANAGER=true
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+activate_logind() {
+  # Try to dbus activate logind to avoid a race conditions if we are not
+  # running systemd as PID1 and we have systemd << 204 package installed (see:
+  # #747292)
+  if [ ! -d /run/systemd/system ] && [ -x /lib/systemd/systemd-logind-launch ]; then
+    dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus \
+      org.freedesktop.DBus.StartServiceByName string:org.freedesktop.login1 uint32:0 2>&1 > /dev/null
+  fi
+}
+
+case "$1" in
+  start)
+        CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
+        if grep -wqs text /proc/cmdline; then
+            log_warning_msg "Not starting GNOME Display Manager; found 'text' in kernel commandline."
+        elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+           [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+           [ "$CONFIGURED_DAEMON" != gdm3 ] ; then
+                log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"
+        else
+                log_daemon_msg "Starting GNOME Display Manager" "gdm3"
+                activate_logind || log_end_msg 1
+                /usr/share/gdm/generate-config
+                start-stop-daemon --start --quiet --pidfile $PIDFILE \
+                       --background --exec $DAEMON || log_end_msg 1
+                log_end_msg 0
+        fi
+  ;;
+  stop)
+        log_daemon_msg "Stopping GNOME Display Manager" "gdm3"
+        set +e
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+                --name gdm3 --retry 5
+        set -e
+        log_end_msg $?
+  ;;
+  reload)
+        log_daemon_msg "Scheduling reload of GNOME Display Manager configuration" "gdm3"
+        /usr/share/gdm/generate-config
+        set +e
+        start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \
+                --name gdm3
+        set -e
+        log_end_msg $?
+  ;;
+  status)
+        status_of_proc -p "$PIDFILE" "$DAEMON" gdm3 && exit 0 || exit $?
+  ;;
+  restart|force-reload)
+        $0 stop
+        $0 start
+  ;;
+  *)
+        echo "Usage: /etc/init.d/gdm3 {start|stop|restart|reload|force-reload|status}"
+        exit 1
+  ;;
+esac
+
+exit 0
diff --git a/insserv.conf.d/gdm3 b/insserv.conf.d/gdm3
new file mode 100644 (file)
index 0000000..165b123
--- /dev/null
@@ -0,0 +1 @@
+$x-display-manager gdm3
diff --git a/mailcap b/mailcap
index 0a4ba2aac46eb454b2d4e373bc23b0033b5f5654..5c3f717f47f81283aa724bc1be9d04887d490891 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -50,6 +50,10 @@ application/vnd.sun.xml.math; soffice --nologo --math '%s'; edit=soffice --nolog
 application/vnd.sun.xml.writer; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw
 application/vnd.sun.xml.writer.global; soffice --nologo --global '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Master Document"; nametemplate=%s.sxg
 application/vnd.sun.xml.writer.template; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw
+image/svg+xml; inkscape '%s'; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' '%s'; edit=inkscape '%s'; compose=inkscape '%s'
+image/svg; inkscape '%s'; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' '%s'; edit=inkscape '%s';  compose=inkscape '%s'
+image/svg+xml; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' '%s'
+image/svg; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' '%s'
 video/mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"
 video/x-mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"
 video/mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"
@@ -143,6 +147,62 @@ application/x-zoo; engrampa %s; test=test -n "$DISPLAY"
 application/zip; engrampa %s; test=test -n "$DISPLAY"
 application/x-archive; engrampa %s; test=test -n "$DISPLAY"
 application/vnd.ms-cab-compressed; engrampa %s; test=test -n "$DISPLAY"
+image/bmp; eog %s; test=test -n "$DISPLAY"
+image/gif; eog %s; test=test -n "$DISPLAY"
+image/jpeg; eog %s; test=test -n "$DISPLAY"
+image/jpg; eog %s; test=test -n "$DISPLAY"
+image/pjpeg; eog %s; test=test -n "$DISPLAY"
+image/png; eog %s; test=test -n "$DISPLAY"
+image/tiff; eog %s; test=test -n "$DISPLAY"
+image/x-bmp; eog %s; test=test -n "$DISPLAY"
+image/x-gray; eog %s; test=test -n "$DISPLAY"
+image/x-icb; eog %s; test=test -n "$DISPLAY"
+image/x-ico; eog %s; test=test -n "$DISPLAY"
+image/x-png; eog %s; test=test -n "$DISPLAY"
+image/x-portable-anymap; eog %s; test=test -n "$DISPLAY"
+image/x-portable-bitmap; eog %s; test=test -n "$DISPLAY"
+image/x-portable-graymap; eog %s; test=test -n "$DISPLAY"
+image/x-portable-pixmap; eog %s; test=test -n "$DISPLAY"
+image/x-xbitmap; eog %s; test=test -n "$DISPLAY"
+image/x-xpixmap; eog %s; test=test -n "$DISPLAY"
+image/x-pcx; eog %s; test=test -n "$DISPLAY"
+image/svg+xml; eog %s; test=test -n "$DISPLAY"
+image/svg+xml-compressed; eog %s; test=test -n "$DISPLAY"
+image/vnd.wap.wbmp; eog %s; test=test -n "$DISPLAY"
+application/pdf; evince %s; test=test -n "$DISPLAY"
+application/x-bzpdf; evince %s; test=test -n "$DISPLAY"
+application/x-gzpdf; evince %s; test=test -n "$DISPLAY"
+application/x-xzpdf; evince %s; test=test -n "$DISPLAY"
+application/x-ext-pdf; evince %s; test=test -n "$DISPLAY"
+application/postscript; evince %s; test=test -n "$DISPLAY"
+application/x-bzpostscript; evince %s; test=test -n "$DISPLAY"
+application/x-gzpostscript; evince %s; test=test -n "$DISPLAY"
+image/x-eps; evince %s; test=test -n "$DISPLAY"
+image/x-bzeps; evince %s; test=test -n "$DISPLAY"
+image/x-gzeps; evince %s; test=test -n "$DISPLAY"
+application/x-ext-ps; evince %s; test=test -n "$DISPLAY"
+application/x-ext-eps; evince %s; test=test -n "$DISPLAY"
+application/illustrator; evince %s; test=test -n "$DISPLAY"
+application/x-dvi; evince %s; test=test -n "$DISPLAY"
+application/x-bzdvi; evince %s; test=test -n "$DISPLAY"
+application/x-gzdvi; evince %s; test=test -n "$DISPLAY"
+application/x-ext-dvi; evince %s; test=test -n "$DISPLAY"
+image/vnd.djvu+multipage; evince %s; test=test -n "$DISPLAY"
+application/x-ext-djv; evince %s; test=test -n "$DISPLAY"
+application/x-ext-djvu; evince %s; test=test -n "$DISPLAY"
+image/tiff; evince %s; test=test -n "$DISPLAY"
+application/x-cbr; evince %s; test=test -n "$DISPLAY"
+application/x-cbz; evince %s; test=test -n "$DISPLAY"
+application/x-cb7; evince %s; test=test -n "$DISPLAY"
+application/x-cbt; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cbr; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cbz; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cb7; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cbt; evince %s; test=test -n "$DISPLAY"
+application/vnd.comicbook+zip; evince %s; test=test -n "$DISPLAY"
+application/vnd.comicbook-rar; evince %s; test=test -n "$DISPLAY"
+application/oxps; evince %s; test=test -n "$DISPLAY"
+application/vnd.ms-xpsdocument; evince %s; test=test -n "$DISPLAY"
 text/html; firefox -private-window %s; test=test -n "$DISPLAY"
 text/xml; firefox -private-window %s; test=test -n "$DISPLAY"
 application/xhtml+xml; firefox -private-window %s; test=test -n "$DISPLAY"
@@ -158,6 +218,7 @@ x-scheme-handler/ftp; firefox -private-window %s; test=test -n "$DISPLAY"
 x-scheme-handler/chrome; firefox -private-window %s; test=test -n "$DISPLAY"
 video/webm; firefox -private-window %s; test=test -n "$DISPLAY"
 application/x-xpinstall; firefox -private-window %s; test=test -n "$DISPLAY"
+application/vnd.iccprofile; /usr/bin/gcm-import %s; test=test -n "$DISPLAY"
 application/pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
 application/pkcs12+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
 application/pkcs7-mime; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
@@ -244,6 +305,15 @@ application/x-raw-disk-image; gnome-disk-image-mounter %s; test=test -n "$DISPLA
 application/x-cd-image; gnome-disks --restore-disk-image %s; test=test -n "$DISPLAY"
 application/x-raw-disk-image; gnome-disks --restore-disk-image %s; test=test -n "$DISPLAY"
 application/x-raw-disk-image-xz-compressed; gnome-disks --restore-disk-image %s; test=test -n "$DISPLAY"
+application/x-rpm; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/x-redhat-package-manager; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/x-deb; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/x-app-package; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/vnd.ms-cab-compressed; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/vnd.flatpak; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/vnd.flatpak.repo; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/vnd.flatpak.ref; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
+application/vnd.snap; gnome-software --local-filename=%s; test=test -n "$DISPLAY"
 x-scheme-handler/note; gnote %s; test=test -n "$DISPLAY"
 application/pdf; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
 application/rdf+xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
@@ -421,6 +491,81 @@ application/x-gnome-saved-search; nemo trash:/// %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"
 application/x-jar; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY"
+inode/directory; baobab %s; test=test -n "$DISPLAY"
+text/calendar; gnome-calendar %s; test=test -n "$DISPLAY"
+text/calendar; evolution -c tasks %s; test=test -n "$DISPLAY"
+text/x-vcard; evolution -c tasks %s; test=test -n "$DISPLAY"
+text/directory; evolution -c tasks %s; test=test -n "$DISPLAY"
+application/mbox; evolution -c tasks %s; test=test -n "$DISPLAY"
+message/rfc822; evolution -c tasks %s; test=test -n "$DISPLAY"
+x-scheme-handler/mailto; evolution -c tasks %s; test=test -n "$DISPLAY"
+x-scheme-handler/webcal; evolution -c tasks %s; test=test -n "$DISPLAY"
+application/x-7z-compressed; file-roller %s; test=test -n "$DISPLAY"
+application/x-7z-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-ace; file-roller %s; test=test -n "$DISPLAY"
+application/x-alz; file-roller %s; test=test -n "$DISPLAY"
+application/x-ar; file-roller %s; test=test -n "$DISPLAY"
+application/x-arj; file-roller %s; test=test -n "$DISPLAY"
+application/x-bzip; file-roller %s; test=test -n "$DISPLAY"
+application/x-bzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-bzip1; file-roller %s; test=test -n "$DISPLAY"
+application/x-bzip1-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-cabinet; file-roller %s; test=test -n "$DISPLAY"
+application/x-cd-image; file-roller %s; test=test -n "$DISPLAY"
+application/x-compress; file-roller %s; test=test -n "$DISPLAY"
+application/x-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-cpio; file-roller %s; test=test -n "$DISPLAY"
+application/x-deb; file-roller %s; test=test -n "$DISPLAY"
+application/x-ear; file-roller %s; test=test -n "$DISPLAY"
+application/x-ms-dos-executable; file-roller %s; test=test -n "$DISPLAY"
+application/x-gtar; file-roller %s; test=test -n "$DISPLAY"
+application/x-gzip; file-roller %s; test=test -n "$DISPLAY"
+application/x-gzpostscript; file-roller %s; test=test -n "$DISPLAY"
+application/x-java-archive; file-roller %s; test=test -n "$DISPLAY"
+application/x-lha; file-roller %s; test=test -n "$DISPLAY"
+application/x-lhz; file-roller %s; test=test -n "$DISPLAY"
+application/x-lrzip; file-roller %s; test=test -n "$DISPLAY"
+application/x-lrzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-lz4; file-roller %s; test=test -n "$DISPLAY"
+application/x-lzip; file-roller %s; test=test -n "$DISPLAY"
+application/x-lzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-lzma; file-roller %s; test=test -n "$DISPLAY"
+application/x-lzma-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-lzop; file-roller %s; test=test -n "$DISPLAY"
+application/x-lz4-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-lzop-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-ms-wim; file-roller %s; test=test -n "$DISPLAY"
+application/x-rar; file-roller %s; test=test -n "$DISPLAY"
+application/x-rar-compressed; file-roller %s; test=test -n "$DISPLAY"
+application/x-rpm; file-roller %s; test=test -n "$DISPLAY"
+application/x-source-rpm; file-roller %s; test=test -n "$DISPLAY"
+application/x-rzip; file-roller %s; test=test -n "$DISPLAY"
+application/x-rzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-tarz; file-roller %s; test=test -n "$DISPLAY"
+application/x-stuffit; file-roller %s; test=test -n "$DISPLAY"
+application/x-war; file-roller %s; test=test -n "$DISPLAY"
+application/x-xz; file-roller %s; test=test -n "$DISPLAY"
+application/x-xz-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-zip; file-roller %s; test=test -n "$DISPLAY"
+application/x-zip-compressed; file-roller %s; test=test -n "$DISPLAY"
+application/x-zoo; file-roller %s; test=test -n "$DISPLAY"
+application/zip; file-roller %s; test=test -n "$DISPLAY"
+application/x-archive; file-roller %s; test=test -n "$DISPLAY"
+application/vnd.ms-cab-compressed; file-roller %s; test=test -n "$DISPLAY"
+application/vnd.debian.binary-package; file-roller %s; test=test -n "$DISPLAY"
+application/gzip; file-roller %s; test=test -n "$DISPLAY"
+application/x-font-ttf; gnome-font-viewer %s; test=test -n "$DISPLAY"
+application/x-font-pcf; gnome-font-viewer %s; test=test -n "$DISPLAY"
+application/x-font-type1; gnome-font-viewer %s; test=test -n "$DISPLAY"
+application/x-font-otf; gnome-font-viewer %s; test=test -n "$DISPLAY"
+font/ttf; gnome-font-viewer %s; test=test -n "$DISPLAY"
+font/otf; gnome-font-viewer %s; test=test -n "$DISPLAY"
+text/plain; gedit --new-document %s; test=test -n "$DISPLAY"
+application/vnd.geo+json; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
+x-scheme-handler/geo; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
+application/vnd.google-earth.kml+xml; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
+application/gpx+xml; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
 inode/directory; nautilus --new-window %s; test=test -n "$DISPLAY"
 application/x-7z-compressed; nautilus --new-window %s; test=test -n "$DISPLAY"
 application/x-7z-compressed-tar; nautilus --new-window %s; test=test -n "$DISPLAY"
@@ -443,11 +588,221 @@ application/x-xz-compressed-tar; nautilus --new-window %s; test=test -n "$DISPLA
 application/zip; nautilus --new-window %s; test=test -n "$DISPLAY"
 application/gzip; nautilus --new-window %s; test=test -n "$DISPLAY"
 application/bzip2; nautilus --new-window %s; test=test -n "$DISPLAY"
+x-scheme-handler/appstream; gnome-software %s; test=test -n "$DISPLAY"
+x-scheme-handler/apt; gnome-software %s; test=test -n "$DISPLAY"
+x-scheme-handler/snap; gnome-software %s; test=test -n "$DISPLAY"
+application/mxf; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/ram; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/sdp; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/smil; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/smil+xml; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/vnd.apple.mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/vnd.ms-asf; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/vnd.ms-wpl; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/vnd.rn-realmedia; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/vnd.rn-realmedia-vbr; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-extension-m4a; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-extension-mp4; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-flac; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-flash-video; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-matroska; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-netshow-channel; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-quicktime-media-link; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-quicktimeplayer; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-shorten; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/x-smil; totem --fullscreen %s; test=test -n "$DISPLAY"
+application/xspf+xml; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/3gpp; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/3gpp2; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/aac; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/ac3; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/AMR; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/AMR-WB; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/basic; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/dv; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/eac3; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/flac; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/m4a; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/midi; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mp1; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mp2; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mp3; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mp4; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/mpg; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/opus; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/prs.sid; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/scpls; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/vnd.rn-realaudio; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/wav; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/webm; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-aac; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-aiff; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-ape; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-flac; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-gsm; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-it; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-m4a; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-matroska; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mod; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mp1; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mp2; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mp3; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mpg; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-ms-asf; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-ms-asx; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-ms-wax; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-ms-wma; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-musepack; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-pn-aiff; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-pn-au; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-pn-realaudio; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-pn-realaudio-plugin; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-pn-wav; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-pn-windows-acm; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-realaudio; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-real-audio; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-s3m; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-sbc; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-scpls; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-shorten; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-speex; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-stm; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-tta; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-wav; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-wavpack; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-vorbis; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-vorbis+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+audio/x-xm; totem --fullscreen %s; test=test -n "$DISPLAY"
+image/vnd.rn-realpix; totem --fullscreen %s; test=test -n "$DISPLAY"
+image/x-pict; totem --fullscreen %s; test=test -n "$DISPLAY"
+misc/ultravox; totem --fullscreen %s; test=test -n "$DISPLAY"
+text/google-video-pointer; totem --fullscreen %s; test=test -n "$DISPLAY"
+text/x-google-video-pointer; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/3gp; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/3gpp; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/3gpp2; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/dv; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/divx; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/fli; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/flv; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/mp2t; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/mp4; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/mp4v-es; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/mpeg-system; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/msvideo; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/quicktime; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/vivo; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/vnd.divx; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/vnd.mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/vnd.rn-realvideo; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/vnd.vivo; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/webm; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-anim; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-avi; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-flc; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-fli; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-flic; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-flv; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-m4v; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-matroska; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-mpeg2; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-asf; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-asf-plugin; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-asx; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-msvideo; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-wm; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-wmv; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-wmx; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ms-wvx; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-nsv; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-ogm+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-theora; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-theora+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
+video/x-totem-stream; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-content/video-dvd; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-content/video-vcd; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-content/video-svcd; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/pnm; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/mms; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/net; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtp; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtmp; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtsp; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/mmsh; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/uvox; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/icy; totem --fullscreen %s; test=test -n "$DISPLAY"
+x-scheme-handler/icyx; totem --fullscreen %s; test=test -n "$DISPLAY"
 application/x-keepass2; keepassxc %s; test=test -n "$DISPLAY"
 x-content/image-dcf; pix --import-photos %s; test=test -n "$DISPLAY"
 x-content/image-picturecd; pix --import-photos %s; test=test -n "$DISPLAY"
 x-content/audio-player; rhythmbox-client --select-source %s; test=test -n "$DISPLAY"
 x-content/audio-cdda; rhythmbox-client --select-source %s; test=test -n "$DISPLAY"
+image/jpeg; shotwell %s; test=test -n "$DISPLAY"
+image/jpg; shotwell %s; test=test -n "$DISPLAY"
+image/pjpeg; shotwell %s; test=test -n "$DISPLAY"
+image/png; shotwell %s; test=test -n "$DISPLAY"
+image/tiff; shotwell %s; test=test -n "$DISPLAY"
+image/x-3fr; shotwell %s; test=test -n "$DISPLAY"
+image/x-adobe-dng; shotwell %s; test=test -n "$DISPLAY"
+image/x-arw; shotwell %s; test=test -n "$DISPLAY"
+image/x-bay; shotwell %s; test=test -n "$DISPLAY"
+image/x-bmp; shotwell %s; test=test -n "$DISPLAY"
+image/x-canon-cr2; shotwell %s; test=test -n "$DISPLAY"
+image/x-canon-crw; shotwell %s; test=test -n "$DISPLAY"
+image/x-cap; shotwell %s; test=test -n "$DISPLAY"
+image/x-cr2; shotwell %s; test=test -n "$DISPLAY"
+image/x-crw; shotwell %s; test=test -n "$DISPLAY"
+image/x-dcr; shotwell %s; test=test -n "$DISPLAY"
+image/x-dcraw; shotwell %s; test=test -n "$DISPLAY"
+image/x-dcs; shotwell %s; test=test -n "$DISPLAY"
+image/x-dng; shotwell %s; test=test -n "$DISPLAY"
+image/x-drf; shotwell %s; test=test -n "$DISPLAY"
+image/x-eip; shotwell %s; test=test -n "$DISPLAY"
+image/x-erf; shotwell %s; test=test -n "$DISPLAY"
+image/x-fff; shotwell %s; test=test -n "$DISPLAY"
+image/x-fuji-raf; shotwell %s; test=test -n "$DISPLAY"
+image/x-iiq; shotwell %s; test=test -n "$DISPLAY"
+image/x-k25; shotwell %s; test=test -n "$DISPLAY"
+image/x-kdc; shotwell %s; test=test -n "$DISPLAY"
+image/x-mef; shotwell %s; test=test -n "$DISPLAY"
+image/x-minolta-mrw; shotwell %s; test=test -n "$DISPLAY"
+image/x-mos; shotwell %s; test=test -n "$DISPLAY"
+image/x-mrw; shotwell %s; test=test -n "$DISPLAY"
+image/x-nef; shotwell %s; test=test -n "$DISPLAY"
+image/x-nikon-nef; shotwell %s; test=test -n "$DISPLAY"
+image/x-nrw; shotwell %s; test=test -n "$DISPLAY"
+image/x-olympus-orf; shotwell %s; test=test -n "$DISPLAY"
+image/x-orf; shotwell %s; test=test -n "$DISPLAY"
+image/x-panasonic-raw; shotwell %s; test=test -n "$DISPLAY"
+image/x-pef; shotwell %s; test=test -n "$DISPLAY"
+image/x-pentax-pef; shotwell %s; test=test -n "$DISPLAY"
+image/x-png; shotwell %s; test=test -n "$DISPLAY"
+image/x-ptx; shotwell %s; test=test -n "$DISPLAY"
+image/x-pxn; shotwell %s; test=test -n "$DISPLAY"
+image/x-r3d; shotwell %s; test=test -n "$DISPLAY"
+image/x-raf; shotwell %s; test=test -n "$DISPLAY"
+image/x-raw; shotwell %s; test=test -n "$DISPLAY"
+image/x-rw2; shotwell %s; test=test -n "$DISPLAY"
+image/x-rwl; shotwell %s; test=test -n "$DISPLAY"
+image/x-rwz; shotwell %s; test=test -n "$DISPLAY"
+image/x-sigma-x3f; shotwell %s; test=test -n "$DISPLAY"
+image/x-sony-arw; shotwell %s; test=test -n "$DISPLAY"
+image/x-sony-sr2; shotwell %s; test=test -n "$DISPLAY"
+image/x-sony-srf; shotwell %s; test=test -n "$DISPLAY"
+image/x-sr2; shotwell %s; test=test -n "$DISPLAY"
+image/x-srf; shotwell %s; test=test -n "$DISPLAY"
+image/x-x3f; shotwell %s; test=test -n "$DISPLAY"
+x-content/image-dcf; shotwell %s; test=test -n "$DISPLAY"
 x-scheme-handler/mailto; thunderbird -addressbook %s; test=test -n "$DISPLAY"
 application/x-xpinstall; thunderbird -addressbook %s; test=test -n "$DISPLAY"
 text/english; vim %s; needsterminal
@@ -465,6 +820,9 @@ text/x-tex; vim %s; needsterminal
 application/x-shellscript; vim %s; needsterminal
 text/x-c; vim %s; needsterminal
 text/x-c++; vim %s; needsterminal
+application/x-vnc; vinagre -F %s; test=test -n "$DISPLAY"
+application/x-remote-connection; vinagre %s; test=test -n "$DISPLAY"
+x-scheme-handler/vnc; vinagre %s; test=test -n "$DISPLAY"
 text/plain; xed %s; test=test -n "$DISPLAY"
 application/pdf; xreader %s; test=test -n "$DISPLAY"
 application/x-bzpdf; xreader %s; test=test -n "$DISPLAY"
diff --git a/pam.d/gdm-autologin b/pam.d/gdm-autologin
new file mode 100644 (file)
index 0000000..26e9701
--- /dev/null
@@ -0,0 +1,23 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth   required        pam_succeed_if.so user != root quiet_success
+auth   optional        pam_gdm.so
+auth   optional        pam_gnome_keyring.so
+auth    required        pam_permit.so
+@include common-account
+# SELinux needs to be the first session rule. This ensures that any 
+# lingering context has been cleared. Without this it is possible 
+# that a module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+session required        pam_loginuid.so
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+session optional        pam_keyinit.so force revoke
+session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
+@include common-session
+session optional        pam_gnome_keyring.so auto_start
+@include common-password
diff --git a/pam.d/gdm-fingerprint b/pam.d/gdm-fingerprint
new file mode 100644 (file)
index 0000000..d5b901a
--- /dev/null
@@ -0,0 +1,22 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth   required        pam_succeed_if.so user != root quiet_success
+auth   required        pam_fprintd.so
+auth    optional        pam_gnome_keyring.so
+@include common-account
+# SELinux needs to be the first session rule. This ensures that any 
+# lingering context has been cleared. Without this it is possible 
+# that a module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+session required        pam_loginuid.so
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+session optional        pam_keyinit.so force revoke
+session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
+@include common-session
+session optional        pam_gnome_keyring.so auto_start
+password required       pam_fprintd.so
diff --git a/pam.d/gdm-launch-environment b/pam.d/gdm-launch-environment
new file mode 100644 (file)
index 0000000..aed9ae0
--- /dev/null
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth    required        pam_permit.so
+@include common-account
+session optional        pam_keyinit.so force revoke
+session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
+@include common-session
+@include common-password
diff --git a/pam.d/gdm-password b/pam.d/gdm-password
new file mode 100644 (file)
index 0000000..7ed2b16
--- /dev/null
@@ -0,0 +1,22 @@
+#%PAM-1.0
+auth    requisite       pam_nologin.so
+auth   required        pam_succeed_if.so user != root quiet_success
+@include common-auth
+auth    optional        pam_gnome_keyring.so
+@include common-account
+# SELinux needs to be the first session rule. This ensures that any 
+# lingering context has been cleared. Without this it is possible 
+# that a module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so close
+session required        pam_loginuid.so
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
+session optional        pam_keyinit.so force revoke
+session required        pam_limits.so
+session required        pam_env.so readenv=1
+session required        pam_env.so readenv=1 user_readenv=1 envfile=/etc/default/locale
+@include common-session
+session optional        pam_gnome_keyring.so auto_start
+@include common-password
diff --git a/passwd b/passwd
index 8ff65d517cde7334e1ae0605ced0a25fb5fde19d..ea93674fdade9d86101c5ea944e0f93701fde52d 100644 (file)
--- a/passwd
+++ b/passwd
@@ -53,3 +53,4 @@ vivi:x:1006:100:Vivien Musterer:/home/vivi:/bin/sh
 kameu:x:1001:100:Karin Meusel:/home/kameu:/bin/sh
 plex:x:136:963:Plex Media Server:/var/lib/plexmediaserver:/bin/sh
 _chrony:x:126:135:Chrony daemon,,,:/var/lib/chrony:/usr/sbin/nologin
+gdm:x:112:118:Gnome Display Manager:/var/lib/gdm3:/bin/false
diff --git a/passwd- b/passwd-
index 96e2b24d9e3d61eb8149d086c1388ec878f03d44..43430904d7b3fa82977c15883c7e3584ea6b4b38 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -28,7 +28,6 @@ rtkit:x:108:113:RealtimeKit,,,:/proc:/usr/sbin/nologin
 avahi-autoipd:x:109:114:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/usr/sbin/nologin
 usbmux:x:110:46:usbmux daemon,,,:/var/lib/usbmux:/usr/sbin/nologin
 systemd-coredump:x:111:117:systemd core dump processing,,,:/run/systemd:/usr/sbin/nologin
-ntp:x:112:118::/nonexistent:/usr/sbin/nologin
 lightdm:x:113:119:Light Display Manager:/var/lib/lightdm:/bin/false
 dnsmasq:x:114:65534:dnsmasq,,,:/var/lib/misc:/usr/sbin/nologin
 saned:x:115:122::/var/lib/saned:/usr/sbin/nologin
@@ -54,3 +53,4 @@ vivi:x:1006:100:Vivien Musterer:/home/vivi:/bin/sh
 kameu:x:1001:100:Karin Meusel:/home/kameu:/bin/sh
 plex:x:136:963:Plex Media Server:/var/lib/plexmediaserver:/bin/sh
 _chrony:x:126:135:Chrony daemon,,,:/var/lib/chrony:/usr/sbin/nologin
+gdm:x:112:118::/var/lib/gdm3:/bin/false
diff --git a/profile.d/cedilla-portuguese.sh b/profile.d/cedilla-portuguese.sh
new file mode 100644 (file)
index 0000000..d5794b2
--- /dev/null
@@ -0,0 +1,24 @@
+# cedilla-portuguese.sh (c) 2015 Canonical
+# Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
+#
+# Released under the GPL
+#
+# File: /etc/profile.d/cedilla-portuguese.sh
+# 
+# The desired behavior when typing in certain languages is that
+# '+c results in the ç character, and not ć. In Portuguese this
+# can be achieved by setting LC_CTYPE to either pt_BR.UTF-8 or
+# pt_PT.UTF-8. Related files:
+# /usr/share/X11/locale/pt_BR.UTF-8/Compose
+# /usr/share/X11/locale/pt_PT.UTF-8/Compose
+#
+# When the selected display language is Portuguese (either Brazilian
+# Portuguese or Portuguese as spoken in Portugal), LC_CTYPE inherits
+# the desired value from LANG. Due to this file, setting the Regional
+# Formats value to Portuguese (Brazil) or Portuguese (Portugal) is
+# sufficient to enable the just mentioned behavior, even if the
+# display language is something else but Portuguese.
+#
+if [ "${LC_IDENTIFICATION%_*}" = 'pt' -a "${LANG%_*}" != 'pt' ]; then
+    export LC_CTYPE="${LC_IDENTIFICATION%.*}.UTF-8"
+fi
diff --git a/profile.d/xdg_dirs_desktop_session.sh b/profile.d/xdg_dirs_desktop_session.sh
new file mode 100644 (file)
index 0000000..46eaa94
--- /dev/null
@@ -0,0 +1,25 @@
+# /etc/profile.d/desktop_session_xdg_dirs.sh - Prepend a $DESKTOP_SESSION-named directory to $XDG_CONFIG_DIRS and $XDG_DATA_DIRS
+
+DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
+DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
+
+if [ -n "$DESKTOP_SESSION" ]; then
+  # readd default if was empty
+  if [ -z "$XDG_CONFIG_DIRS" ]; then
+    XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"
+  fi
+  if [ -n "${XDG_CONFIG_DIRS##*$DEFAULT_XDG_CONFIG_DIRS/xdg-$DESKTOP_SESSION*}" ]; then
+    XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$XDG_CONFIG_DIRS"
+  fi
+  export XDG_CONFIG_DIRS
+  # gnome is already added if gnome-session installed
+  if [ "$DESKTOP_SESSION" != "gnome" ]; then
+     if [ -z "$XDG_DATA_DIRS" ]; then
+       XDG_DATA_DIRS="$DEFAULT_XDG_DATA_DIRS"
+     fi
+     if [ -n "${XDG_DATA_DIRS##*/usr/share/$DESKTOP_SESSION*}" ]; then
+       XDG_DATA_DIRS=/usr/share/"$DESKTOP_SESSION":"$XDG_DATA_DIRS"
+     fi
+     export XDG_DATA_DIRS
+  fi
+fi
diff --git a/rc0.d/K01gdm3 b/rc0.d/K01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rc1.d/K01gdm3 b/rc1.d/K01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rc2.d/S01gdm3 b/rc2.d/S01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rc3.d/S01gdm3 b/rc3.d/S01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rc4.d/S01gdm3 b/rc4.d/S01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rc5.d/S01gdm3 b/rc5.d/S01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rc6.d/K01gdm3 b/rc6.d/K01gdm3
new file mode 120000 (symlink)
index 0000000..ad83344
--- /dev/null
@@ -0,0 +1 @@
+../init.d/gdm3
\ No newline at end of file
diff --git a/rygel.conf b/rygel.conf
new file mode 100644 (file)
index 0000000..14c19cd
--- /dev/null
@@ -0,0 +1,158 @@
+# Configuration file for Rygel
+
+# General configuration options
+[general]
+
+# Set it to 'false' if you want to disable transcoding support.
+enable-transcoding=true
+
+# Where video files should be saved if allow-upload is true.
+# Defaults to @VIDEOS@, the standard videos folder (typically ${HOME}/Videos).
+video-upload-folder=@VIDEOS@
+
+# Where music files should be saved if allow-upload is true
+# Defaults to @MUSIC@, the standard music folder (typically ${HOME}/Music).
+music-upload-folder=@MUSIC@
+
+# Where picture files should be saved if allow-upload is true
+# Defaults to @PICTURES@, the standard picture folder (typically ${HOME}/Pictures).
+picture-upload-folder=@PICTURES@
+
+# Default media engine to load. If not specified, the engine directory is
+# searched recursively and the first engine found is loaded.
+media-engine=librygel-media-engine-gst.so
+
+# List of network interfaces to attach rygel to. You can also use network IP or
+# even ESSID for wireless networks on Linux. Leave it blank for dynamic
+# configuration.
+interface=
+
+# The port to run HTTP server on. 0 means dynamic.
+port=0
+
+# Comma-separated list of domain:level pairs to specify log level thresholds for
+# individual domains. domain could be either 'rygel', name of a plugin or '*'
+# for all domains. Allowed levels are:
+#
+# 1=critical
+# 2=error
+# 3=warning
+# 4=message/info
+# 5=debug
+log-level=*:4
+
+# Allow upload of media files?
+allow-upload=false
+
+# Allow deletion of media folders and files?
+allow-deletion=false
+
+# Semicolon-separated list of device user-agents (or parts thereof) that need
+# a downgrade in the UPnP device versions
+# WARNING /!\: Only change this setting when told to do so or when you know
+#              what you're doing. If you find that adding your device makes it
+#              working with Rygel, please file a bug at
+#              https://bugzilla.gnome.org/enter_bug.cgi?product=Rygel&component=IOP
+#              so we can include it in future releases.
+#force-downgrade-for=Allegro-Software-WebClient;SEC_HHP;SEC HHP;Mediabolic-IMHTTP/1;TwoPlayer;Reciva;FDSSDP;Portable SDK for UPnP devices;Darwin
+
+# Plugin specific sections
+#
+# Some options are generic and some are specific to each plugin.
+# The generic ones are:
+#
+# * enabled: As the name suggests, to enable or disable the plugin.
+# * title: The title of the plugin to advertise to UPnP clients. This can
+#          contain the following automatically substituted keywords:
+#       * @REALNAME@: The real name of the user as returned by
+#                     g_get_real_name() function of glib library.
+#       * @USERNAME@: The user name of the user as returned by
+#                     g_get_user_name() function of glib library.
+#       * @HOSTNAME@: The host name of the machine rygel is running on, as
+#                     returned by g_get_host_name() function of glib library.
+#
+
+# Options related to the used media backend.
+# The options shown in this configuration file are specific to GStreamer.
+[GstMediaEngine]
+
+# List of active transcoders. To disable one, remove from list.
+transcoders=mp3;lpcm;mp2ts;wmv;aac;avc
+
+# Options that apply to the renderer framework in general
+[Renderer]
+
+# Default showtime in seconds to use for images in playlists if dlna:lifetime
+# is not set. DLNA wants something between 5 and 15 seconds.
+image-timeout = 15
+
+[Tracker]
+enabled=true
+only-export-from=@MUSIC@;@VIDEOS@;@PICTURES@
+share-pictures=true
+share-videos=true
+share-music=true
+strict-sharing=false
+title=@REALNAME@'s media on @PRETTY_HOSTNAME@
+
+[LMS]
+enabled=false
+title=@REALNAME@'s media on @PRETTY_HOSTNAME@
+
+[MediaExport]
+enabled=true
+title=@REALNAME@'s media on @PRETTY_HOSTNAME@
+# List of URIs to export. Following variables are automatically substituted by
+# the appropriate XDG standard media folders by Rygel for you.
+#
+#       * @MUSIC@: The standard music folder (typically ${HOME}/Music).
+#       * @VIDEOS@: The standard videos folder (typically ${HOME}/Videos).
+#       * @PICTURES@: The standard pictures folder (typically ${HOME}/Pictures).
+#
+uris=@MUSIC@;@VIDEOS@;@PICTURES@
+extract-metadata=true
+monitor-changes=true
+monitor-grace-timeout=5
+virtual-folders=true
+
+[Playbin]
+enabled=true
+title=Audio/Video playback on @PRETTY_HOSTNAME@
+
+[GstLaunch]
+enabled=false
+launch-items=audiotestsrc;videotestsrc;videotestoverlay
+audiotestsrc-title=Audiotestsrc
+audiotestsrc-mime=audio/x-wav
+audiotestsrc-launch=audiotestsrc ! wavenc
+videotestsrc-title=Videotestsrc
+videotestsrc-mime=video/mpeg
+videotestsrc-launch=videotestsrc ! avenc_mpeg2video ! mpegtsmux
+videotestoverlay-title=Videotestsrc with timeoverlay 2
+videotestoverlay-mime=video/mpeg
+videotestoverlay-launch=videotestsrc ! timeoverlay ! avenc_mpeg2video ! mpegtsmux
+
+[Test]
+enabled=false
+
+[ExampleServerPluginVala]
+enabled=false
+
+[ExampleServerPluginC]
+enabled=false
+
+[ExampleRendererPluginVala]
+enabled=false
+
+[ExampleRendererPluginC]
+enabled=false
+
+[MPRIS]
+enabled=false
+
+[External]
+enabled=false
+
+[Ruih]
+enabled=false
+title=Rygel Remote UI Server
diff --git a/shadow b/shadow
index 340a10fbb98b71e87f7cee5b5f6174288b1d0c36..72308d3042bdaf6cc6a14100694075f9c3467948 100644 (file)
--- a/shadow
+++ b/shadow
@@ -53,3 +53,4 @@ vivi:!:18385:0:99999:7:::
 kameu:$6$5h/eHwOt$vHYM0Cxc6GsFbNjm5J4cdqjvmok6Ce9tSnP5Ox8MwDBHJ/ldTIId1ZGs4k8pa1OPgtMuw1yxvrwkAlvPrkJwQ/:17722:0:99999:7:::
 plex:!:18385:0:99999:7:::
 _chrony:*:18385:0:99999:7:::
+gdm:*:18385:0:99999:7:::
diff --git a/shadow- b/shadow-
index d7d529935515f0dfec2616464c43484d57a326b1..72308d3042bdaf6cc6a14100694075f9c3467948 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -28,7 +28,6 @@ rtkit:*:18246:0:99999:7:::
 avahi-autoipd:*:18246:0:99999:7:::
 usbmux:*:18246:0:99999:7:::
 systemd-coredump:*:18246:0:99999:7:::
-ntp:*:18246:0:99999:7:::
 lightdm:*:18246:0:99999:7:::
 dnsmasq:*:18246:0:99999:7:::
 saned:*:18246:0:99999:7:::
@@ -54,3 +53,4 @@ vivi:!:18385:0:99999:7:::
 kameu:$6$5h/eHwOt$vHYM0Cxc6GsFbNjm5J4cdqjvmok6Ce9tSnP5Ox8MwDBHJ/ldTIId1ZGs4k8pa1OPgtMuw1yxvrwkAlvPrkJwQ/:17722:0:99999:7:::
 plex:!:18385:0:99999:7:::
 _chrony:*:18385:0:99999:7:::
+gdm:*:18385:0:99999:7:::
diff --git a/xdg/autostart/caribou-autostart.desktop b/xdg/autostart/caribou-autostart.desktop
new file mode 100644 (file)
index 0000000..06eaf9b
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Caribou
+Exec=/usr/lib/caribou/caribou
+AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+X-GNOME-AutoRestart=true
+#X-GNOME-Autostart-Phase=Initialization
+NoDisplay=true
+OnlyShowIn=GNOME;Unity;
+X-Ubuntu-Gettext-Domain=caribou
diff --git a/xdg/autostart/gnome-software-service.desktop b/xdg/autostart/gnome-software-service.desktop
new file mode 100644 (file)
index 0000000..e13f0bf
--- /dev/null
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Software
+X-GNOME-Autostart-Delay=60
+Exec=/usr/bin/gnome-software --gapplication-service
+OnlyShowIn=GNOME;Unity;
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=gnome-software
diff --git a/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop b/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop
new file mode 100644 (file)
index 0000000..de063e3
--- /dev/null
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Type=Application
+Name=Evolution Alarm Notify
+Comment=Calendar event notifications
+Icon=appointment-soon
+Exec=/usr/lib/evolution/evolution-alarm-notify
+Terminal=false
+Categories=
+OnlyShowIn=GNOME;Unity;XFCE;Dawati;MATE;
+NoDisplay=true
+X-Meego-Priority=Low
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=evolution
+X-GNOME-Bugzilla-Component=calendar
+X-GNOME-Bugzilla-Version=3.28.x
+X-Ubuntu-Gettext-Domain=evolution
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop b/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
new file mode 100644 (file)
index 0000000..83b7e5a
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's a11y-settings plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-a11y-settings
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Clipboard.desktop
new file mode 100644 (file)
index 0000000..486a4af
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's clipboard plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-clipboard
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
new file mode 100644 (file)
index 0000000..deee262
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's color plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-color
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
new file mode 100644 (file)
index 0000000..0ece8af
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's datetime plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-datetime
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
new file mode 100644 (file)
index 0000000..96bddca
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's housekeeping plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-housekeeping
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
new file mode 100644 (file)
index 0000000..09bb6cc
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's keyboard plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-keyboard
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop b/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
new file mode 100644 (file)
index 0000000..07454f7
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's media-keys plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-media-keys
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Mouse.desktop
new file mode 100644 (file)
index 0000000..f0cbfc7
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's mouse plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-mouse
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
new file mode 100644 (file)
index 0000000..bbfb411
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's power plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-power
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop b/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
new file mode 100644 (file)
index 0000000..7d66ad0
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's print-notifications plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-print-notifications
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
new file mode 100644 (file)
index 0000000..72af69a
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's rfkill plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-rfkill
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop b/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
new file mode 100644 (file)
index 0000000..e45ed95
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's screensaver-proxy plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-screensaver-proxy
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
new file mode 100644 (file)
index 0000000..01b0f1c
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's sharing plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-sharing
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
new file mode 100644 (file)
index 0000000..af78149
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's smartcard plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-smartcard
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
new file mode 100644 (file)
index 0000000..6861c07
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's sound plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-sound
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop b/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
new file mode 100644 (file)
index 0000000..69aacf2
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's wacom plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-wacom
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop b/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
new file mode 100644 (file)
index 0000000..6512e4b
--- /dev/null
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME Settings Daemon's xsettings plugin
+Exec=/usr/lib/gnome-settings-daemon/gsd-xsettings
+OnlyShowIn=GNOME;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+X-Ubuntu-Gettext-Domain=gnome-settings-daemon
diff --git a/xdg/autostart/tracker-store.desktop b/xdg/autostart/tracker-store.desktop
new file mode 100644 (file)
index 0000000..bf4c450
--- /dev/null
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Name=Tracker Store
+Comment=Metadata database store and lookup manager
+Icon=
+Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
+Terminal=false
+Type=Application
+Categories=Utility;
+X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
+OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=tracker
+X-GNOME-Bugzilla-Component=Store
+X-GNOME-Bugzilla-Version=2.0.3
+X-Ubuntu-Gettext-Domain=tracker
diff --git a/xdg/menus/gnome-applications.menu b/xdg/menus/gnome-applications.menu
new file mode 100644 (file)
index 0000000..3a70e20
--- /dev/null
@@ -0,0 +1,562 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Applications</Name>
+  <Directory>X-GNOME-Menu-Applications.directory</Directory>
+
+  <!-- Scan legacy dirs first, as later items take priority -->
+  <LegacyDir>/etc/X11/applnk</LegacyDir>
+  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <DefaultMergeDirs/>
+
+  <!-- Accessories submenu -->
+  <Menu>
+    <Name>Accessories</Name>
+    <Directory>Utility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Utility</Category>
+       <!-- Accessibility spec must have either the Utility or Settings
+             category, and we display an accessibility submenu already for
+             the ones that do not have Settings, so don't display accessibility
+             applications here -->
+        <Not><Category>Accessibility</Category></Not>
+        <Not><Category>System</Category></Not>
+        <Not><Category>X-GNOME-Utilities</Category></Not>
+      </And>
+    </Include>
+    <Exclude>
+      <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
+
+           Please keep the list alphabetically sorted! -->
+      <Filename>deja-dup-preferences.desktop</Filename>
+      <Filename>eog.desktop</Filename>
+      <Filename>evince.desktop</Filename>
+      <Filename>file-roller.desktop</Filename>
+      <Filename>gcalctool.desktop</Filename>
+      <Filename>gnome-dictionary.desktop</Filename>
+      <Filename>gnome-disks.desktop</Filename>
+      <Filename>gnome-font-viewer.desktop</Filename>
+      <Filename>gnome-screenshot.desktop</Filename>
+      <Filename>gnome-terminal.desktop</Filename>
+      <Filename>gnome-tweak-tool.desktop</Filename>
+      <Filename>gucharmap.desktop</Filename>
+      <Filename>seahorse.desktop</Filename>
+      <Filename>vinagre.desktop</Filename>
+      <Filename>yelp.desktop</Filename>
+
+      <!-- Exclude Sundry items -->
+    </Exclude>
+  </Menu> <!-- End Accessories -->
+
+
+  <!-- Accessibility submenu -->
+  <Menu>
+    <Name>Universal Access</Name>
+    <Directory>Utility-Accessibility.directory</Directory>
+    <Include>
+      <And>
+        <Category>Accessibility</Category>
+        <Not><Category>Settings</Category></Not>
+      </And>
+    </Include>
+
+    <Exclude>
+      <!-- Sundry exclusions -->
+      <Filename>orca.desktop</Filename>
+    </Exclude>
+  </Menu> <!-- End Accessibility -->
+
+  <!-- Development Tools -->
+  <Menu>
+    <Name>Development</Name>
+    <Directory>Development.directory</Directory>
+    <Include>
+      <And>
+        <Category>Development</Category>
+      </And>
+      <Filename>emacs.desktop</Filename>
+    </Include>
+
+    <Exclude>
+      <!-- Sundry exclusions -->
+      <Filename>jhbuild.desktop</Filename>
+      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+      <Filename>log4j-chainsaw.desktop</Filename>
+      <Filename>log4j-logfactor5.desktop</Filename>
+    </Exclude>
+  </Menu> <!-- End Development Tools -->
+
+  <!-- Education -->
+  <Menu>
+    <Name>Education</Name>
+    <Directory>Education.directory</Directory>
+    <Include>
+      <And>
+        <Category>Education</Category>
+        <Not><Category>Science</Category></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Education -->
+
+  <!-- Science -->
+  <Menu>
+    <Name>Science</Name>
+    <Directory>GnomeScience.directory</Directory>
+    <Include>
+      <And>
+        <Category>Education</Category>
+        <Category>Science</Category>
+      </And>
+    </Include>
+  </Menu> <!-- End Science -->
+
+  <!-- Games -->
+  <Menu>
+    <Name>Games</Name>
+    <Directory>Game.directory</Directory>
+    <Include>
+      <And>
+        <Category>Game</Category>
+        <Not><Category>ActionGame</Category></Not>
+        <Not><Category>AdventureGame</Category></Not>
+        <Not><Category>ArcadeGame</Category></Not>
+        <Not><Category>BoardGame</Category></Not>
+        <Not><Category>BlocksGame</Category></Not>
+        <Not><Category>CardGame</Category></Not>
+        <Not><Category>KidsGame</Category></Not>
+        <Not><Category>LogicGame</Category></Not>
+        <Not><Category>Simulation</Category></Not>
+        <Not><Category>SportsGame</Category></Not>
+        <Not><Category>StrategyGame</Category></Not>
+      </And>
+    </Include>
+    <DefaultLayout inline="true" inline_limit="6" inline_header="false">
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </DefaultLayout>
+    <Menu>
+      <Name>Action</Name>
+      <Directory>ActionGames.directory</Directory>
+      <Include>
+        <Category>ActionGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Adventure</Name>
+      <Directory>AdventureGames.directory</Directory>
+      <Include>
+        <Category>AdventureGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Arcade</Name>
+      <Directory>ArcadeGames.directory</Directory>
+      <Include>
+        <Category>ArcadeGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Board</Name>
+      <Directory>BoardGames.directory</Directory>
+      <Include>
+        <Category>BoardGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Blocks</Name>
+      <Directory>BlocksGames.directory</Directory>
+      <Include>
+        <Category>BlocksGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Cards</Name>
+      <Directory>CardGames.directory</Directory>
+      <Include>
+        <Category>CardGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Kids</Name>
+      <Directory>KidsGames.directory</Directory>
+      <Include>
+        <Category>KidsGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Logic</Name>
+      <Directory>LogicGames.directory</Directory>
+      <Include>
+        <Category>LogicGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Role Playing</Name>
+      <Directory>RolePlayingGames.directory</Directory>
+      <Include>
+        <Category>RolePlaying</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Simulation</Name>
+      <Directory>SimulationGames.directory</Directory>
+      <Include>
+        <Category>Simulation</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Sports</Name>
+      <Directory>SportsGames.directory</Directory>
+      <Include>
+        <Category>SportsGame</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Strategy</Name>
+      <Directory>StrategyGames.directory</Directory>
+      <Include>
+        <Category>StrategyGame</Category>
+      </Include>
+    </Menu>
+  </Menu> <!-- End Games -->
+
+  <!-- Graphics -->
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>Graphics.directory</Directory>
+    <Include>
+      <And>
+        <Category>Graphics</Category>
+        <Not><Filename>eog.desktop</Filename></Not>
+        <Not><Filename>gnome-eog.desktop</Filename></Not>
+        <Not><Filename>evince.desktop</Filename></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Graphics -->
+
+  <!-- Internet -->
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>Network.directory</Directory>
+    <Include>
+      <And>
+        <Category>Network</Category>
+       <Not><Category>X-GNOME-WebApplication</Category></Not>
+      </And>
+    </Include>
+
+    <Exclude>
+      <!-- Utilities exclusions -->
+      <Filename>vinagre.desktop</Filename>
+
+      <!-- Sundry exclusions -->
+      <Filename>javaws.desktop</Filename>
+    </Exclude>
+  </Menu>   <!-- End Internet -->
+
+  <!-- Web Applications -->
+  <Menu>
+    <Name>Web Applications</Name>
+    <Directory>X-GNOME-WebApplications.directory</Directory>
+    <Include>
+      <And>
+       <Category>Network</Category>
+       <Category>X-GNOME-WebApplication</Category>
+      </And>
+    </Include>
+  </Menu>
+
+  <!-- Multimedia -->
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>AudioVideo.directory</Directory>
+    <Include>
+      <And>
+        <Category>AudioVideo</Category>
+      </And>
+    </Include>
+  </Menu>   <!-- End Multimedia -->
+
+  <!-- Office -->
+  <Menu>
+    <Name>Office</Name>
+    <Directory>Office.directory</Directory>
+    <Include>
+      <And>
+        <Category>Office</Category>
+        <Not><Filename>evince.desktop</Filename></Not>
+        <Not><Filename>gnome-dictionary.desktop</Filename></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Office -->
+
+  <!-- Sundry -->
+  <Menu>
+    <Name>Sundry</Name>
+    <Directory>X-GNOME-Sundry.directory</Directory>
+    <Include>
+      <Filename>authconfig.desktop</Filename>
+      <Filename>dconf-editor.desktop</Filename>
+      <Filename>fedora-release-notes.desktop</Filename>
+      <Filename>firewall-config.desktop</Filename>
+      <Filename>flash-player-properties.desktop</Filename>
+      <Filename>gconf-editor.desktop</Filename>
+      <Filename>gnome-abrt.desktop</Filename>
+      <Filename>gnome-power-statistics.desktop</Filename>
+      <Filename>ibus-setup-anthy.desktop</Filename>
+      <Filename>ibus-setup.desktop</Filename>
+      <Filename>ibus-setup-hangul.desktop</Filename>
+      <Filename>ibus-setup-libbopomofo.desktop</Filename>
+      <Filename>ibus-setup-libpinyin.desktop</Filename>
+      <Filename>ibus-setup-m17n.desktop</Filename>
+      <Filename>ibus-setup-typing-booster.desktop</Filename>
+      <Filename>im-chooser.desktop</Filename>
+      <Filename>itweb-settings.desktop</Filename>
+      <Filename>jhbuild.desktop</Filename>
+      <Filename>javaws.desktop</Filename>
+      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+      <Filename>log4j-chainsaw.desktop</Filename>
+      <Filename>log4j-logfactor5.desktop</Filename>
+      <Filename>nm-connection-editor.desktop</Filename>
+      <Filename>orca.desktop</Filename>
+      <Filename>setroubleshoot.desktop</Filename>
+      <Filename>system-config-date.desktop</Filename>
+      <Filename>system-config-firewall.desktop</Filename>
+      <Filename>system-config-keyboard.desktop</Filename>
+      <Filename>system-config-language.desktop</Filename>
+      <Filename>system-config-printer.desktop</Filename>
+      <Filename>system-config-users.desktop</Filename>
+      <Filename>vino-preferences.desktop</Filename>
+    </Include>
+  </Menu>
+
+  <!-- System Tools-->
+  <Menu>
+    <Name>System</Name>
+    <Directory>System-Tools.directory</Directory>
+    <Include>
+      <And>
+        <Category>System</Category>
+        <Not><Category>Game</Category></Not>
+        <Not><Category>Settings</Category></Not>
+        <Not><Category>X-GNOME-Utilities</Category></Not>
+      </And>
+    </Include>
+
+    <Exclude>
+      <!-- Utilities exclusions -->
+      <Filename>baobab.desktop</Filename>
+      <Filename>gnome-system-log.desktop</Filename>
+      <Filename>gnome-system-monitor.desktop</Filename>
+      <Filename>gnome-terminal.desktop</Filename>
+
+      <!-- Sundry exclusions -->
+      <Filename>dconf-editor.desktop</Filename>
+      <Filename>fedora-release-notes.desktop</Filename>
+      <Filename>gconf-editor.desktop</Filename>
+      <Filename>gnome-abrt.desktop</Filename>
+      <Filename>gnome-power-statistics.desktop</Filename>
+      <Filename>dconf-editor.desktop</Filename>
+      <Filename>setroubleshoot.desktop</Filename>
+    </Exclude>
+    
+    <Menu>
+      <Name>Preferences</Name>
+      <Directory>Settings.directory</Directory>
+      <Include>
+        <And>
+          <Category>Settings</Category>
+          <Not>
+            <Or>
+              <Category>System</Category>
+              <Category>X-GNOME-Settings-Panel</Category>
+              <Filename>caribou.desktop</Filename>
+              <Filename>dconf-editor.desktop</Filename>
+              <Filename>fedora-im-chooser.desktop</Filename>
+              <Filename>fedora-release-notes.desktop</Filename>
+              <Filename>firewall-config.desktop</Filename>
+              <Filename>flash-player-properties.desktop</Filename>
+              <Filename>gconf-editor.desktop</Filename>
+              <Filename>gnome-abrt.desktop</Filename>
+              <Filename>fedora-abrt.desktop</Filename>
+              <Filename>gnome-orca.desktop</Filename>
+              <Filename>gnome-power-statistics.desktop</Filename>
+              <Filename>gnome-user-share-properties.desktop</Filename>
+              <Filename>ibus.desktop</Filename>
+              <Filename>ibus-daemon.desktop</Filename>
+              <Filename>ibus-setup-anthy.desktop</Filename>
+              <Filename>ibus-setup.desktop</Filename>
+              <Filename>ibus-setup-hangul.desktop</Filename>
+              <Filename>ibus-setup-libbopomofo.desktop</Filename>
+              <Filename>ibus-setup-libpinyin.desktop</Filename>
+              <Filename>ibus-setup-m17n.desktop</Filename>
+              <Filename>ibus-setup-typing-booster.desktop</Filename>
+              <Filename>im-chooser.desktop</Filename>
+              <Filename>itweb-settings.desktop</Filename>
+              <Filename>jhbuild.desktop</Filename>
+              <Filename>javaws.desktop</Filename>
+              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+              <Filename>log4j-chainsaw.desktop</Filename>
+              <Filename>log4j-logfactor5.desktop</Filename>
+              <Filename>nm-connection-editor.desktop</Filename>
+              <Filename>orca.desktop</Filename>
+              <Filename>setroubleshoot.desktop</Filename>
+              <Filename>authconfig.desktop</Filename>
+              <Filename>system-config-date.desktop</Filename>
+              <Filename>system-config-firewall.desktop</Filename>
+              <Filename>system-config-keyboard.desktop</Filename>
+              <Filename>system-config-language.desktop</Filename>
+              <Filename>system-config-printer.desktop</Filename>
+              <Filename>system-config-users.desktop</Filename>
+              <Filename>vino-preferences.desktop</Filename>
+            </Or>
+          </Not>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Administration</Name>
+      <Directory>Settings-System.directory</Directory>
+      <Include>
+        <And>
+          <Category>Settings</Category>
+          <Category>System</Category>
+          <Not>
+            <Or>
+              <Category>X-GNOME-Settings-Panel</Category>
+              <Filename>caribou.desktop</Filename>
+              <Filename>dconf-editor.desktop</Filename>
+              <Filename>fedora-im-chooser.desktop</Filename>
+              <Filename>fedora-release-notes.desktop</Filename>
+              <Filename>firewall-config.desktop</Filename>
+              <Filename>flash-player-properties.desktop</Filename>
+              <Filename>gconf-editor.desktop</Filename>
+              <Filename>gnome-abrt.desktop</Filename>
+              <Filename>fedora-abrt.desktop</Filename>
+              <Filename>gnome-orca.desktop</Filename>
+              <Filename>gnome-power-statistics.desktop</Filename>
+              <Filename>gnome-user-share-properties.desktop</Filename>
+              <Filename>ibus.desktop</Filename>
+              <Filename>ibus-daemon.desktop</Filename>
+              <Filename>ibus-setup-anthy.desktop</Filename>
+              <Filename>ibus-setup.desktop</Filename>
+              <Filename>ibus-setup-hangul.desktop</Filename>
+              <Filename>ibus-setup-libbopomofo.desktop</Filename>
+              <Filename>ibus-setup-libpinyin.desktop</Filename>
+              <Filename>ibus-setup-m17n.desktop</Filename>
+              <Filename>ibus-setup-typing-booster.desktop</Filename>
+              <Filename>im-chooser.desktop</Filename>
+              <Filename>itweb-settings.desktop</Filename>
+              <Filename>jhbuild.desktop</Filename>
+              <Filename>javaws.desktop</Filename>
+              <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
+              <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
+              <Filename>log4j-chainsaw.desktop</Filename>
+              <Filename>log4j-logfactor5.desktop</Filename>
+              <Filename>nm-connection-editor.desktop</Filename>
+              <Filename>orca.desktop</Filename>
+              <Filename>setroubleshoot.desktop</Filename>
+              <Filename>authconfig.desktop</Filename>
+              <Filename>system-config-date.desktop</Filename>
+              <Filename>system-config-firewall.desktop</Filename>
+              <Filename>system-config-keyboard.desktop</Filename>
+              <Filename>system-config-language.desktop</Filename>
+              <Filename>system-config-printer.desktop</Filename>
+              <Filename>system-config-users.desktop</Filename>
+              <Filename>vino-preferences.desktop</Filename>
+            </Or>
+          </Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>   <!-- End System Tools -->
+
+  <!-- System Settings -->
+  <Menu>
+    <Name>System Settings</Name>
+    <Directory>X-GNOME-SystemSettings.directory</Directory>
+    <Include>
+      <Category>X-GNOME-Settings-Panel</Category>
+    </Include>
+  </Menu>
+
+  <!-- Utilities submenu -->
+  <Menu>
+    <Name>Utilities</Name>
+    <Directory>X-GNOME-Utilities.directory</Directory>
+    <Include>
+      <Category>X-GNOME-Utilities</Category>
+      <Filename>baobab.desktop</Filename>
+      <Filename>deja-dup-preferences.desktop</Filename>
+      <Filename>eog.desktop</Filename>
+      <Filename>evince.desktop</Filename>
+      <Filename>file-roller.desktop</Filename>
+      <Filename>gcalctool.desktop</Filename>
+      <Filename>gnome-dictionary.desktop</Filename>
+      <Filename>gnome-disks.desktop</Filename>
+      <Filename>gnome-font-viewer.desktop</Filename>
+      <Filename>gnome-screenshot.desktop</Filename>
+      <Filename>gnome-system-log.desktop</Filename>
+      <Filename>gnome-system-monitor.desktop</Filename>
+      <Filename>gnome-terminal.desktop</Filename>
+      <Filename>gnome-tweak-tool.desktop</Filename>
+      <Filename>gucharmap.desktop</Filename>
+      <Filename>seahorse.desktop</Filename>
+      <Filename>vinagre.desktop</Filename>
+      <Filename>yelp.desktop</Filename>
+    </Include>
+  </Menu>
+
+  <!-- Other -->
+  <Menu>
+    <Name>Other</Name>
+    <Directory>X-GNOME-Other.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <And>
+        <Not><Category>Core</Category></Not>
+        <Not><Category>Screensaver</Category></Not>
+        <Not><Category>AudioVideo</Category></Not>
+        <Not><Category>Graphics</Category></Not>
+        <Not><Category>Network</Category></Not>
+        <Not><Category>Office</Category></Not>
+        <Not><Category>Utility</Category></Not>
+        <!-- Really Fedora ??? -->
+        <Not><Filename>gnome-eog.desktop</Filename></Not>
+        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+      </And>
+    </Include>
+  </Menu> <!-- End Other -->
+
+   <Layout>
+     <Merge type="menus" />
+     <Menuname>Other</Menuname>
+     <Merge type="files" />
+   </Layout>
+
+<Include>
+  <Filename>org.gnome.Software.desktop</Filename>
+</Include>
+
+<!-- Separator between menus and gnome-app-install -->
+<Layout>
+  <Merge type="menus"/>
+  <Merge type="files"/>
+  <Separator/>
+  <Filename>org.gnome.Software.desktop</Filename>
+</Layout>
+
+</Menu> <!-- End Applications -->