Rename package to simulationcraft

5 files changed, 46 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37db6b5a8d09..61446fa44a1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,37 @@
-pkgbase = simcraft
-	pkgdesc = SimulationCraft is a tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm)
+pkgbase = simulationcraft
+	pkgdesc = A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.
 	pkgver = 620_02
 	pkgrel = 1
 	url = http://code.google.com/p/simulationcraft
-	install = simcraft.install
+	install = simulationcraft.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = qt5-base
 	makedepends = qt5-webkit
+	conflicts = simcraft
+	conflicts = simcraft-data
+	conflicts = simcraft-gui
+	conflicts = simulationcraft-git
+	conflicts = simulationcraft-data-git
+	conflicts = simulationcraft-gui-git
+	replaces = simcraft
+	replaces = simcraft-data
+	replaces = simcraft-gui
 	source = http://downloads.simulationcraft.org/simc-620-02-source.zip
 	source = SimulationCraft.desktop
 	md5sums = d1155ac12510ae0344d742ee86d8ba6d
-	md5sums = 527f78bab42ec0a524388da12e3ce9e0
+	md5sums = 59f2d428f6c7ad8a3eee1ca615a5982a
 
-pkgname = simcraft
+pkgname = simulationcraft
 	depends = openssl
-	depends = simcraft-data=620_02
+	depends = simulationcraft-data=620_02
 
-pkgname = simcraft-gui
-	pkgdesc = SimulationCraft is a tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm)gui
+pkgname = simulationcraft-gui
+	pkgdesc = A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.gui
 	depends = qt5-base
 	depends = qt5-webkit
-	depends = simcraft=620_02
+	depends = simulationcraft=620_02
 
-pkgname = simcraft-data
+pkgname = simulationcraft-data
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..22e07e90a60b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.zip
+*.tar.xz
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 1863f661ce6b..a38f150b1154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,26 @@
 # Original maintainer: Martin Weinelt <mweinelt@gmail.com>
 # Contributor: Bjoern Bidar <theodorstormgrade@gmail.com>
 _gui=true
-pkgbase=simcraft
-pkgname=simcraft
+pkgbase=simulationcraft
+pkgname=simulationcraft
 _pkgname=simc
 _simver=620
 _simrel=02
 pkgver=${_simver}_${_simrel}
 pkgrel=1
-pkgdesc="SimulationCraft is a tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm)"
+pkgdesc="A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage."
 url="http://code.google.com/p/simulationcraft"
 arch=('i686' 'x86_64')
 license=('GPL3')
+replaces=('simcraft' 'simcraft-data' 'simcraft-gui')
+conflicts=('simcraft' 'simcraft-data' 'simcraft-gui' 'simulationcraft-git' 'simulationcraft-data-git' 'simulationcraft-gui-git')
 
 install=$pkgname.install
 source=("http://downloads.simulationcraft.org/$_pkgname-${_simver}-${_simrel}-source.zip"
         'SimulationCraft.desktop'
 )
 md5sums=('d1155ac12510ae0344d742ee86d8ba6d'
-         '527f78bab42ec0a524388da12e3ce9e0')
+         '59f2d428f6c7ad8a3eee1ca615a5982a')
 
 prepare()
 {
@@ -29,8 +31,8 @@ prepare()
   if [ $_gui = true ] ; then
     #cd ${_pkgname}-${_simver}-${_simrel}-source
     sed -e 's|SOURCES|OBJECTS|' -e 's|\.cpp|\.o|' -i source_files/QT_engine{,_main}.pri
-    qmake  INSTALLPATH=/usr/share/simcraft \
-      SHAREDIR=/usr/share/simcraft \
+    qmake  INSTALLPATH=/usr/share/simulationcraft \
+      SHAREDIR=/usr/share/simulationcraft \
       PREFIX=/usr \
       CONFIG+='to_install' \
       simcqt.pro -o Makefile
@@ -48,50 +50,50 @@ build()
   fi
 }
 
-package_simcraft-data()
+package_simulationcraft-data()
 {
   pkdesc+="data"
   arch="any"
   cd $srcdir/$_pkgname-${_simver}-${_simrel}-source
   for profile in $( find profiles -type f); do
-    install -Dm644 $profile   "$pkgdir/usr/share/simcraft/$profile"
+    install -Dm644 $profile   "$pkgdir/usr/share/simulationcraft/$profile"
   done
 
   for doc in Welcome.html Welcome.png readme.txt; do
-    install -Dm644 $doc $pkgdir/usr/share/doc/simcraft/$doc
+    install -Dm644 $doc $pkgdir/usr/share/doc/simulationcraft/$doc
   done
 
 }
 
-package_simcraft()
+package_simulationcraft()
 {
-  depends=( 'openssl' "simcraft-data=$pkgver" )
+  depends=( 'openssl' "simulationcraft-data=$pkgver" )
   cd $srcdir/$_pkgname-${_simver}-${_simrel}-source
   install -Dm755 engine/simc     "$pkgdir/usr/bin/simc"
 }
 
 if [ $_gui = true ] ; then
-package_simcraft-gui()
+package_simulationcraft-gui()
 {
   pkgdesc+="gui"
-  depends=( 'qt5-base' 'qt5-webkit' "simcraft=$pkgver")
+  depends=( 'qt5-base' 'qt5-webkit' "simulationcraft=$pkgver")
   cd $srcdir/$_pkgname-${_simver}-${_simrel}-source
 
     install -Dm644 qt/icon/SimulationCraft.xpm "$pkgdir/usr/share/pixmaps/SimulationCraft.xpm"
     install -Dm644 "$srcdir/SimulationCraft.desktop" "$pkgdir/usr/share/applications/SimulationCraft.desktop"
     for _locale in locale/* ; do
-      install -Dm644 $_locale  $pkgdir/usr/share/simcraft/$_locale
+      install -Dm644 $_locale  $pkgdir/usr/share/simulationcraft/$_locale
     done
-    install -Dm755 SimulationCraft $pkgdir/usr/bin/simcraft
+    install -Dm755 SimulationCraft $pkgdir/usr/bin/simulationcraft
     make install INSTALL_ROOT=$pkgdir
-    rm -rf $pkgdir/usr/share/simcraft
+    rm -rf $pkgdir/usr/share/simulationcraft
 
 }
 fi
 
 if [ $_gui = true ] ; then
   makedepends+=( 'qt5-base' 'qt5-webkit')
-  true && pkgname=( simcraft simcraft-gui simcraft-data )
+  true && pkgname=( simulationcraft simulationcraft-gui simulationcraft-data )
 else
-  true && pkgname=( simcraft  simcraft-data )
+  true && pkgname=( simulationcraft  simulationcraft-data )
 fi
diff --git a/SimulationCraft.desktop b/SimulationCraft.desktop
index 0d898b5f7ab4..2e642ebd0ab2 100644
--- a/SimulationCraft.desktop
+++ b/SimulationCraft.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 Name=SimulationCraft
-Exec=/usr/bin/simcraft
+Comment=A tool to explore combat mechanics in the popular MMO RPG World of Warcraft (tm). Multi-player event-driven simulator written in C++ that models raid damage.
+Exec=simulationcraft
 Icon=SimulationCraft.xpm
 Path=
 Terminal=false
 Type=Application
-StartupNotify=true
\ No newline at end of file
+StartupNotify=true
diff --git a/simcraft.install b/simulationcraft.install
index d3289ab64233..d3289ab64233 100644
--- a/simcraft.install
+++ b/simulationcraft.install