use upstream's icons & desktop file

3 files changed, 11 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7da9ccf..f472892 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rlr-git
         pkgdesc = interactive pixel screen ruler and protractor
-        pkgver = r25.5fd3169
+        pkgver = r29.26ca7b5
         pkgrel = 1
         url = https://github.com/epilys/rlr
         arch = any
@@ -10,8 +10,6 @@ pkgbase = rlr-git
         provides = rlr
         conflicts = rlr
         source = rlr::git+https://github.com/epilys/rlr
-        source = rlr.desktop
         sha256sums = SKIP
-        sha256sums = 7f659ea7e8cb794963ff6881294a8aba388c33bc10c7e14c1ecf58fb241386e7
 
 pkgname = rlr-git
diff --git a/PKGBUILD b/PKGBUILD
index 979f263..c2cbef0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,17 @@
 # Maintainer: Yigit Sever <yigit at yigitsever dot com>
 
-pkgname=rlr-git # '-bzr', '-git', '-hg' or '-svn'
-pkgver=r25.5fd3169
+pkgname=rlr-git
+pkgver=r29.26ca7b5
 pkgrel=1
 pkgdesc="interactive pixel screen ruler and protractor"
 arch=('any')
 url="https://github.com/epilys/rlr"
 license=('GPL')
-makedepends=('git' 'cargo') # 'bzr', 'git', 'mercurial' or 'subversion'
+makedepends=('git' 'cargo')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("${pkgname%-git}::git+${url}" "${pkgname%-git}.desktop")
-sha256sums=('SKIP'
-            '7f659ea7e8cb794963ff6881294a8aba388c33bc10c7e14c1ecf58fb241386e7')
+source=("${pkgname%-git}::git+${url}")
+sha256sums=('SKIP')
 
 pkgver() {
         cd "$srcdir/${pkgname%-git}"
@@ -36,5 +35,9 @@ package() {
         # binary
         install -Dm0755 "${srcdir}/${pkgname%-git}/target/release/${pkgname%-git}" -t "${pkgdir}/usr/bin/"
         # desktop file
-        install -Dm644 "${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop"
+        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop"
+        # png icon
+        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname%-git}.png"
+        # svg icon
+        install -Dm644 "${srcdir}/${pkgname%-git}/${pkgname%-git}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname%-git}.png"
 }
diff --git a/rlr.desktop b/rlr.desktop
deleted file mode 100644
index ceec0d0..0000000
--- a/rlr.desktop
+++ /dev/null
@@ -1,83 +0,0 @@
-[Desktop Entry]
-GenericName=Screen Ruler
-GenericName[af]=Skerm Liniaal
-GenericName[ar]=مسطرة الشاشة
-GenericName[bg]=Линийка за екрана
-GenericName[bs]=Ekranski lenjir
-GenericName[ca]=Regle de la pantalla
-GenericName[ca@valencia]=Regle de la pantalla
-GenericName[cs]=Obrazovkové pravítko
-GenericName[cy]=Mesurydd Sgrîn
-GenericName[da]=Skærmlineal
-GenericName[de]=Bildschirmlineal
-GenericName[el]=Κανόνας οθόνης
-GenericName[en_GB]=Screen Ruler
-GenericName[eo]=Ekrana liniilo
-GenericName[es]=Regla para la pantalla
-GenericName[et]=Ekraani joonlaud
-GenericName[eu]=Pantailaren erregela
-GenericName[fa]=خط‌کش پرده
-GenericName[fi]=Näyttöviivain
-GenericName[fr]=Règle d'écran
-GenericName[ga]=Rialóir Scáileáin
-GenericName[gl]=Regra de pantalla
-GenericName[he]=סרגל מסך
-GenericName[hi]=स्क्रीन मापनी
-GenericName[hne]=स्क्रीन मापनी
-GenericName[hr]=Ravnalo
-GenericName[hu]=Képernyővonalzó
-GenericName[ia]=Regula de schermo
-GenericName[id]=Penggaris Layar
-GenericName[is]=Reglustika
-GenericName[it]=Righello per lo schermo
-GenericName[ja]=スクリーンルーラー
-GenericName[kk]=Экран өлшегіші
-GenericName[km]=បន្ទាត់​អេក្រង់
-GenericName[ko]=화면 자
-GenericName[ku]=Rastekê Dîmenderê
-GenericName[lt]=Ekrano liniuotė
-GenericName[lv]=Ekrāna mērlenta
-GenericName[mr]=स्क्रीन मोजपट्टी
-GenericName[ms]=Pembaris Skrin
-GenericName[nb]=Skjermlinjal
-GenericName[nds]=Schirmlineaal
-GenericName[ne]=पर्दा रूलर
-GenericName[nl]=Schermliniaal
-GenericName[nn]=Skjermlinjal
-GenericName[pa]=ਸਕਰੀਨ ਰੀਡਰ
-GenericName[pl]=Linijka ekranowa
-GenericName[pt]=Régua do ecrã
-GenericName[pt_BR]=Régua de tela
-GenericName[ro]=Riglă de ecran
-GenericName[ru]=Экранная линейка
-GenericName[se]=Šearpmalinjála
-GenericName[si]=තිරයේ කෝදුව
-GenericName[sk]=Pravítko obrazovky
-GenericName[sl]=Zaslonsko ravnilo
-GenericName[sr]=Екрански лењир
-GenericName[sr@ijekavian]=Екрански лењир
-GenericName[sr@ijekavianlatin]=Ekranski lenjir
-GenericName[sr@latin]=Ekranski lenjir
-GenericName[sv]=Skärmlinjal
-GenericName[ta]=திரை உருளை
-GenericName[tg]=Ҷадвали экрании KDE
-GenericName[th]=ไม้บรรทัดบนหน้าจอ
-GenericName[tr]=Ekran Cetveli
-GenericName[ug]=ئېكران باشقۇرغۇ
-GenericName[uk]=Лінійка екрана
-GenericName[uz]=Ekran lineykasi
-GenericName[uz@cyrillic]=Экран линейкаси
-GenericName[vi]=Thước đo màn hình
-GenericName[xh]=Screen Ruler
-GenericName[x-test]=xxScreen Rulerxx
-GenericName[zh_CN]=屏幕标尺工具
-GenericName[zh_HK]=螢幕尺規
-GenericName[zh_TW]=螢幕尺規
-Name=rlr
-Exec=rlr
-Type=Application
-Icon=kruler
-Terminal=false
-StartupWMClass=rlr
-StartupNotify=true
-Categories=Gnome;GTK;Graphics;Utilities;