Merge remote-tracking branch 'upstream/master'

community/cinnamon/Packages-Desktop

@@ -108,7 +108,6 @@ pkg-config
 >extra pragha
 >extra pulseaudio-bluetooth
 pulseaudio-ctl
-pulseaudio-gconf
 pulseaudio-zeroconf
 >extra pygtk # needed for deluge
 python2-ptyprocess

community/deepin/Packages-Desktop

@@ -9,6 +9,7 @@ binutils
 bison
 >extra brasero
 >extra dconf-editor
+>extra deepin-anything
 deepin-calendar
 >extra deepin-calculator
 deepin-file-manager
@@ -33,9 +34,9 @@ fakeroot
 firefox
 flex
 >extra galculator
-gcc
->multilib gcc-libs-multilib
->multilib gcc-multilib
+>extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
 gedit
 >extra gimp
 >extra git
@@ -99,6 +100,7 @@ polkit-gnome
 pulseaudio-ctl
 pulseaudio-zeroconf
 >extra pygtk # needed for deluge
+>extra qpdfview
 >extra redshift
 screenfetch
 >extra subversion

community/deepin/Packages-Live

@@ -1,6 +1,6 @@
-calamares-git
+calamares
 deepin-live
-grub-theme-live-manjaro
+grub-theme-live-manjaro-dev
 gsmartcontrol
 manjaro-architect
 manjaro-live-skel
@@ -8,3 +8,4 @@ manjaro-live-systemd
 mkinitcpio-nfs-utils
 nbd
 squashfs-tools
+clonezilla

community/deepin/profile.conf

@@ -31,7 +31,7 @@ displaymanager="lightdm"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'add-autologin-group')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'add-autologin-group' 'haveged')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values

manjaro/architect/Packages-Live

@@ -20,4 +20,4 @@ xf86-input-libinput
 xf86-input-mouse
 xf86-input-vmmouse
 xf86-input-void
->manjaro grub-theme-live-manjaro
+grub-theme-live-manjaro-dev

manjaro/kde/Packages-Desktop

@@ -245,7 +245,7 @@ imagewriter
 inxi
 #>extra krita
 >extra firefox
->basic qupzilla
+>basic falkon
 ms-office-online
 >extra libreoffice-fresh
 manjaro-hello