Bump to v2.0.0-1

5 files changed, 53 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d368087a52ef..8b4932aa561b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = gitahead
 	pkgdesc = THE MOST POWERFUL GIT GUI
-	pkgver = 1.4.12
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = http://gitahead.scitools.com/
 	arch = x86_64
 	license = custom
-	depends = qt5-base
 	provides = gitahead
 	conflicts = gitahead
-	source = gitahead-1.4.12.bin::https://gitahead.com/downloads/v1.4.12/GitAhead-1.4.12.sh
+	source = gitahead-2.0.0.bin::https://gitahead.com/downloads/v2.0.0/GitAhead-2.0.0.sh
 	source = gitahead-license
 	source = gitahead.desktop
 	source = gitahead.png
 	source = gitahead.sh
-	sha256sums = 875b13203a990105219dcba72c8f93872f0c0f5d0f495f59c67f65608b26a3e7
+	sha256sums = dedc8b66cdb160009c6bda86f7ca7c4e7ebe321cedffc0a2017a2f363c957e94
 	sha256sums = d71bfb48c954d213986816fc29478c7f80c8bd2dd10d2889bf51897d649eedd6
 	sha256sums = 6070ebf6752f55f8b7d8a79107ce491c3acf04310eeb9a8242b83cfb4df055f2
 	sha256sums = 66cb53fc57eb2ce2e6cd02ff392476fdfb91b723b76ef5da1856e9b5dc1b5c75
-	sha256sums = eb9f2de75d533bb1b20affe439e4bd4013511ce32829ca41e37064ef9051dd61
+	sha256sums = ba4e21c675ce7f49e6df27df1f29d1bb99c47679c4981657a2a4cf5d59930b4a
 
 pkgname = gitahead
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79c93bdbf3a7..1cdd8de2d472 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+# [v2.0.0 - 2017-12-14](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.14)
+
+## GitAhead 2.0 requires a new license!
+
+- All current commercial users can upgrade their license at no cost. Check your email for details.
+- Non-commercial users can sign up for a free non-commercial account through a link in the app.
+- The two week evaluation period will reset for all users, so a new license isn't required immediately.
+- If you have any questions please contact us at support@gitahead.com.
+
+## Added
+
+- Added support for custom themes.
+
+## Fixed
+
+- Fixed failure to cleanup after conflict resolution in some cases.
+
+# [v1.4.14 - 2017-12-11](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.13)
+
+## Fixed
+
+- Fixed regression in selecting the status (uncommitted changes) row after the working directory changes.
+- Fixed failure to persist conflict resolution selections after refresh.
+
+# [v1.4.13 - 2017-12-06](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.12)
+
+## Fixed
+
+- Fixed possible crash on newly initialized repos.
+- Fixed crash on submodule update after fetch when new submodules are added.
+
+## Changed
+
+- Disallow automatic update to new major versions.
+
 # [v1.4.12 - 2017-11-30](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.11)
 
 ## Added
diff --git a/PKGBUILD b/PKGBUILD
index 63e1c8b07e62..1b5bea3a2084 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: KillWolfVlad <github.com/KillWolfVlad>
+# Contributor: WaveHack <email@wavehack.net>
 
 pkgname=('gitahead')
 pkgrel=1
-pkgver=1.4.12
+pkgver=2.0.0
 pkgdesc='THE MOST POWERFUL GIT GUI'
 url='http://gitahead.scitools.com/'
 provides=('gitahead')
 conflicts=('gitahead')
 arch=('x86_64')
 license=('custom')
-depends=('qt5-base')
+depends=('')
 source=(
   "gitahead-${pkgver}.bin::https://gitahead.com/downloads/v${pkgver}/GitAhead-${pkgver}.sh"
   "gitahead-license"
@@ -17,11 +18,11 @@ source=(
   "gitahead.png"
   "gitahead.sh"
 )
-sha256sums=('875b13203a990105219dcba72c8f93872f0c0f5d0f495f59c67f65608b26a3e7'
+sha256sums=('dedc8b66cdb160009c6bda86f7ca7c4e7ebe321cedffc0a2017a2f363c957e94'
             'd71bfb48c954d213986816fc29478c7f80c8bd2dd10d2889bf51897d649eedd6'
             '6070ebf6752f55f8b7d8a79107ce491c3acf04310eeb9a8242b83cfb4df055f2'
             '66cb53fc57eb2ce2e6cd02ff392476fdfb91b723b76ef5da1856e9b5dc1b5c75'
-            'eb9f2de75d533bb1b20affe439e4bd4013511ce32829ca41e37064ef9051dd61')
+            'ba4e21c675ce7f49e6df27df1f29d1bb99c47679c4981657a2a4cf5d59930b4a')
 
 prepare() {
   tail -n +224 gitahead-${pkgver}.bin > gitahead-${pkgver}.tar.gz
@@ -30,13 +31,13 @@ prepare() {
 }
 
 package() {
-  install -d "${pkgdir}/opt/gitahead"
-  cp -R "${srcdir}/gitahead-${pkgver}/Resources" "${pkgdir}/opt/gitahead"
-  find "${pkgdir}/opt/gitahead/" -type f -exec chmod 644 {} \;
+  install -d "${pkgdir}/opt"
+  cp -R "${srcdir}/gitahead-${pkgver}" "${pkgdir}/opt/gitahead"
 
-  install -D -m755 "${srcdir}/gitahead-${pkgver}/GitAhead" "${pkgdir}/opt/gitahead/GitAhead"
-  install -D -m755 "${srcdir}/gitahead-${pkgver}/indexer" "${pkgdir}/opt/gitahead/indexer"
-  install -D -m755 "${srcdir}/gitahead-${pkgver}/relauncher" "${pkgdir}/opt/gitahead/relauncher"
+  find "${pkgdir}/opt/gitahead/" -type f -exec chmod 644 {} \;
+  chmod 755 "${pkgdir}/opt/gitahead/GitAhead"
+  chmod 755 "${pkgdir}/opt/gitahead/indexer"
+  chmod 755 "${pkgdir}/opt/gitahead/relauncher"
 
   install -D -m644 "${srcdir}/gitahead-license" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -D -m755 "${srcdir}/gitahead.sh" "${pkgdir}/usr/bin/gitahead"
diff --git a/README.md b/README.md
index 7f3dd7a18556..dff3608d381e 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,10 @@
 # [![logo](logo.png)](http://gitahead.scitools.com) for [AUR](https://aur.archlinux.org/packages/gitahead)
 
-# Installation on Arch Linux (and other Arch-Based distributions)
+## Installation on Arch Linux (and other Arch-Based distributions)
 
 - `makepkg -is`
 
-# Activation
-
-You can use this credentials to activate `GitAhead` or use [infinity](https://github.com/KillWolfVlad/GitAhead-AUR/tree/infinity) branch.
-
-```
-KillWolfVlad@users.noreply.github.com
-A1C86FEB98348C13FE8EC3BC8D05E3B67E85BF61
-```
-
-# Need help or you want help?
+## Need help or you want help?
 
 1. Open issue
 2. Send PR
diff --git a/gitahead.sh b/gitahead.sh
index 7edfd9f4ed44..cc8ba904a9db 100644
--- a/gitahead.sh
+++ b/gitahead.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-exec /opt/gitahead/GitAhead
+exec /opt/gitahead/GitAhead "$@"