Cosmetic changes

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c5574d489f3..2108f565eb9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,7 @@ pkgbase = dave_gnukem
 	depends = sdl_mixer
 	provides = dave_gnukem
 	conflicts = dave_gnukem
+	conflicts = dave_gnukem-git
 	source = https://github.com/davidjoffe/dave_gnukem/archive/1.0.1.tar.gz
 	source = 1.0.1-data.tar.gz::https://github.com/davidjoffe/gnukem_data/archive/1.0.1.tar.gz
 	source = dave_gnukem-wrapper.sh
diff --git a/PKGBUILD b/PKGBUILD
index 37edba1331aa..dc1ca8c55dee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0.1
 pkgrel=1
 pkgdesc="2D scrolling platform shooter inspired by Duke Nukem 1"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://github.com/davidjoffe/dave_gnukem"
+url="https://github.com/davidjoffe/${pkgname}"
 license=('GPL2' 'MIT')
 source=("https://github.com/davidjoffe/${pkgname}/archive/${pkgver}.tar.gz"
         "${pkgver}-data.tar.gz::https://github.com/davidjoffe/gnukem_data/archive/${pkgver}.tar.gz"
@@ -17,7 +17,7 @@ source=("https://github.com/davidjoffe/${pkgname}/archive/${pkgver}.tar.gz"
 depends=('sdl' 'sdl_mixer')
 makedepends=('gcc-libs')
 provides=("${pkgname}")
-conflicts=("${pkgname}")
+conflicts=("${pkgname}" "${pkgname}-git")
 sha256sums=('2f00a6c373e270578160a73a5484fb8ec92a9361c7960cb4670856bcdc7a8a14'
             '46c06c5fb7e1ca8d0848c1866d6e1df96e021ddf8cebc7e64d97cfee64232027'
             'c3d2e1f3ac0de09d47dda08b3bdd3c39feb10f15c3598109c0823016cff78ff5'
@@ -36,7 +36,7 @@ package() {
   install -Dm644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
   mkdir -p "${pkgdir}/usr/share/${pkgname}/data"
   mv "gnukem_data-${pkgver}"/* "${pkgdir}/usr/share/${pkgname}/data"
-  cd "dave_gnukem-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   install -Dm755 "davegnukem" "${pkgdir}/usr/lib/${pkgname}/${pkgname}"
   install -Dm644 "HISTORY.txt" "${pkgdir}/usr/share/doc/${pkgname}/HISTORY.txt"
   install -Dm644 "README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"