From 297a29d84caa3f53301de7ea35414977243f60b8 Mon Sep 17 00:00:00 2001 From: asmeron Date: Thu, 16 Mar 2023 06:56:45 +0300 Subject: [PATCH] [package] update --- Makefile | 13 ++++--------- VERSION.md | 2 +- bg_top.png => logo-background.png | Bin ...=> ru.ublinux.ubl-settings-datetime.alert.svg | 0 ru.ublinux.ubl-settings-datetime.png | Bin 6412 -> 0 bytes source/ubl-settings-datetime.h | 2 +- style.css | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) rename bg_top.png => logo-background.png (100%) rename alert.svg => ru.ublinux.ubl-settings-datetime.alert.svg (100%) delete mode 100644 ru.ublinux.ubl-settings-datetime.png mode change 100755 => 100644 source/ubl-settings-datetime.h diff --git a/Makefile b/Makefile index 0ba8841..f68f4dc 100644 --- a/Makefile +++ b/Makefile @@ -21,11 +21,7 @@ all: init build init: @echo "Initialize ..."; \ - version="$$(cat VERSION.md)"; \ - version=$${version:8}; \ - search="s/string version_application.*$&"; \ - replace="string version_application = \"$${version}\";"; \ - sed -i -e "$$search/$$replace/gi" source/ubl-settings-datetime.h; \ + sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' VERSION.md | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.h; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -85,6 +81,7 @@ uninstall: @$(RM) "/usr/bin/${pkgname}" @$(RM) "/usr/share/applications/${pkgname}.desktop" @$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${pkgname}.exec.policy" + @$(RM) -rd "/usr/share/${pkgname}" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null @update-desktop-database --quiet 2>/dev/null @touch /usr/share/applications @@ -109,12 +106,10 @@ install: check uninstall @install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${pkgname}" @install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop" @install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${pkgname}.exec.policy" - @install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,images,css} + @install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,css,images} @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/ui/" "${pkgname}.glade" @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css - @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.svg" - @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.png" - @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png" + @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "logo-background.png" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.checked.svg" @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.warning.svg" @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null diff --git a/VERSION.md b/VERSION.md index 48eea8c..c1fc6fc 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.3 +VERSION 1.4 diff --git a/bg_top.png b/logo-background.png similarity index 100% rename from bg_top.png rename to logo-background.png diff --git a/alert.svg b/ru.ublinux.ubl-settings-datetime.alert.svg similarity index 100% rename from alert.svg rename to ru.ublinux.ubl-settings-datetime.alert.svg diff --git a/ru.ublinux.ubl-settings-datetime.png b/ru.ublinux.ubl-settings-datetime.png deleted file mode 100644 index a77b93f4a69ced1a84cb1b9678707f17f065c363..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6412 zcmV+n8T00eP)Qu_l3PJ70D{1NrT9Bn zl0S%U-+JOqx3L^jXCu&&4V`O2eGiyjoI}Nw;ye989+oFN;}hAoO6jZuy6M(?muN8_ z1FjiW2H^uSP=oszqlM zXmxW}FcQ#T6;byAkueshQEHo*{K>$NJA10pzG~7L13G1g9|PuAx#(V$JUnpv^keee z_YzeuyJDJfpzGJ)dx@#c?}Drt=c@LKl5d?Y_ItvBj%>bXk~qP8m8d@eF(;%_K*2w2 zt?n9lrt|HIsQTq`S04#E>C^=JLtJ3l@X4H#FT!?$*= zGDIE+7L8ja<(r|54 zpi=*#`a%$XZW!v$-ff-xt5MvjfmU5zMr1FyiO8P=Q>sz92d;SkMGyqEKdlgK<$h0I1uhy(Wk6PQML;wn8ngz{pj||J z|I^of8lKi*r9c^A7%0O`{r3JV!zd6$LEV|&k5(9}8^xA^h5TRX?9`QXdsv_wH+Id( zmi>wxQk>(bUx!>pDFt&uv~BVi)-H3Th-x=;W_F=QvP9hd&0 z1RwRs=;@1cq&LdZ-WXb$U|J~C1j7Qu%z}=>KT6WQ&lSpONc|f4TL1RW|0uWnMS*VL z^!557H~e)G?gj~!TWA5LwKuJ;u8p`3hHEo_a)gUJ+F8)vN<&>uMa9RHNj^A!l3j;; z*xh{+M_DKDxrn(WRf=ycJpuV9i}(wf)zk1 z6A;98XmAE-*QYsZwlWw9qpTpx43rJFCs5>Ss!*E31}LB$Bef zE;vaf8Ry)|5k9-*92)CubJ!&Bw;);&prO8&=Eex2V1R&Sp_IaL9pZ^3eFIVY2L{oi zQOZCmKlr)7la9j+zj=>0_q@x3KtE=V;9L~%(nc)QgbLK8%#B%z$D#$fV_dzc9M|TeBsjhTrjge%aQ_EL=X|Q)-=@BGJj479n+^Ut-Xza zHGHT-Zx*|#A{(}B5s}VvOD#&drov9p8dPk!@_eQ=g}uwU0Ben_U1rai%B2^c z%ZzDL8H?xp(aBT1v3oCj_Z>ta1-fSj(tsxu310uzztMC2s4uT8iao|uhH9E2P=hip z&y18$f7`!(OHmI^HLUO4MK$6SxgaOw%#H-P?dppN1w746gRHg2bzP=SnZ$~#E@Mh- z%b2UqrGaRSe}Cn5-al{{(=;*6?9Cjd6e7Z|*I(w)fxW(bE{fg3IV3`jW6)}44>*Kn zM`tqsiskJB8e;@cJkKHx@`C1C)?al20n)ffs^F1?KN&z+x2uWmd%TwlkU zYp>z_Bi-zL>Ax6CBr#1Br3^#_r4$!lawVn}VE_BOGxFuol!u3pR zn?%x1;%XN`(4s-XqKlR=d)_&jZuCe!r>rKt#Z5Vj7(Z$47R9q7LzJPk3+FnBonUgv zv&p71&{`uRxUP$xOw!uYz)kC}qp2~HnFPoCs0jsGcipv|Gq;0eGJ)ebnaNi~Sai|l zv`w8!j~n8E(VDf*;}9eq8_)>idMmwa~;7zV8TF7 zA4M+mF;psurHd_+#!i(1ooh0jBp0+rxTvEo6SUE; zi<3-Zh|9V)pTx4Pakt6&NB4;ny!H03%((#9uUaEg>Tn@N&-rpwrUU4&vA>o7YCTCg?L6i9~{#)7x1% zZ_b2+ynp|Gy6(S^SS-e^>o;H+ev>tM(j=B#crJ-V+yh%{wAL7gV)de#h@AlKq@sM) z1G^%P_O#id-q2h&XKJPsuIu91NgO-L%H>yQWHM35{{08IZ|eiZVlg&v+|2cBt}n`W z#ga?0Oog4a(b~ui=DsVYkzzf|M=WLV%v7bARjnzfCnDj%3v(U z=1rSN1+s_`2v{tfKZj(}#&tAW3t9`HxUjv&?}1Dx&>3y^?DP3kTQW1Y7LB7Fl6I1F z7S1i%x!PL)-IQ1?#!sI53E#N;8@%zx8Cx}_6g-V~U1l~#QriYn zK)Wuk4h8wu_;!Ak- zSFaFHB)IId%P}pJM;>{E!J$Dm-nNldD_4z4>!!4}((}=2&&|_j<|aW$bC{Qp^k)6( zF@`_N*jg(Y*KT@~f3=r39nDQmWp%o}t)08>`XhF~vzu+(p5o}y?46I;V2r>1!T;gI z0|#(jZ_lA&7)=r0%RtYYL;Z>&;1!0=sgw zM`t=D*W=f;)Q5Z%q1N7HSW^?K$Ok^}yhU_%-Orb9Sx;@PcYipUNN{NX{tU?A-JLmn z@F15hS;8l;y|ya;cU^rQu6A+7MaWKw0m~p9G|$vzsHw9If|luNl4N%tX;%}ltcu+< z!!Wq+Q`hnE!;i3H#c$Ey*Ov)p=F^cwA68sX{$W`GT-WoNMf@sV!BF zHH9(d^vX)1{K{X!5e_%7Y141Ba^>ohZ5fKk$6QbPFqHDG41GYS`kI=cCI;yAWEirP zucf(~ofyNyBmY>rYE{XNGE1+%rfT)X6N!>i2${x2n+{K+f)F&6uc02;9#=FPty=8j z+(qYe+vYD9f_%+2to!^Is#Z@l8q4-FPY3}swK)>Ts?g=ScX)S7GPQc(liEew*VkJW zdzPj@yz7s+I2#a(Wj?YjhQ;%qOP= zl{=CIB(oXZr03(4RRtR0n&m6FdS@$gs0ZV-pMxrb4A9f_vA3fXZ^voTqN`9}1&^rZ zv_=Faf`P&?4Ej#@GSELjxFI}z5tY;lRTm;aclR+&E0moN#-R?VARg__i77iq)^r($ zfoWOnegFNc$C}f1jF!JoL!Ta*|LC!91_$F9rinuNR=b%=eiWpF0j!3GVR_2eXvx#8 z)NjKuuq=x`@4m<4ix-z&>~N$q18C%q|0G_|^GR<*``XYD>qCPjdH3vj7b_6(R)b3A zJfoBvL8E9}`20n*Ubh-$S_~aLNY5{x4;168;8vCt{9!1RX^pFfzTV!dxnH^9 zj>LD+HF+*slNo70OVo12Exye`yDqzS?e>5+&D82TuU{iTtqgH$d&|*-Tlx zw&-KoV>2B&Kp4t19abQ~E3f_fi~!x^7Ix=E383HJ{SMKg!K_A?D1SII>*`QJzXDse zbu)|cR$w{`ZI=?kPzuYm2n9pD`Q~r9>dGq$0{xYec)krfr`|)SZ8~?JtG1fkSZFTb4|gSQ9799))ziz*?%a$DfkC3-k6ir zBUr@*KLS*>nWeK!HQPAF>G=y zeki~+OoG86b+vUII`|!S8uToA8QmVgjhkJA3g8#4r-HzFCLz`EP~d;&|uu#2c7A7 z763`{r3Z&dZUNp;+ttJ!&yALJbT5@TTh(Ncx!Jr{?Qt;dG)C!S%LY1U>KmDICdZ%w z%1|WYah`tW85W&)F3Xm$pr&TzXO&`K{1eQ9lNoRT27@8`#LNPf>Q&ku6agZ2MFA}e zGWno;eYJAWOYx;a_0HQxyopjs#c3)5IwPV{lEPaxD$~RWhA>iE{@#0g+4ufF7GJ!W z#TQ>pZHb5P0i0PE;ADD|ZifsHGDQH*$xB{ZF_8UWdL)q&EXqI)8WhEJvwX{ z1cF{{!8A>5+veA=zs{?#zRH}rbD2ALE_3J2AruOj7k{U**#xC_#fo%~81aTaj!-tP>;J`tC`Ae6krY2fiT4-)+rlz)rP>mOu zPsS4r#pCq%^>J#>XOQ|Sg@9zvr3i4t3nRl^AfS9RQv~F6Y6)RjKtJWYyE(@uRZ2=J zFbvGpO476}0>PlSTgY{ZCz2dFdW^$|kEHf?r0eq@s5cA)w?hvzRP!dtJdhg$29`?m zc@t!BLa^QJlE0 zEWev}^^Oy~cghBVwtACYo2C|YtNHQ6sk;3dZvjsLWdNOP;KoiF$1C-2qYNk`zFolE z3NW(WOqG|%mrt2VjpElc7fa;#u@$lT#(>LHhNmkpt&6{ zZa4EmE{#&Y9WDwW!waJT<%`9AF`&sQ!9P+AxzwUto` zBP;N1Sp~0SEBek+5$`brJI+)y!L=R3-&&stdU^2%`s$_>f}FO?MTW1GNGmx4q=-4n z6~?f9l2cES=w1IaoqPMA-m+FJwHj3R%^^yGVR9mA&=jV7du4snu7i%YTQLEpN{_UNoc<$g(%Df04eq}m!0ly!8#kS+@J!vBX z)50e2d}UfeyCUB?MDBZR!7Fc6OYpuOou`yicZP5J=3gn(dK6`RT1?Bkl{4%NGmc~! z#qD7c@|l%kDAScvY(A4zoGE`&PHX(AV;v$QN~t}-^$oXtYpufiE|UH#(8L4niw`pb zNTU!&KHrEuBMBpSz9F zvbQ67cEvoOO2ecAB!R~woA3F_nfPK*sv#LIPWSy}LUSzU-&@h2^b4bB$mM9v@BudH z=uD9a9F4kJ8=d0wf==FVN5hc;mwePE7v!9@s(l{B`v#Wr7_hu51&%=B&&pjKPF#O@#+_Z7|vQYLr zg~t6LG|)cbVj zYXi@0Std$u26d<^g$^@R3s|#RvIe|VvBO>-MF1Q(~?2u&Bi!hH$7@1K~f~Nq?Jdkte3-Pyc!oSdV^kdgI