Added xprofile.d script for user desktop first time preparation (moved from desktop-base-kde4)

Makefile

@@ -39,6 +39,7 @@ datadir = ${prefix}/share
 initrddir = ${sysconfdir}/rc.d/init.d
 mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
+xprofiledir = ${sysconfdir}/xprofile.d
 mambabasedatadir = ${datadir}/openmamba/mambabase
 mambareportdatadir = ${datadir}/openmamba/mambareport
 mambawelcomedatadir = ${datadir}/openmamba/mambawelcome
@@ -48,14 +49,13 @@ bootrecoverdatadir = ${datadir}/openmamba/bootrecover
 usbinstalldatadir = ${datadir}/openmamba/usbinstall
 iconsdir = ${datadir}/icons/hicolor
 kdeprefixdir = $(shell kde-config --prefix)
-kde4prefixdir = $(shell kde4-config --prefix)
 kdedatadir = $(kdeprefixdir)/share
-kde4bindir = $(kde4prefixdir)/bin
 kdeautostartdir = ${kdedatadir}/autostart
 kdeconfigdir = ${kdedatadir}/config
 kdewallpapersdir = ${kdedatadir}/wallpapers
 localesdir = ${datadir}/locale
 kdelocalesdir = ${kdedatadir}/locale
+pck_desktop = $(wildcard desktop/*.bz2)
 
 xdg_appsdir = ${datadir}/applications
 xdg_directorydir = ${datadir}/desktop-directories
@@ -65,7 +65,7 @@ xdg_mergedmenudir = $(xdg_menudir)/applications-merged
 distrorootdir = ${datadir}/$(DISTROid)
 distrobindir = ${distrorootdir}/bin
 distrosrpmsdir = ${distrorootdir}/SRPMS
-distrokdedir = ${distrorootdir}/kde
+distrodesktopdir = ${distrorootdir}/desktop
 srcdir = .
 
 INSTALL = /usr/bin/install
@@ -74,7 +74,6 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_DIR = ${INSTALL} -d -m 755
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-pck_kdedesktop = $(wildcard kde/desktop/*)
 #pck_srpms = flashplugin jre msttcorefonts win32codecs
 pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack
 
@@ -82,12 +81,14 @@ pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
                           kde/wallpapers/*.in \
                           menu/*.in menu/applications/*.in menu/applications/*/*.in \
-                          SRPMS/*/*.in)
+                          SRPMS/*/*.in \
+                          desktop/*.in)
 pck_sysconfigfile := distroutils.sysconfig
 
 distdir = $(PACKAGE)-$(VERSION)
 dist_archive = $(distdir).tar.bz2
 
+pck_desktop := $(wildcard desktop/*.tar.bz2)
 pck_catalogs := $(wildcard mambabase/po/*.po)
 pck_catalogs1 := $(wildcard mambawelcome/po/*.po)
 pck_catalogs2 := $(wildcard bootrecover/po/*.po)
@@ -107,7 +108,7 @@ pck_catalogs3 := $(wildcard usbinstall/po/*.po)
             s,@datadir@,${datadir},g;\
             s,@bindir@,$(bindir),g;\
             s,@distrobindir@,$(distrobindir),g;\
-            s,@distrokdedir@,$(distrokdedir),g;\
+            s,@distrodesktopdir@,$(distrodesktopdir),g;\
             s,@distrosrpmsdir@,$(distrosrpmsdir),g;\
             s,@wallpaper@,$(DEFAULT_WALLPAPER),g;\
             s,@screensaver@,${SCREENSAVER},g;\
@@ -160,7 +161,6 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(datadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
-	@$(INSTALL_DIR) $(DESTDIR)$(kde4bindir)
 ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
@@ -184,7 +184,6 @@ ifeq ($(WITHKDE3),1)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
 endif
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
-#	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
 install-distromenu: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
@@ -276,6 +275,11 @@ ifeq ($(WITHKDE3TOOLS),1)
 	$(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir)
 endif
 
+install-desktop:
+	@$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir)
+	$(INSTALL_DATA) $(pck_desktop) $(DESTDIR)$(distrodesktopdir)
+	$(INSTALL_SCRIPT) desktop/desktop-firsttime.sh $(DESTDIR)$(xprofiledir)
+
 install-usbinstall:
 	@$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir)
 	$(INSTALL_SCRIPT) usbinstall/usbinstall.sh $(DESTDIR)$(usbinstalldatadir)
@@ -291,6 +295,7 @@ install: $(pck_infiles:.in=) \
 	install-distromenu \
 	install-srpms \
 	install-usbinstall \
+	install-desktop \
 	install-openmamba-update \
 	install-mambabase \
 	install-mambawelcome \

VERSION

@@ -1 +1 @@
-VERSION = 2.3.3
+VERSION = 2.3.4

desktop/desktop-firsttime.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# desktop.firsttime - Desktop firsttime script for @distroID@
+#
+# This file is called by startkde after the kpersonalizer has been
+# executed for first access configuration
+#
+# Copyright (c) 2005-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007 by Davide Madrisan <davide.madrisan@gmail.com>
+
+if [ ! -e $HOME/Desktop/.directory ]; then
+
+   case "$LANG" in
+      es*) LANG_ADD=es ;;
+      fr*) LANG_ADD=fr ;;
+      it*) LANG_ADD=it ;;
+      *) LANG_ADD=en ;;
+   esac
+
+   if [ -r @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 ]; then
+      mkdir -p $HOME/Desktop
+      ( cd $HOME/Desktop >/dev/null
+        tar xjf @distrodesktopdir@/desktop-common.tar.bz2
+        tar xjf @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 )
+   fi
+
+   touch $HOME/Desktop/.directory
+
+fi
+
+exit 0