From 95ddb4a61d2eaf4f2d1fa4f40e57b5005da2d2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
<francois.grisez@belledonne-communications.com>
Date: Mon, 30 Mar 2015 15:22:53 +0200
Subject: [PATCH] Install the icon image in a standard repository
* The new location of the icon image is <prefix>/icons/hicolor/48x48/apps
* The icon has been resized to 48x48
---
pixmaps/Makefile.am | 46 +++++++++++++++++--------------
pixmaps/linphone.png | Bin 2747 -> 2733 bytes
share/audio-assistant.desktop.in | 2 +-
share/linphone.desktop.in | 2 +-
4 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 5e9b7a177f..10ad6856c8 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,25 +1,29 @@
-
-
pixmapdir=$(datadir)/pixmaps/linphone
pixmap_DATA= \
-hold_on.png hold_off.png \
-mic_muted.png mic_active.png \
-linphone.png linphone-banner.png \
-status-green.png \
-status-orange.png \
-status-red.png \
-status-offline.png \
-call.png \
-chat.png active_chat.png composing_chat.png composing_active_chat.png\
-chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\
-contact-orange.png dialer-orange.png history-orange.png\
-startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \
-contact_starred.png contact_unstarred.png \
-speaker.png \
-call_status_incoming.png call_status_outgoing.png \
-ok.png \
-dialer.png \
-notok.png
+ hold_on.png hold_off.png \
+ mic_muted.png mic_active.png \
+ linphone.png linphone-banner.png \
+ status-green.png \
+ status-orange.png \
+ status-red.png \
+ status-offline.png \
+ call.png \
+ chat.png active_chat.png composing_chat.png composing_active_chat.png\
+ chat_message_inprogress.png chat_message_delivered.png chat_message_not_delivered.png\
+ contact-orange.png dialer-orange.png history-orange.png\
+ startcall-green.png startcall-small.png stopcall-red.png stopcall-small.png addcall-green.png linphone.icns \
+ contact_starred.png contact_unstarred.png \
+ speaker.png \
+ call_status_incoming.png call_status_outgoing.png \
+ ok.png \
+ dialer.png \
+ notok.png
+
+
+iconsdir=$(datadir)/icons/hicolor/48x48/apps
+
+icons_DATA= linphone.png
+
-EXTRA_DIST=$(pixmap_DATA)
+EXTRA_DIST=$(pixmap_DATA) $(icons_DATA)
diff --git a/pixmaps/linphone.png b/pixmaps/linphone.png
index 722593e650f3304fc1ec38171f2913335ccd5f31..4031d72056a20472c6b99b0b79c8dfd6b1c5ce95 100644
GIT binary patch
literal 2733
zcmV;e3R3lnP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0003@0003@0cnQ4IRF3v8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H13MxrNK~!jg&6;U+mBksyfAhZY-MJ(;%S}Q;*d-w%tpQY|f~cr)
zTB`*0RBH8j<P@pe9+y^%+p!jpw*8>irLD(SYm2Qr6_?`@KvXDblpqi`iIDv!_ukz7
zU8WyyxNsqXgb?g=&U~49=0DGWW}bPTnfDbOCYu&l+suyGwL+0sNjL+E9}s-IB7s)m
zODW{act^?e=hxO62OBfSZCo&^N@BeXO#Bv%9Ds;zQc-Ho{`c0epoc(@@#}${Z`HPb
ziws(pHRGIDcWx7#7FXNMKy(YIc;*$m6KBaNw46LthZ`djL=Sb6Xx<0X>JP+Mu|V+@
z&FqL>i#RpLt4=rhvo0g=oQv^{pNts|BUBrT(}n7E17OCwi8Opc=lZwk{PZ2nc(gCL
zNv?wCAB&AO74J&PMW=#5-q~|86EWiZcaaLTWzDob&yQ<V1-aF;@J+uEd!8RN9;Ny9
zXJ}dVELJkn8{|7;!-9%7pzu@>0MI<cag>b4QBVv*!Ai!6H+@a2?Eum;0T7yv{F(D9
zy>clIe;J9EMs_`N3$cAWvcUwcV#9(86HtcKXs?gL3v0+b>moekP6u)H$!tW!gg#qK
zNA0VGzW5jb#o=V+HMdbTZxL29!S)AkAhP|l!@F5x!-5JqRE8@y2O}2VMA5uOs7^Q1
z&`C6XjpA^oiRI*H_Wt1#+4&`3KY2H?#s&cVbFXIfjrU+gf^5CBhGctFMt8^vIEu@e
zaOYznC4sf82-j~Qwr>a0&<_o+sJKRs$6Ga>qIrvO7MEw*q@H5W6Uzy#TLnPr!kZ|)
z>SltQYiU@qWM~Q43rZ+mcoQA9uhG42bN@OCh5Q+pP=5Vg*m4WfBrKC%kK97ne?I`B
zFzLa6FzmD`)ZcLhvAx@dj(|{Aq?vX|o3D`kne*{hPQ_7FhU#=<#-k*f_7bk&Nay<1
z7}0R1uQoi7iOZhCGk!7vM!1tLzxV-qD1f)Jn#u?MPSZ<IvVY~HLq`BWakv<{=r;Uw
zuSTe9pL$j*LGx?R(DcgFneC;zy;QAOiL-Pp04@J{j>f;P0N{*A-y*W}3-&zrtF-Qo
zlM3!T>BifgRNVhJeADI-+q;$ErVnX<?<InpKO|hg0V5j5Q8)s{W=E(R!>gv_t*oZ&
z(|3`Ej?_~`8tN##pavln97Sccta>($?Q|oP3BvUofFW7|)$PSwc_xt^br_LQpE{*A
zODO*SPe7zk@xa<Q*!}1)Gdg3IK1kvDR{*f-n(tyI6Y13yN@lf&<oq{d-2^wU>C^aw
zI*rdgOv6JrVaB=v$UApFLbGLb4!rm{Rw_Zfac3qHOVi9g$%Zlx^jDlEqZqm9cFcH$
zJ&)g&)#k0NM(=7T(bCv!-~S5&gOMRkA&w=g+j~-Qw3C7|0P&2iqG<lLNJD4ulgkH<
zcS;DTZZG-gUP{rWi*S`s0ATz5*Pj&Z;}UQbj=)tu0f)Z~o6nEx@*q?dBiw}^?nDm;
zi0#`!qG>P4Y<C)V+7$eAuO@HCB`9`hrasltOt^mI&=3%+hHu&&d}m$A@X0f<<>vPb
z$ms4OvZIdfZJRL@G5i-@iF<TKueu#;UhnU<@wk#9AXJsYIW?4Aej^Tl>A-=!K60m?
zPwv$7kF6*r9ks6w7{AYP0o)_UGiK>;GYQmCN@U09BwHI1${?ScBuFXK1jgL_5T3DB
zz3S<~cH)f<q`KPBJ6i!zJvnIJ92|wExJOkYZ1#SS+p+Eqgmx0%$}EXAGF#{{Kq(2=
ze@t-G`-HZ9M5?2ycYq!ds)l=11>VZ(<ef7gSNU-sIHUk1LK|cVG6AD!1rA<OyEeW}
z^Qxyw9N2Zpz~j!ANvv@zvBs^mzVj@u((x3`zLJ7jHCcJhK^eXHUhH{(nqPe!;TQx7
z0VI1;iHdvwOkmwhgz7#xalj+QURXxSWjEuSc1f?7_yhm?Bdx2SM6sV3328|5u#qO<
zEXhTh@xj{Mt9YwsQhwcU&^)<ESRmQ?@Xv_uUUx#<N$M7<E<H`aQD{e;;7s&K9RAUa
zS@Hz-yppVXGuq8pzg~!xtpmoCDT`!#DxJ&;RiJ1BMHR@Dg_TSP8ATH(rRbge`1+~E
z7~P#&MyMVy<<~7orpy6j3N^hgdkCbR)ivsDCf>V>iOXN1VD=I$eHe&z+hB_xYGVIC
zmmL*>bG|bZXW5wp$LzUgt2a(6xX<php}O6SS@JZFf)Z@Q^YB(yQ!slWk%nEE-HiyF
zKq!MNdZ-E2lZUJ9h?pZ4qC3~54eKWsrbG`JJ@)}sF#Pm+nfI8?61#>m?$$rxC_3w;
ztb))4fwh0ZO2)Fr@lC$~X$%a9!?%#4DtN|E@6}m^qEfo>=RJO+47ym!AfdW9kC-SA
z_WUse!%~%OA5iQ^2c3hW2b)lAO222vN?GVZom6KEz1u)qGON9N+v=mna1@O@As<Lb
zVpWiA{Sr=}brf(a&`jW?-}ftjktwj}&m#BYdALVUM5r2iXB)xK*AV*bd9<9g11CEg
zFd{*;VTWRa=FKD3+5a5r;3<^Og;YWJj#c=k{|L>So&QI7Z9xyUqd1QrCp;4_XT%Th
z$f~pD<l`PwiRyCFz5P!Isgi8njW(=0qo>$y155I<eL#R2rR|-&vGin?o^Sd^Xv1e>
zbQ{M#n_VTN`y9{VFU!(3<B_a(E738qSa28t3spgA3d!~@w7+*>=1U0xLNIpe?<l(T
zA&kg45-ll^AT;HulIqygCjm>3W$9{Oe|Edo+AC&Xg|rh}8iICdT15w!FTQ_0?eE`9
z!FkJ29EUzW_@>RlH*F5dmPR^1ew+A#ZKOJPW5(N&W)f%7WQJAD?~{Ph)sWdD(s1A^
zn~-VKyV@|LI|sCdEYkvL(~x{&gpIkbvO|~d#DR6RuKp>$vu?vVVoFv=M{zkNS1j)L
zKmbO#gH%^7iY;xRn)5w`dgwYH+3_xl4F>X4fEhACP^U=bi}C#lkl9C_5pAUXgInoX
zdk=}0`T-eyxagr)0_&C`tw<U-qL6>yb(wZ6l_37j%L5By65<CEAX%x!10~P7^ILBZ
zZHZL+rsW(p35lk4B%0P?^Nq({HVa4b4D9)1k8QP-BwDtTXsRW;_f4dcKxhIpYT_Ap
zL)NFH@R!eFnZf>V9|^(DA*_^D9}5(}AOJpHST#vl#(LK%cdl>haD?sHN2X%;V)s>`
zc}JqU{Gg_NMW%un(Qin$)nUflv-%|4Q)te)lwW^OrY^pJBb^)WI_f>CPuo+H;HDt4
z#zdEjHDl__4cjxcKe>EDrJ|@WDGp_lXRI5C-;U~1VX&_Uq?g-Ka4toc-atCN1*x|a
z_+$lAKh8zUl9+LmWLuKxo;X(0s#mcVPJOvyI~=iLKAb&U^W?QGl7g#&DL~PYI^Tk%
nf433TAz2v<6u)rz?>7Gfhvx#!yf-ha00000NkvXXu0mjfbzw0*
literal 2747
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
BB60u#
diff --git a/share/audio-assistant.desktop.in b/share/audio-assistant.desktop.in
index 72c8715211..7f107545de 100644
--- a/share/audio-assistant.desktop.in
+++ b/share/audio-assistant.desktop.in
@@ -7,6 +7,6 @@ Comment[fr]=Assistant audio de Linphone.
Comment[ru]=Помощник аудио Linphone
Type=Application
Exec=linphone --run-audio-assistant
-Icon=@prefix@/share/pixmaps/linphone/linphone.png
+Icon=linphone
Terminal=false
Categories=Network;Telephony;
diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index 748076ecfe..656897a48b 100644
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -4,7 +4,7 @@ GenericName=Web-phone
Comment=Linphone is a web-phone
Type=Application
Exec=linphone
-Icon=@prefix@/share/pixmaps/linphone/linphone.png
+Icon=linphone
Terminal=false
Categories=Network;Telephony;
--
GitLab