From 4f87e81d312ba5830c3b588118611244220e3638 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 31 Mar 2018 17:43:53 +0200 Subject: [PATCH] Package updates --- Makefile.defs | 4 ++-- platforms/livecd-root/Makefile | 4 ++-- platforms/livedvd-root/Makefile | 2 +- platforms/livegames-root/Makefile | 4 ++-- platforms/rootfs/Makefile | 4 ++-- platforms/testcd-root/Makefile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 2ff6538..ef6a575 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -98,7 +98,7 @@ libvdpau_trace.so.1 = libvdpau xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ xorg-drv-video-intel xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic xorg-drv-video-nouveau \ xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ - xorg-drv-video-v4l xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo xorg-drv-video-amdgpu $(xorgproprietary) + xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo xorg-drv-video-amdgpu $(xorgproprietary) # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo bootloader = syslinux endif @@ -117,7 +117,7 @@ libvdpau_trace.so.1[][64bit] = libvdpau xorgdrvvideo = xorg-drv-video-ast xorg-drv-video-ati xorg-drv-video-cirrus xorg-drv-video-dummy xorg-drv-video-fbdev \ xorg-drv-video-intel xorg-drv-video-mach64 xorg-drv-video-mga xorg-drv-video-neomagic xorg-drv-video-nouveau \ xorg-drv-video-openchrome xorg-drv-video-r128 xorg-drv-video-s3virge xorg-drv-video-savage xf86-video-modesetting \ - xorg-drv-video-v4l xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary) + xorg-drv-video-vesa xorg-drv-video-vmware xorg-drv-video-voodoo $(xorgproprietary) bootloader = syslinux endif diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index f383f52..878fbf6 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -1,5 +1,5 @@ -$(MAKEDIST_TARGET)-livecd-kde: desktop-base-kde bluedevil5 kwalletmanager -# smb4k juk kate dragon ksnapshot okular kppp krfb ark kcalc kdf kgpg kopete +$(MAKEDIST_TARGET)-livecd-kde: desktop-base-kde bluedevil5 kwalletmanager spectacle +# smb4k juk kate dragon okular kppp krfb ark kcalc kdf kgpg kopete $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreofice-impress diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index a2d5920..a7d9729 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -1,5 +1,5 @@ $(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \ - ksnapshot okular kontact kmail akregator \ + spectacle okular kontact kmail akregator \ kopete bluedevil5 smb4k amarok kwalletmanager dragon kate $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile index 1b41fb4..e8510d8 100644 --- a/platforms/livegames-root/Makefile +++ b/platforms/livegames-root/Makefile @@ -1,6 +1,6 @@ $(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg \ - ksnapshot okular kontact kmail akregator desktop-base-kde \ - kopete bliedevil smb4k kate \ + spectacle okular kontact kmail akregator desktop-base-kde \ + kopete bluedevil5 smb4k kate \ kruler gwenview4 kamera kcolorchooser kwalletmanager \ bomber bovo granatier kapman katomic kbattleship kblackbox kblocks kbounce \ kdesnake kdiamond kgoldrunner kigo killbots kiriki kjumpingcube klickety \ diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index d495c4a..1e4dc8a 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -1,6 +1,6 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \ - kppp desktop-base-kde ksnapshot okular \ - kopete bluedevil smb4k juk kwalletmanager \ + kppp desktop-base-kde okular spectacle \ + kopete bluedevil5 smb4k juk kwalletmanager \ sqlite kate ark kcalc kdf kgpg kaffeine kamoso $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile index 987c10f..11122a1 100644 --- a/platforms/testcd-root/Makefile +++ b/platforms/testcd-root/Makefile @@ -1,5 +1,5 @@ -$(MAKEDIST_TARGET)-testcd-kde4: desktop-base-kde bluedevil kwalletmanager -# kopete dragon kate smb4k juk ksnapshot okular kontact kmail akregator kppp krfb ark kcalc kdf kgpg +$(MAKEDIST_TARGET)-testcd-kde4: desktop-base-kde bluedevil5 kwalletmanager spectacle +# kopete dragon kate smb4k juk okular kontact kmail akregator kppp krfb ark kcalc kdf kgpg $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress