Merge pull request #2 from manjaro/master

merge upstream

community/budgie/Packages-Desktop

@@ -10,6 +10,7 @@ lightdm-slick-greeter
 lightdm-settings
 budgie-desktop
 manjaro-budgie-settings
+manjaro-icons
 baobab
 dconf-editor
 hexchat
@@ -27,7 +28,6 @@ gnome-system-monitor
 gnome-terminal
 gnome-screensaver
 gnome-screenshot
-gnome-tweak-tool
 >extra gnome-backgrounds
 grilo-plugins
 gucharmap
@@ -112,7 +112,6 @@ moka-icon-theme
 #firefox-arc-maia-settings
 ff-theme-util
 budgie-wallpapers
-moka-icon-theme
 vino
 xdg-su
 xdg-user-dirs-gtk

community/budgie/desktop-overlay/etc/lightdm/slick-greeter.conf

@@ -1,5 +0,0 @@
-[Greeter]
-background=/usr/share/backgrounds/manjaro-budgie/Budgie_minimal wall.jpg
-theme-name=Vertex-Maia-Dark
-icon-theme-name=Arc-Maia
-draw-grid=false

community/cinnamon/Packages-Desktop

@@ -25,16 +25,16 @@ gnome-system-log
 gnome-system-monitor
 gnome-terminal
 >extra gparted
+>extra gprename
 >extra gst-libav
 >extra gst-plugins-bad
 >extra gst-plugins-base
 >extra gst-plugins-good
 >extra gst-plugins-ugly
 >extra gstreamer
-gvfs-afc
 >extra >multilib gcc-libs-multilib
 >extra >multilib gcc-multilib
-gvfs-google
+gvfs-afc
 gvfs-gphoto2
 gvfs-mtp
 gvfs-smb

community/deepin/Packages-Desktop

@@ -17,7 +17,7 @@ deepin-gtk-theme
 >extra deepin-music
 >extra deepin-screen-recorder
 >extra deepin-screenshot
-#>extra deepin-system-monitor
+>extra deepin-system-monitor
 deepin-terminal
 dmidecode
 >extra downgrade
@@ -34,7 +34,7 @@ gedit
 >extra gimp
 gksu
 >extra gparted
->extra gnome-system-monitor
+#>extra gnome-system-monitor
 >extra gst-libav
 >extra gst-plugins-bad
 >extra gst-plugins-base

community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-terminal/config.conf

@@ -1,21 +0,0 @@
-[theme]
-color_1=#2e3436
-color_2=#cc0000
-color_3=#4e9a06
-color_4=#c4a000
-color_5=#3465a4
-color_6=#75507b
-color_7=#0b939b
-color_8=#d3d7cf
-color_9=#555753
-color_10=#ef2929
-color_11=#8ae234
-color_12=#fce94f
-color_13=#729fcf
-color_14=#ad7fa8
-color_15=#00f5e9
-color_16=#eeeeec
-background=#101010
-foreground=#f2f2f2
-tab=#f2f2f2
-style=dark

community/mate/Packages-Desktop

@@ -30,6 +30,7 @@ mate-user-guide
 mate-system-monitor
 mate-power-manager
 pluma
+mozo
 gnome-disk-utility
 gnome-keyring
 manjaro-mate-settings

manjaro/gnome/Packages-Desktop

@@ -114,6 +114,7 @@ ttf-droid
 ttf-inconsolata
 ttf-indic-otf
 ttf-liberation
+>systemd usb_modeswitch
 arc-maia-icon-theme
 moka-icon-theme
 #firefox-arc-maia-settings #disable theming since upstream no adjust the theme

manjaro/kde/Packages-Desktop

@@ -17,6 +17,7 @@ modemmanager
 >systemd openssh
 >openrc openssh-openrc
 samba
+usb_modeswitch
 
 ## Libraries for Sound/Audio/Video
 alsa-firmware

manjaro/lxqt/Packages-Desktop

@@ -76,6 +76,7 @@ ttf-droid
 ttf-inconsolata
 ttf-indic-otf
 ttf-liberation
+usb_modeswitch
 xarchiver
 xdg-su
 xdg-utils

manjaro/xfce/Packages-Desktop

@@ -17,6 +17,7 @@ modemmanager
 >systemd openssh
 >openrc openssh-openrc
 samba
+usb_modeswitch
 
 ## Libraries for Sound/Audio/Video
 alsa-firmware

shared/Packages-Desktop

@@ -31,7 +31,6 @@ powertop
 >systemd alsa-utils
 >systemd avahi
 networkmanager
-usb_modeswitch
 >systemd ntp
 >systemd openssh
 >systemd xdg-user-dirs

shared/Packages-Root

@@ -106,6 +106,7 @@ usbutils
 >systemd util-linux
 >openrc util-linux-nosystemd
 vi
+wget
 which
 xfsprogs
 zd1211-firmware

shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc

@@ -0,0 +1,23 @@
+---
+componentName:  manjaro
+
+strings:
+    productName:         Manjaro Linux
+    shortProductName:    Manjaro
+    version:             17.0.5
+    shortVersion:        17.0.5
+    versionedName:       Manjaro Linux 17.0 "Gellivara"
+    shortVersionedName:  Manjaro 17.0.5
+    bootloaderEntryName: Manjaro
+
+images:
+    productLogo:         "squid.png"
+    productIcon:         "logo.png"
+    productWelcome:      "languages.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#454948"
+   sidebarText:          "#efefef"
+   sidebarTextSelect:    "#9E4F5D"