Release 0.9.5

* use upstream .desktop file
* use upstream png icon only, remove icoutils dependency
* remove dropped upstream tinyxml dependency

2 files changed, 11 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 300d2f5be20b..5f1e539a95a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
 pkgbase = fheroes2
 	pkgdesc = Free remake of Heroes of Might and Magic II game engine
-	pkgver = 0.9.4
-	pkgrel = 2
+	pkgver = 0.9.5
+	pkgrel = 1
 	url = https://ihhub.github.io/fheroes2/
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = GPL2
 	makedepends = gettext
-	makedepends = icoutils
 	depends = sdl2
 	depends = sdl2_image
 	depends = sdl2_mixer
 	depends = sdl2_net
 	depends = sdl2_ttf
-	depends = tinyxml
 	optdepends = curl: download demo version files
 	optdepends = wget: download demo version files
 	optdepends = unzip: unpack demo version files
 	conflicts = fheroes2-git
 	conflicts = fheroes2-svn
-	source = fheroes2-0.9.4.tar.gz::https://github.com/ihhub/fheroes2/archive/0.9.4.tar.gz
-	source = fheroes2.desktop
-	md5sums = c3cb8ab7e5c2e33fd7d1a5451ff00910
-	md5sums = 99e02779f24c11aa2f37837c14d7d4aa
+	source = fheroes2-0.9.5.tar.gz::https://github.com/ihhub/fheroes2/archive/0.9.5.tar.gz
+	md5sums = a3764c652188b69dbbc1929954e94861
 
 pkgname = fheroes2
diff --git a/PKGBUILD b/PKGBUILD
index 2181414350e2..f333123778f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,23 @@
 pkgname=fheroes2
-pkgver=0.9.4
-pkgrel=2
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="Free remake of Heroes of Might and Magic II game engine"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://ihhub.github.io/fheroes2/"
 license=('GPL2')
-depends=('sdl2' 'sdl2_image' 'sdl2_mixer' 'sdl2_net' 'sdl2_ttf' 'tinyxml')
+depends=('sdl2' 'sdl2_image' 'sdl2_mixer' 'sdl2_net' 'sdl2_ttf')
 optdepends=('curl: download demo version files'
             'wget: download demo version files'
             'unzip: unpack demo version files')
-makedepends=('gettext' 'icoutils')
+makedepends=('gettext')
 conflicts=('fheroes2-git' 'fheroes2-svn')
 source=(
   $pkgname-$pkgver.tar.gz::https://github.com/ihhub/$pkgname/archive/$pkgver.tar.gz
-  fheroes2.desktop
 )
 md5sums=(
-  'c3cb8ab7e5c2e33fd7d1a5451ff00910'
-  '99e02779f24c11aa2f37837c14d7d4aa'
+  'a3764c652188b69dbbc1929954e94861'
 )
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver/src/resources"
-  icotool -x fheroes2.ico
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   export CFLAGS+=' -DCONFIGURE_FHEROES2_DATA=\"/usr/share/fheroes2\"'
@@ -34,19 +27,14 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -Dm644 "$srcdir/fheroes2.desktop" "$pkgdir/usr/share/applications/fheroes2.desktop"
 
   install -Dm755 "src/dist/fheroes2" "$pkgdir/usr/bin/fheroes2"
+  install -Dm644 "script/packaging/common/fheroes2.desktop" "$pkgdir/usr/share/applications/fheroes2.desktop"
   install -Dm755 "script/demo/demo_unix.sh" "$pkgdir/usr/share/fheroes2/demo_unix.sh"
   install -Dm644 "fheroes2.key" "$pkgdir/usr/share/fheroes2/fheroes2.key"
   install -dm755 "$pkgdir/usr/share/fheroes2/data"
   install -dm755 "$pkgdir/usr/share/fheroes2/maps"
-
-  # Install icons
-  for size in 16 32 48 256; do
-    install -Dm644 src/resources/fheroes2_*_${size}x${size}x32.png "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/fheroes2.png"
-  done
-  install -Dm644 "files/images/platform/psv/icon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/fheroes2.png"
+  install -Dm644 src/resources/fheroes2.png "$pkgdir/usr/share/pixmaps/fheroes2.png"
 }
 
 # vim:set ts=2 sw=2 et: