[neon/kde/kcalc/Neon/release] /: use candidate

[Jonathan Riddell]

Git commit c898171bba170b735c55b965be26d958292fc0e1 by Jonathan Riddell.
Committed on 12/02/2021 at 13:01.
Pushed by jriddell into branch 'Neon/release'.

use candidate

D  +-    --    setup/gui/icon.png
D  +0    -155  setup/gui/org.kde.kcalc.desktop
M  +2    -2    snapcraft.yaml

https://invent.kde.org/neon/kde/kcalc/commit/c898171bba170b735c55b965be26d958292fc0e1

diff --git a/setup/gui/icon.png b/setup/gui/icon.png
deleted file mode 100644
index 9537936..0000000
Binary files a/setup/gui/icon.png and /dev/null differ
diff --git a/setup/gui/org.kde.kcalc.desktop b/setup/gui/org.kde.kcalc.desktop
deleted file mode 100644
index 42e5882..0000000
--- a/setup/gui/org.kde.kcalc.desktop
+++ /dev/null
@@ -1,155 +0,0 @@
-[Desktop Entry]
-Name=KCalc
-Name[af]=Kcalc
-Name[ar]=حاسبة ك
-Name[ast]=KCalc
-Name[bg]=KCalc
-Name[br]=KCalc
-Name[bs]=KCalc
-Name[ca]=KCalc
-Name[ca at valencia]=KCalc
-Name[cs]=KCalc
-Name[cy]=KCalc
-Name[da]=KCalc
-Name[de]=KCalc
-Name[el]=KCalc
-Name[en_GB]=KCalc
-Name[eo]=KCalc
-Name[es]=KCalc
-Name[et]=KCalc
-Name[eu]=KCalc
-Name[fi]=KCalc
-Name[fr]=KCalc
-Name[ga]=KCalc
-Name[gl]=KCalc
-Name[he]=KCalc
-Name[hne]=के-केल्क
-Name[hr]=KCalc
-Name[hu]=KCalc
-Name[ia]=KCalc
-Name[id]=KCalc
-Name[is]=KCalc
-Name[it]=KCalc
-Name[ja]=KCalc
-Name[kk]=KCalc
-Name[km]=KCalc
-Name[ko]=KCalc
-Name[lt]=KCalc
-Name[lv]=KCalc
-Name[mk]=KCalc
-Name[mr]=के-कॅल्क
-Name[ms]=KCalc
-Name[nb]=KCalc
-Name[nds]=KCalc
-Name[ne]=केडीई क्याल्क
-Name[nl]=KCalc
-Name[nn]=KCalc
-Name[pa]=ਕੇ-ਕੈਲਕ
-Name[pl]=Kalkulator
-Name[pt]=KCalc
-Name[pt_BR]=KCalc
-Name[ro]=KCalc
-Name[ru]=KCalc
-Name[sk]=KCalc
-Name[sl]=KCalc
-Name[sq]=KCalc
-Name[sr]=К‑калк
-Name[sr at ijekavian]=К‑калк
-Name[sr at ijekavianlatin]=KCalc
-Name[sr at latin]=KCalc
-Name[sv]=Kcalc
-Name[ta]=கேகணிப்பான்
-Name[tg]=KМошинаи ҳисобкунак
-Name[th]=เครื่องคิดเลข-K
-Name[tr]=KCalc
-Name[ug]=KCalc
-Name[uk]=KCalc
-Name[uz]=Kalkulyator
-Name[uz at cyrillic]=Калкулятор
-Name[vi]=KCalc
-Name[wa]=KCalc
-Name[x-test]=xxKCalcxx
-Name[zh_CN]=KCalc
-Name[zh_TW]=KDE 計算機
-Exec=kcalc
-Icon=accessories-calculator
-X-DocPath=kcalc/index.html
-GenericName=Scientific Calculator
-GenericName[af]=Wetenskaplike Sakrekenaar
-GenericName[ar]=آلة حاسبة علمية
-GenericName[ast]=Calculadora científica
-GenericName[bg]=Калкулатор
-GenericName[br]=Ur jederez skiantel
-GenericName[bs]=Naučni kalkulator
-GenericName[ca]=Calculadora científica
-GenericName[ca at valencia]=Calculadora científica
-GenericName[cs]=Vědecká kalkulačka
-GenericName[cy]=Cyfrifydd Gwyddonol
-GenericName[da]=Videnskabelig regnemaskine
-GenericName[de]=Wissenschaftlicher Taschenrechner
-GenericName[el]=Επιστημονικό κομπιουτεράκι
-GenericName[en_GB]=Scientific Calculator
-GenericName[eo]=Scienca kalkulilo
-GenericName[es]=Calculadora científica
-GenericName[et]=Teaduslik kalkulaator
-GenericName[eu]=Kalkulagailu zientifikoa
-GenericName[fa]=ماشین حساب علمی
-GenericName[fi]=Tieteellinen laskin
-GenericName[fr]=Calculatrice scientifique
-GenericName[ga]=Áireamhán Eolaíochta
-GenericName[gl]=Unha calculadora científica
-GenericName[he]=מחשבון מדעי
-GenericName[hne]=वैग्यानिक केल्कुलेटर
-GenericName[hr]=Znanstveni kalkulator
-GenericName[hu]=Tudományos számológép
-GenericName[ia]=Calculator scientific
-GenericName[id]=Kalkulator Ilmiah
-GenericName[is]=Öflug reiknivél
-GenericName[it]=Calcolatrice scientifica
-GenericName[ja]=科学電卓
-GenericName[kk]=Ғылыми калькулятор
-GenericName[km]=​ម៉ាស៊ីន​គិត​លេខ​​​វិទ្យាសាស្ត្រ
-GenericName[ko]=공학용 계산기
-GenericName[lt]=Mokslinis skaičiuotuvas
-GenericName[lv]=Zinātniskais kalkulators
-GenericName[mk]=Научен калкулатор
-GenericName[mr]=शास्त्रीय गणकयंत्र
-GenericName[ms]=Scientific Calculator
-GenericName[nb]=Vitenskapelig kalkulator
-GenericName[nds]=Wetenschaplich Taschenreekner
-GenericName[ne]=वैज्ञानिक गणकयन्त्र
-GenericName[nl]=Wetenschappelijke rekenmachine
-GenericName[nn]=Vitskapleg kalkulator
-GenericName[pa]=ਵਿਗਿਆਨਿਕ ਕੈਲਕੂਲੇਟਰ
-GenericName[pl]=Kalkulator naukowy
-GenericName[pt]=Calculadora Cientifica
-GenericName[pt_BR]=Calculadora científica
-GenericName[ro]=Calculator științific
-GenericName[ru]=Калькулятор
-GenericName[sk]=Vedecká kalkulačka
-GenericName[sl]=Znanstveno računalo
-GenericName[sq]=Makinë Llogaritëse Shkencore
-GenericName[sr]=Научни калкулатор
-GenericName[sr at ijekavian]=Научни калкулатор
-GenericName[sr at ijekavianlatin]=Naučni kalkulator
-GenericName[sr at latin]=Naučni kalkulator
-GenericName[sv]=Vetenskaplig miniräknare
-GenericName[ta]= அறிவியல் சார்ந்த கணிப்பான்
-GenericName[tg]=Мошинаи ҳисобкунаки Илмӣ
-GenericName[th]=เครื่องคิดเลขทางวิทยาศาสตร์
-GenericName[tr]=Bilimsel Hesap Makinesi
-GenericName[ug]=ئىلمىي ھېسابلىغۇچ
-GenericName[uk]=Калькулятор для науковців
-GenericName[uz]=Ilmiy kalkulyator
-GenericName[uz at cyrillic]=Илмий калкулятор
-GenericName[vi]=Máy Tính Khoa Học 
-GenericName[wa]=Carculete syintifike
-GenericName[xh]=Umatshini Wokubala Ezenzululwazi
-GenericName[x-test]=xxScientific Calculatorxx
-GenericName[zh_CN]=科学计算器
-GenericName[zh_TW]=科學計算機
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Qt;KDE;Utility;Calculator;X-KDE-Utilities-Desktop;
-X-DBUS-ServiceName=org.kde.kcalc.desktop
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 13ba84c..6d9426e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -29,14 +29,14 @@ plugs:
     kde-frameworks-5-plug:
         content: kde-frameworks-5-qt-5-15-core20-all
         interface: content
-        default-provider: kde-frameworks-5-qt-5-15-core20
+        default-provider: kde-frameworks-5-qt-5-15-core20/latest/candidate
         target: kf5
 parts:
     kcalc:
         parse-info:
         - usr/share/metainfo/org.kde.kcalc.appdata.xml
         build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk
+        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
         - kde-frameworks-5-env
         plugin: cmake