From 08f2ad502deef94c78947d8fbd02b7bbcb419c9b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 16 Jan 2015 13:57:13 +0100
Subject: [PATCH] desktop-firsttime.sh: don't install desktop-common archive to
 avoid duplicated trashbin in lxde Also removes trashbin in KDE desktop but
 this is intentional.

---
 desktop/desktop-common.tar.bz2     | Bin 2992 -> 0 bytes
 desktop/desktop-firsttime.sh.in    |   3 +--
 kde/desktop/desktop-common.tar.bz2 | Bin 435 -> 0 bytes
 kde/desktop/desktop-en.tar.bz2     | Bin 368 -> 0 bytes
 kde/desktop/desktop-es.tar.bz2     | Bin 412 -> 0 bytes
 kde/desktop/desktop-fr.tar.bz2     | Bin 414 -> 0 bytes
 kde/desktop/desktop-it.tar.bz2     | Bin 426 -> 0 bytes
 7 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 desktop/desktop-common.tar.bz2
 delete mode 100644 kde/desktop/desktop-common.tar.bz2
 delete mode 100644 kde/desktop/desktop-en.tar.bz2
 delete mode 100644 kde/desktop/desktop-es.tar.bz2
 delete mode 100644 kde/desktop/desktop-fr.tar.bz2
 delete mode 100644 kde/desktop/desktop-it.tar.bz2

diff --git a/desktop/desktop-common.tar.bz2 b/desktop/desktop-common.tar.bz2
deleted file mode 100644
index 3c873d94ac265cd1215012c9b5c91686112bcd09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2992
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

diff --git a/desktop/desktop-firsttime.sh.in b/desktop/desktop-firsttime.sh.in
index e24c2a5..ffb9b62 100644
--- a/desktop/desktop-firsttime.sh.in
+++ b/desktop/desktop-firsttime.sh.in
@@ -5,7 +5,7 @@
 # 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) 2005-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (c) 2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 if [ ! -e $HOME/Desktop/.directory ]; then
@@ -20,7 +20,6 @@ if [ ! -e $HOME/Desktop/.directory ]; then
    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
 
diff --git a/kde/desktop/desktop-common.tar.bz2 b/kde/desktop/desktop-common.tar.bz2
deleted file mode 100644
index e8e76909f27b71486d9b6ac2feb43a607edf3807..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjfvT4*^jL0KkKSrGv5M*sk(e}u#k0RTXveZoJh-pYUP|KI=u00=Mvc|`%D
zC#q=m15Z=b2AXJkfB*mngO~)s34j1h00h7QN@+}qwLK#$drEmVG}>xC0X<A=9;R(j
zKUDf-&n*-)0Zdtei<PY9EkPv11L&`s@Y3^8<;D=J@~BBEWyt>C*$kB)n0m$u9OW(i
zTZd_%NH-dTt#m<nR;4X(5u%Y|aiSy8O7@QKP_rt5kdoGT`ptkq^4FW{a)}>;tMKi~
zWENDCUA}q#@VCn-)u=q2yh;%0gJY_YT6>w=p81#ykkKE$`Y<}bmPv_$=Pid;f3-v!
zuSt_>q4p0xmQ8K07{k@9gG9NumEk67t=L?IfyB$<zXLIpRYF23x``aba7pdL8s>$i
zp_K}fRuk@a7e9{8Y9+#IP+Ha#18hncDjCQ)QJPfOe~Un@N}SkQ+t3m$>Fj6sZvAk)
zo%QK^+JGe%gCyPGzwBEkic%W&dfc=c#gCGOOtmD0g4-Uji${CX))!}URYzvoXO>sT
dMrnbK6DhEX)@z4@aAAY~F64@Ep&%jw-i~|6&Vv8|

diff --git a/kde/desktop/desktop-en.tar.bz2 b/kde/desktop/desktop-en.tar.bz2
deleted file mode 100644
index 58d889b2cb09d1fbf164645f8ab527e572531ad8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmV-$0gwJdT4*^jL0KkKS>fec+yDW&UxUJsKmq@P7be9D@9*E>015;E1PCwzm;e|6
z0004?&<22L3;+NC0MKXyKr{j*ri3QcWYowpG(9J%Xwl^wHdD<p9EUn`OzLL}0%9mS
zvdW~K`JRN(3x=W?(M5Drl1wIPNCtHVDdpkw;rQB}DsNLdo71T{9y)0%s7zC<XHQnJ
zKs)=p=;svM;O*UIGyx$5_XCui!;~u`-GnV{dvMIA4g)3xN~ua-Uv!bX5hWR_%wcPj
z;bLG$jbnJ;DS=?oBrI7Vri8mRxY3OuRJ>Bfl%cK(UsU7i%0^C8u*0Dv;FlE$5RkHN
zPV};!$MxE$nfOh~dYbI+PZZ#PG^aA2AY6V^dHPIVA9K@jc6736)S8W5C!(IK(zu>U
z)-PGHPx5a};&a&0n-t8MCCP$nwG~vRMJBpamW4R-Op{_?BoiBy=HhZv*BW%4qI=PQ
O;_gVN3KASVt6P9@*{0_J

diff --git a/kde/desktop/desktop-es.tar.bz2 b/kde/desktop/desktop-es.tar.bz2
deleted file mode 100644
index 8e21dd10341534cc9d396789bc056f2fc455ca04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmV;N0b~9`T4*^jL0KkKS-~_yCjbH6f1kpT0RTV&|AH<n2MX`+-(VmD01yZQ01gNM
z00=+<y}M%2Ie-8F0000001_gbQB5)c8Z-a^000D46v==90000000dHvQR#&nLKy+0
zO#lXf8I<W$;VB#=T1iXNkbokEKqZfMj4>>664XV)VntPmf(VTU+iv%JgaLq&q>#|C
zsgh={JF%o?BdNhiRN$1;iKYaC0DsdNZc9M`&&+2m6w%UYo32W5i3(OFL_o3Q9IH<i
zBvBVLG^A4zbxUn#5mMZ&D2N=)q%H^^15jMA9vWi93nfK6oj06KSu{|QGl>rSSQabb
zPK1jTA_e4zjdP_J>o!I4d`}pYsW23T5d=Xb>`dt;H6MCZgyv@y>S8yhl+dMFN^DXx
zr?XmaNkW!dkXoeRRClkjsVF?QA3MgiNvcWGyorlinX-~e@}u;TiBHtxOae*>g)6|8
zsU)o?CrzZ3^RYC*!Ep(O#V(~ymnDfT(F)Nzm0YEQlH9P$CF8zcei{*f#oUoj6eKWB
G5Q)H(zo82N

diff --git a/kde/desktop/desktop-fr.tar.bz2 b/kde/desktop/desktop-fr.tar.bz2
deleted file mode 100644
index 43ea4e70c6476a978e989450174173066176fa90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%|^T4*^jL0KkKSwqzUzW@Q-|Chp$0RTV&|B?nHg$nQQ|6l+h2m$~O2mk;G
zKmpymV$h5RfB*)700000ku^;SfY1hj000016+{340009`000Q2h&0lAYCS=wn2e18
z8W|5wO-g;VK?#s)Nz}P02m&xF0eY&du2fzftcWHgQp_=$#-wexd%@BG$RuV+Xt1dr
zIJ#@jlN6e#H6c@yT27PTNFYX9a^$lhAR2SVlNhGGWKG>Vod9NnLQ*8s#6}l0K!%K!
zWQa&oD?OkD&nd8>5=9IyA#$v5NL(;@Sg{qvcCArlz2GNB<Fk}Zjn)XfNUW&K3z&>C
zbSnuMm<Xh{q&?|%w(yBX(BCUg)anU>0wA3>CX}5|4s|;k1wN6cgxIB-%0#DyP01QU
zPZZz$R+1}5ag}6jPm^kH!a=;<YNw$srZj}&=1iv^Q!SAKS$!q&lZ#@XsajwY5srkU
z<5Gl@NSQB;PDqrA2}vZ$B{*SH4EClp&>@3?GL+hIQlU%rRCI}O^_mREq+jChNT&)C
I2zsD5-~q&^umAu6

diff --git a/kde/desktop/desktop-it.tar.bz2 b/kde/desktop/desktop-it.tar.bz2
deleted file mode 100644
index 84a6d1d1e15262329a4d836b7c951e343d5557c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmV;b0agA&T4*^jL0KkKS@lI{hX4WE|A)em0RTV&|ALPq%?j`D-(Ua&01gNM00=+<
zy}PjOa7jvfngePXGy_1;(Vzx^Fp&y1H3J|3(?);*0MkJgHAa~eOh!*rATb#+0~#RO
z2&qPzGHPv1o`E#P8Zj8qCMT)3Df*HO<82~S{Uith3o3wKCysm2yJECkNYw<Q`!{?;
zagG~p)3byDfRVD0(3B~s@9M3ZQgtX(dXT2{r8b`(5D_SllcX_SWxzlZXVD{V2^#iF
zOEbw4h+;%(4sZ;Cym3hsOtX}f7csPlO}4TKh$T#_i;;ImD-$-%LZcLpw#9(35-%t)
zhVU&|uSJB7L{v7eVjD_ChFGMD71qv)JJF{`hS&4b@5qL`5txQF!LpIujOe6~bMZi^
zQ&N?WfZ%0KY4oN0586_lE+>LJK;ntX(am^;%uHfO(!mtNM2e0dLr~}u0!XAyR3IeO
z6~!Y+qbNp{gXE`V#FB|Li7Jz&w1UD+mkf%2sXBF8QVQ-VOr%Oea;+~VgrXF?QCglt
UlV9%>0xvOlBvXY64^&ooa3~hDlK=n!