From 1b0c9093bad25b73720213cbda48fa4fde482135 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 3 Mar 2012 15:53:58 +0100 Subject: [PATCH] Added xprofile.d script for user desktop first time preparation (moved from desktop-base-kde4) --- Makefile | 21 +++++++++++++-------- VERSION | 2 +- desktop/desktop-common.tar.bz2 | Bin 0 -> 2992 bytes desktop/desktop-en.tar.bz2 | Bin 0 -> 445 bytes desktop/desktop-es.tar.bz2 | Bin 0 -> 461 bytes desktop/desktop-firsttime.sh | 31 +++++++++++++++++++++++++++++++ desktop/desktop-fr.tar.bz2 | Bin 0 -> 471 bytes desktop/desktop-it.tar.bz2 | Bin 0 -> 461 bytes 8 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 desktop/desktop-common.tar.bz2 create mode 100644 desktop/desktop-en.tar.bz2 create mode 100644 desktop/desktop-es.tar.bz2 create mode 100644 desktop/desktop-firsttime.sh create mode 100644 desktop/desktop-fr.tar.bz2 create mode 100644 desktop/desktop-it.tar.bz2 diff --git a/Makefile b/Makefile index 6b37105..1e0448d 100644 --- a/Makefile +++ b/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 \ diff --git a/VERSION b/VERSION index 50e9ae4..d543f9e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION = 2.3.3 +VERSION = 2.3.4 diff --git a/desktop/desktop-common.tar.bz2 b/desktop/desktop-common.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..3c873d94ac265cd1215012c9b5c91686112bcd09 GIT binary patch literal 2992 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 literal 0 HcmV?d00001 diff --git a/desktop/desktop-es.tar.bz2 b/desktop/desktop-es.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..3da174f02500463e452a47eb1edd02e53711c791 GIT binary patch literal 461 zcmV;;0W$tVT4*^jL0KkKSr9*=C;$OH|DMB;0RTV)|AMwI4GVAY-(VmD01yZP0FD3% zKmq$%g{cUnr1b+$57iAAngb(8sPzVcrkIb_1c-zr0B8UJXaE2JBBrLPr=}t{paVbv z4F=Qz+Jl;6U;!`zFaQaF0Ga)nA91m5Tw|Ra16oK#l^}xKg4=cCB4Z432w2hzB<)I< zO=&`tpi$iH+iv*~uo2cqN&y2YE-yaME4%u}lyIYRFpa|lgGs6>6pBPf5t;1{C?yFX zU<-qK`Z#$J7HH({$q`;yvdKrD$d1xD$s;6sw;kGulwzqPbg~ngp*ccmk%tl!5~ZZF zCZ>BK3QN*1As~#Df@Q=giWEYDL@1cGV?`-J1;|l_iAmrImApxqguz_XD~k5yF1i7h zLb)u0Xw^H!!DWh9Fr!@Z8pgzDSLtBm9JO~0jYM-Hi5iUH zdlwBSZi2c^i6a#Z4RaZbsUAC}v}zq|qUIPT4ZQ<+cEPF$kT|f7NX%>)AsPoraw93u zY(yg>#BVoIpmI$c>qkZ7jAywi2x-ube~8|X0yS^kCJhGpLWc@~e~Y;yoG3^LAJCKl DJiWLe literal 0 HcmV?d00001 diff --git a/desktop/desktop-firsttime.sh b/desktop/desktop-firsttime.sh new file mode 100644 index 0000000..1bb7585 --- /dev/null +++ b/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 +# Copyright (c) 2007 by Davide Madrisan + +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 diff --git a/desktop/desktop-fr.tar.bz2 b/desktop/desktop-fr.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..ad97efb6675c7aa16452b9620715c0039f33d841 GIT binary patch literal 471 zcmV;|0Vw`LT4*^jL0KkKSq#-K_W%Js|CYm$0RTV)|H2+N1q*NQ|6l+h2mt_&00=+< z`&z=u!X+gEqts~i9*_VAfCEiDqfG>fG>s?&Mt}yI4FCWD2%?f{vS^Id28{q|p{AM{ z8U}$SP|1+cGH7H5fEfmW21oXEb+y9-g>R0OZH?4{5-tJ@wT9h<;-)%P>&g|$1f?|~ ztPn;sREFK|&W>b4q(;PHKqO)o_FqjJvt=8I(vGBM9V0>D{4-4Qllo_zL$p^Oh*C5L z30T-~Bf~{Qf@D-MBa^cv$A*mFMXAqlMwD)nutGu;&!RFy$x;VYCn!uI34xUfp-xe# z)NS2MP_-FJLXshfbdW}9q>@avF))P0>k|efo!6yy4d8`aLQ+UzUwr~tI^2ah!mUKA zS++tHrBd;cm`xqx+6ACJ!zHAGAaM_P&@apQjzo2v4`Jya6n8K29-;QAzcJ)AHdXar zP#;b=!0_}kPjsc_^%k>T7v}zd{ zB^n0U;YJCdl4O-HBZ(L&91@Pok%N=;Z;vV=sme%BOohmu3n~*uTcBm*@|y};r5#@zq_ literal 0 HcmV?d00001 diff --git a/desktop/desktop-it.tar.bz2 b/desktop/desktop-it.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..f38de0131441c162c423c8355172d07d840f5e11 GIT binary patch literal 461 zcmV;;0W$tVT4*^jL0KkKSxJXkS^xn(|AxZQ0RTV)|AH>N4GVAY-(Ua%0E_?#Kmq$% zjhxVlQ9uTb8UxhOG}=Z_B+<17jRqm8rlUhcA)o*N000Q2Nc9QoXc+(l5Ml!wjSo;o zP^Q#uA)`P{BSRwqAkziD=Or#hm z2-Vn)T?mVP9GL5)CU1)~*`AFX;yeh%VmONUiX}S;R8Bz1G(#YwHApBEP%K!GkcyEA zgCZbUks>+i+GLOr?YLG&-t-Az$fr^=lJ78y=^&wk7z73INK+;N5jJ;eH7T+j1462W zq{$;v+@mcc0jPRGtY@HRNrDiNJ4V5zTa8RVk;;t+cwAgIjx>1oTSl?d`Dor(LLTV) z4~dw4UEW*KkR7vlr}&8&=O!42dIo`EChG(M%}Ek5kA!6+@)!cpGV>e5C^N`1qvSFS zBq+o+2Ffv7yvW=h38Nz12;+z%6#leujMns#uc|u^$m2#j_5rY<9mU*{P81{(Vb)fF D`H;a* literal 0 HcmV?d00001