Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	community/lxde/Packages-Desktop
#	community/openbox/Packages-Desktop
#	community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml
#	community/openbox/profile.conf

community/.gitignore

@@ -0,0 +1 @@
+/openbox-core/

community/lxqt/Packages-Desktop

@@ -138,6 +138,7 @@ manjaro-openbox-adapta-maia
 grub-theme-glassfield
 manjaro-zsh-config
 manjaro-wallpapers-18.0
+manjaro-zsh-config
 papirus-maia-icon-theme
 xcursor-breeze
 

community/openbox/Packages-Desktop

@@ -2,7 +2,6 @@
 ##### OPENBOX MINIMAL/FULL PROFILE
 
 #---------=> media player
->extra audacious-gtk3
 >extra deadbeef
 >extra smplayer
 >extra smplayer-skins
@@ -14,12 +13,12 @@ alsa-utils
 alsa-plugins
 
 #---------=> media controls/codecs/plugins
->extra ffmpeg
+ffmpeg
->extra pamixer
+pamixer
->extra pavucontrol
+pavucontrol
->extra playerctl
+playerctl
->extra pulseaudio
+pulseaudio
->extra pulseaudio-alsa
+pulseaudio-alsa
 
 #---------=> graphic applications
 >extra gcolor2
@@ -150,9 +149,9 @@ manjaro-openbox-scripts
 # theme, icons, cursors, wallpapers
 adapta-maia-theme
 manjaro-openbox-adapta-maia
-manjaro-openbox-wallpapers-18.0
 papirus-maia-icon-theme
 manjaro-wallpapers-18.0
+manjaro-zsh-config
 xcursor-breeze
 
 
@@ -167,7 +166,6 @@ ttf-icomoon-icons
 ttf-material-icons
 ttf-polybar-icons
 ttf-roboto
-manjaro-zsh-config
 
 #---------=> network
 network-manager-applet

community/openbox/live-overlay/etc/issue

@@ -1,13 +0,0 @@
-
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-
-                 # Welcome to Manjaro #
-
-
-            login for the live environment:
-                   user     'manjaro'
-                   password 'manjaro'
-
-

community/openbox/live-overlay/etc/issue

@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/etc/issue

community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml

@@ -99,11 +99,6 @@
                 <command>xfce4-appearance-settings</command>
             </action>
         </item>
-        <item label="Add/Remove Software">
-            <action name="Execute">
-                <command>pamac-manager</command>
-            </action>
-        </item>
         <item label="Screen Layout">
             <action name="Execute">
                 <command>arandr</command>
@@ -115,22 +110,6 @@
             </action>
         </item>
     </menu>
-    <separator/>
-    <item label="Panel Chooser">
-        <action name="Execute">
-            <command>manjaro-panel-chooser</command>
-        </action>
-    </item>
-    <item label="Wallpaper">
-        <action name="Execute">
-            <command>nitrogen</command>
-        </action>
-    </item>
-    <item label="Rofi Theme">
-        <action name="Execute">
-            <command>rofi-theme-selector</command>
-        </action>
-    </item>
 </menu>
 
 <menu id="root-menu" label="Openbox 3">
@@ -156,21 +135,11 @@
             <command>termite</command>
         </action>
     </item>
-    <item label="Thunar">
-        <action name="Execute">
-            <command>thunar</command>
-        </action>
-    </item>
     <item label="Midnight Commander">
         <action name="Execute">
             <command>termite -e mc</command>
         </action>
     </item>
-    <item label="Chromium">
-        <action name="Execute">
-            <command>chromium https://manjaro.org</command>
-        </action>
-    </item>
     <separator/>
     <menu id="disk-utilities"/>
     <menu id="screenshot"/>

community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml

@@ -452,7 +452,7 @@
     </keybind>
     <keybind key="W-e">
       <action name="Execute">
-        <command>subl3</command>
+        <command>xed</command>
       </action>
     </keybind>
     <keybind key="C-A-m">

community/openbox/profile.conf

@@ -36,8 +36,7 @@ geoip="true"
 
 # unset defaults to given values
 # names must match systemd service names
-# enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'NetworkManager' 'systemd-timesyncd' 'org.cups-cupsd')
-enable_systemd=('NetworkManager' 'systemd-timesyncd')
 disable_systemd=('pacman-init')
 
 # the same workgroup name if samba is used

community/webdad/Packages-Desktop

@@ -33,11 +33,11 @@ libcanberra-gstreamer
 libdvdcss
 manjaro-alsa
 manjaro-pulse
->extra phonon-qt4-gstreamer
 phonon-qt5-gstreamer
 pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
+grilo-plugins
 
 ## Connect Packages
 kdeconnect
@@ -82,6 +82,7 @@ noto-fonts
 ttf-roboto
 
 ## Games
+#gnome-games
 >extra steam-manjaro 
 pingus
 gnome-mahjongg
@@ -108,7 +109,7 @@ pamac
 
 # 3d Printing
 mattercontrol 
-avrdude
+#avrdude
 
 ## Optional dependencies for hplip
 >extra pyqt5-common # For hplip
@@ -122,8 +123,6 @@ lightdm
 lightdm-webkit2-greeter-manjaro
 accountsservice  # Enhanced user accounts handling
 
-# Themes
-
 # bluetooth
 bluez-cups
 bluez-firmware
@@ -136,18 +135,6 @@ irqbalance
 
 # Settings
 manjaro-settings-manager
-manjaro-settings-manager-kcm
-manjaro-settings-manager-notifier
-systemsettings
-kde-gtk-config
-kgamma5
-kinfocenter
-kscreen
-#kwayland-integration
-user-manager
-systemd-kcm
-kcm-wacomtablet
-kcron
 
 # WebDad desktop
 jade-desktop-mode
@@ -173,8 +160,8 @@ nautilus-admin
 #seahorse-nautilus
 sushi
 file-roller
-
 hyper
+#menulibre
 #fish
 
 cairo-dock
@@ -193,15 +180,36 @@ gedit
 nano
 chromium
 gparted
+>extra kernel-alive
 geary
 gufw
 #>extra hexchat
 evince
 inxi
->extra libreoffice-fresh
 >extra vlc-nightly
+>extra lollypop
+>extra empathy
+#>extra uget
+#baobab
+>extra redshift
+
+# office
+>extra libreoffice-fresh
 ms-office-online
-atom
+
+# extras
+deepin-screenshot
+pitivi
+obs-studio
+
+# design
+krita
+#inkscape
+#gimp
+
+# code
+#pycharm-community-edition
+#atom
 
 # Compression
 p7zip  # 7Z and ARJ archive support
@@ -253,3 +261,4 @@ manjaro-hotfixes
 
 
 
+

community/webdad/live-overlay/etc/calamares/modules/packages.conf

@@ -1,9 +0,0 @@
-backend: pacman
-
-skip_if_no_internet: false
-update_db: true
-
-operations:
-  - install:
-    - jdk8-openjdk
-    - gnome-sceenshot

community/webdad/live-overlay/etc/webdad/cairo-dock/current_theme/launchers/03container.desktop

@@ -1,26 +0,0 @@
-#3.4.1
-
-#[gtk-about]
-
-[Desktop Entry]
-
-#F[Icon]
-frame_maininfo=
-
-#d+ Name of the container it belongs to:
-Container=_MainDock_
-
-#v
-sep_display=
-
-#> Separators' appearance is defined in the global configuration.
-Icon=
-
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=23.0625
-
-Icon Type=2
-Type=Separator

community/webdad/live-overlay/etc/webdad/cairo-dock/current_theme/launchers/03launcher.desktop

@@ -1,51 +0,0 @@
-#3.4.1
-
-#[gtk-about]
-
-[Desktop Entry]
-
-#F[Icon]
-frame_maininfo=
-
-#d+ Name of the container it belongs to:
-Container=_MainDock_
-
-#v
-sep_display=
-
-#s[Default] Launcher's name:
-Name=Install Manjaro WebDad
-
-#S+[Default] Image's name or path:
-Icon=/usr/share/icons/hicolor/scalable/apps/calamares.svg
-
-#s[Default] Command to launch on click:
-#{Example: nautilus --no-desktop, gedit, etc. You can even enter a shortkey, e.g. <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=webdad-installer
-
-
-#X[Extra parameters]
-frame_extra=
-
-#b Don't link the launcher with its window
-#{If you chose to mix launcher and applications, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the terminal's icon from the taskbar.} 
-prevent inhibate=false
-
-#K[Default] Class of the program:
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the application with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal?
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport:
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-#f[0;100] Order you want for this launcher among the others:
-Order=23.3125
-
-Icon Type=0
-Type=Application
-Origin=
-Name[en_GB]=03launcher

community/webdad/live-overlay/etc/webdad/cairo-dock/current_theme/launchers/06container.desktop

@@ -1,26 +0,0 @@
-#3.4.1
-
-#[gtk-about]
-
-[Desktop Entry]
-
-#F[Icon]
-frame_maininfo=
-
-#d+ Name of the container it belongs to:
-Container=_MainDock_
-
-#v
-sep_display=
-
-#> Separators' appearance is defined in the global configuration.
-Icon=
-
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=23.0625
-
-Icon Type=2
-Type=Separator

community/webdad/live-overlay/usr/bin/webdad-installer

@@ -1,3 +0,0 @@
-#!/bin/bash
-notify-send -i /usr/share/icons/hicolor/scalable/apps/calamares.svg "Loading Installer" &
-calamares_polkit %f

shared/Packages-Root

@@ -1,4 +1,5 @@
 acpi
+amd-ucode
 >i686 archlinux32-keyring
 b43-fwcutter
 bash

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

@@ -4,10 +4,10 @@ componentName:  manjaro
 strings:
     productName:         Manjaro Linux
     shortProductName:    Manjaro
-    version:             18.0-beta-5
+    version:             18.0-beta-6
-    shortVersion:        18.0-beta-5
+    shortVersion:        18.0-beta-6
-    versionedName:       Manjaro Linux 18.0-beta-5 "Illyria"
+    versionedName:       Manjaro Linux 18.0-beta-6 "Illyria"
-    shortVersionedName:  Manjaro 18.0-beta-5
+    shortVersionedName:  Manjaro 18.0-beta-6
     bootloaderEntryName: Manjaro
 
 images: