better post-install message; set AQUARIA_EXTRA_DATA_DIR

Users can now provide the data files in a custom location by setting
AQUARIA_DATA_PATH.

5 files changed, 28 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 361863ffbaad..c9538ad40533 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 10:47:46 UTC 2016
+# Mon Feb 15 17:16:15 UTC 2016
 pkgbase = aquaria-ose-git
 	pkgdesc = A 2D fantasy underwater action-adventure game (Open Source Edition of the engine = original v1.1.3 + many improvements)
-	pkgver = 1.1.3+o1.002+g609.d8da857
+	pkgver = 1.1.3+o1.002+g610.6971e78
 	pkgrel = 1
 	url = https://github.com/AquariaOSE/Aquaria
-	install = aquaria-ose-git.install
+	install = aquaria-ose.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -13,6 +13,7 @@ pkgbase = aquaria-ose-git
 	depends = sdl2
 	depends = openal
 	depends = gcc-libs
+	optdepends = aquaria-data-hib: Game data from the Humble Bundle release
 	conflicts = aquaria-hib-git
 	conflicts = aquaria-hib-hg
 	conflicts = aquaria
@@ -25,7 +26,7 @@ pkgbase = aquaria-ose-git
 	source = git://github.com/AquariaOSE/Aquaria.git
 	source = aquaria-ose.desktop
 	md5sums = SKIP
-	md5sums = 8677297d97cee364ca63652503ed6e62
+	md5sums = 0d1457aa0fae8ded40c011a7d766e46f
 
 pkgname = aquaria-ose-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 46c46bb78dfb..d0c548440d7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=aquaria-ose-git
 _installname=aquaria-ose
-pkgver=1.1.3+o1.002+g609.d8da857
+pkgver=1.1.3+o1.002+g610.6971e78
 _osever=1.002
 _basever=1.1.3+o$_osever
 pkgrel=1
@@ -14,10 +14,11 @@ depends=('sdl2' 'openal' 'gcc-libs')
 makedepends=('cmake')
 conflicts=('aquaria-hib-git' 'aquaria-hib-hg' 'aquaria' 'aquaria-hib' 'aquaria-git' 'aquaria-ose')
 replaces=('aquaria-git' 'aquaria-hib-git' 'aquaria-hib-hg')
-install="$pkgname.install"
+optdepends=('aquaria-data-hib: Game data from the Humble Bundle release')
+install="$_installname.install"
 
 source=('git://github.com/AquariaOSE/Aquaria.git' "aquaria-ose.desktop")
-md5sums=('SKIP' '8677297d97cee364ca63652503ed6e62')
+md5sums=('SKIP' '0d1457aa0fae8ded40c011a7d766e46f')
 
 _gitname=Aquaria
 
@@ -31,6 +32,7 @@ build() {
   cd $_gitname
   _ver="$_osever revision $(git rev-parse --short HEAD)"
   cmake -DAQUARIA_DEFAULT_DATA_DIR=/usr/share/aquaria \
+        -DAQUARIA_EXTRA_DATA_DIR=/usr/share/aquaria/override \
         -DAQUARIA_OVERRIDE_VERSION_STRING="Aquaria OSE $_ver (based on Aquaria v1.1.3)" \
         -DAQUARIA_USE_SDL2=1
   make
diff --git a/aquaria-ose-git.install b/aquaria-ose-git.install
deleted file mode 100644
index 9f6ca17476b0..000000000000
--- a/aquaria-ose-git.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-post_install() {
-  if (! pacman -Qqs '^aquaria-data' >/dev/null); then
-    echo "Note:"
-    echo " | This package only provides the game engine. You will also need to"
-    echo " | install the proprietary game data, using one of these packages:"
-    echo " |   aquaria-data-hib  .. if you own the Humble Bundle version"
-  fi
-}
-
-post_upgrade() {
-  post_install "$@"
-}
diff --git a/aquaria-ose.desktop b/aquaria-ose.desktop
index bb38c0ab69cf..e1456f4f8a4d 100644
--- a/aquaria-ose.desktop
+++ b/aquaria-ose.desktop
@@ -2,8 +2,8 @@
 Version=1.0
 Type=Application
 Categories=Game;
-Name=Aquaria
-Comment=Bit Blot
+Name=Aquaria OSE
+Comment=Bit Blot + community
 GenericName=2D Fantasy Action-Adventure
 Icon=aquaria
 Exec=/usr/bin/aquaria
diff --git a/aquaria-ose.install b/aquaria-ose.install
new file mode 100644
index 000000000000..ac7c7d853848
--- /dev/null
+++ b/aquaria-ose.install
@@ -0,0 +1,16 @@
+
+post_install() {
+    cat <<END
+.--------------------------------------------------------------------.
+| This package only provides the (improved) game engine.             |
+| To play it you also need to buy the original game data, e.g. from: |
+|   - Humble Bundle  <http://www.bit-blot.com/aquaria/buy.html>      |
+|   - GOG.com        <http://www.gog.com/game/aquaria>               |
+|   - Steam          <http://store.steampowered.com/app/24420>       |
+| And then either:                                                   |
+|   - Install the corresponding "aquaria-data-*" AUR package, or     |
+|   - Extract the game data to a custom directory and set the        |
+|     AQUARIA_DATA_PATH environment variable to it.                  |
+'--------------------------------------------------------------------'
+END
+}