Update version.

4 files changed, 39 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e45e2ddf1821..6a164c845e9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = opentyrian
 	pkgdesc = Open Source port of the classic DOS shoot-em-up Tyrian
-	pkgver = 2.1.20130907
+	pkgver = 2.1.20130907.r119.g650e1f7
 	pkgrel = 1
-	url = https://bitbucket.org/opentyrian/opentyrian
-	install = opentyrian.install
+	url = https://github.com/opentyrian/opentyrian
 	arch = i686
 	arch = x86_64
-	license = GPL
-	depends = sdl_net
+	license = GPL2
+	depends = sdl2
+	depends = sdl2_net
 	optdepends = hicolor-icon-theme: .desktop file icons
-	provides = tyrian
-	source = http://camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.tar.gz
+	source = git+https://github.com/opentyrian/opentyrian#commit=650e1f72fd18d2242d10d706afa7f77f80151aea
 	source = http://camanis.net/tyrian/tyrian21.zip
-	sha256sums = f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+	sha256sums = SKIP
 	sha256sums = 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277
 
 pkgname = opentyrian
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..72e8ffc0db8a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/PKGBUILD b/PKGBUILD
index 0cc54edb5c25..ad967e6ee987 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,48 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: carstene1ns <url/mail: arch carsten-teibes de>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=opentyrian
-pkgver=2.1.20130907
+pkgver=2.1.20130907.r119.g650e1f7
 pkgrel=1
 pkgdesc="Open Source port of the classic DOS shoot-em-up Tyrian"
-url="https://bitbucket.org/opentyrian/opentyrian"
+url="https://github.com/opentyrian/opentyrian"
 arch=('i686' 'x86_64')
-license=('GPL')
-install=$pkgname.install
-provides=('tyrian')
-depends=('sdl_net')
+license=('GPL2')
+depends=('sdl2' 'sdl2_net')
 optdepends=('hicolor-icon-theme: .desktop file icons')
-source=("http://camanis.net/$pkgname/releases/$pkgname-$pkgver-src.tar.gz"
+source=("git+https://github.com/opentyrian/opentyrian#commit=650e1f72fd18d2242d10d706afa7f77f80151aea"
         "http://camanis.net/tyrian/tyrian21.zip")
-sha256sums=('f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f'
+sha256sums=('SKIP'
             '7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277')
 
+pkgver() {
+	cd opentyrian
+	git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
-  make release -C $pkgname-$pkgver
+	make prefix=/usr all -C $pkgname
 }
 
 package() {
-  cd $pkgname-$pkgver
+	cd $pkgname
 
-  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-  install -Dm644 linux/man/$pkgname.6 "$pkgdir"/usr/share/man/man6/$pkgname.6
-  install -Dm644 linux/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  install -Dm644 linux/icons/tyrian-48.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
-  install -d "$pkgdir"/usr/share/{opentyrian/data,doc/$pkgname}
-  install -m644 {README,CREDITS} "$pkgdir"/usr/share/doc/$pkgname
-  for _x in 22 24 32 48 128; do
-    install -Dm644 "linux/icons/tyrian-$_x.png" \
-      "$pkgdir"/usr/share/icons/hicolor/${_x}x${_x}/apps/$pkgname.png
-  done
+	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm644 linux/man/$pkgname.6 "$pkgdir"/usr/share/man/man6/$pkgname.6
+	install -Dm644 linux/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+	install -Dm644 linux/icons/tyrian-48.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
+	install -d "$pkgdir"/usr/share/{opentyrian/data,doc/$pkgname}
+	install -m644 {README,CREDITS} "$pkgdir"/usr/share/doc/$pkgname
+	install -Dm644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	for _x in 22 24 32 48 128; do
+		install -Dm644 "linux/icons/tyrian-$_x.png" \
+			"$pkgdir"/usr/share/icons/hicolor/${_x}x${_x}/apps/$pkgname.png
+	done
 
-  cd ../tyrian21
-  for _x in *.{dat,lvl,shp,snd,mus,anm} demo.* tyrian.{cdt,hdt,pic} tshp2.pcx;
-  do
-    install -m644 "$_x" "$pkgdir"/usr/share/opentyrian/data
-  done
+	cd ../tyrian21
+	for _x in *.{dat,lvl,shp,snd,mus,anm} demo.* tyrian.{cdt,hdt,pic} tshp2.pcx;
+	do
+		install -m644 "$_x" "$pkgdir"/usr/share/opentyrian/data
+	done
 }
diff --git a/opentyrian.install b/opentyrian.install
deleted file mode 100644
index b0d35d2f7f52..000000000000
--- a/opentyrian.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-post_install() {
-  # redirect output, because command might not be available
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}