merging freedoom1-git and freedoom2-git into freedoom-git

2 files changed, 7 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25bde763cc69..60df7ff1ef7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freedoom-git
 	pkgdesc = Free game data files for Doom gaming engines
-	pkgver = 0.12.0.r2.ga9afb194
+	pkgver = 0.12.0.r14.g3ba7c8c3
 	pkgrel = 1
 	epoch = 1
 	url = http://freedoom.github.io/
@@ -17,11 +17,8 @@ pkgname = freedm-git
 	provides = freedoom
 	provides = freedm
 
-pkgname = freedoom1-git
+pkgname = freedoom-git
 	provides = freedoom
 	provides = freedoom1
-
-pkgname = freedoom2-git
-	provides = freedoom
 	provides = freedoom2
 
diff --git a/PKGBUILD b/PKGBUILD
index e0d93f28ac93..0866c17ccd3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 # Contributor: Christoph Zeiler <rabyte*gmail>
 # Contributor: felix <at yandex.com, m.p.isaev>
 
-pkgname=({freedm,freedoom1,freedoom2}-git)
+pkgname=({freedm,freedoom}-git)
 pkgbase=freedoom-git
 pkgdesc="Free game data files for Doom gaming engines"
-pkgver=0.12.0.r2.ga9afb194
+pkgver=0.12.0.r14.g3ba7c8c3
 pkgrel=1
 epoch=1
 arch=('any')
@@ -33,16 +33,10 @@ package_freedm-git() {
   make prefix=/usr DESTDIR="$pkgdir" install-freedm
 }
 
-package_freedoom1-git() {
-  provides=('freedoom' 'freedoom1')
+package_freedoom-git() {
+  provides=('freedoom' 'freedoom1' 'freedoom2')
 
   cd "$srcdir/freedoom"
-  make prefix=/usr DESTDIR="$pkgdir" install-freedoom1
+  make prefix=/usr DESTDIR="$pkgdir" install-freedoom
 }
 
-package_freedoom2-git() {
-  provides=('freedoom' 'freedoom2')
-
-  cd "$srcdir/freedoom"
-  make prefix=/usr DESTDIR="$pkgdir" install-freedoom2
-}