Update License to GPL3, upgrade to latest, require stricter lightdm-webkit

dependency.

4 files changed, 24 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28344859d62d..b165ea9a02b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = lightdm-webkit-theme-aether
 	pkgdesc = A sleek, straightforward Archlinux theme for lightdm.
-	pkgver = 1.2.1
-	pkgrel = 2
+	pkgver = 1.3.0
+	pkgrel = 1
 	url = https://github.com/NoiSek/Aether
 	install = lightdm-webkit-theme-aether.install
 	changelog = changelog.txt
 	arch = any
-	license = GPLv2
+	license = GPL3
 	depends = lightdm
-	depends = lightdm-webkit2-greeter
-	source = https://github.com/NoiSek/Aether/archive/v1.2.1.tar.gz
-        md5sums = 0c5771274264d3c377a565573f8e073f
-
+	depends = lightdm-webkit2-greeter>=2.2.3
+	depends = ttf-opensans
+	source = https://github.com/NoiSek/Aether/archive/v1.3.0.tar.gz
+	md5sums = b9388bf02055b4d4dd47f3ab4e30869f
 
 pkgname = lightdm-webkit-theme-aether
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c8593c8788f..8ba01c883a42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Noi Sek <noi.t.sek | gmail>
 
 pkgname=lightdm-webkit-theme-aether
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="A sleek, straightforward Archlinux theme for lightdm."
 arch=('any')
 url="https://github.com/NoiSek/Aether"
-license=('GPLv2')
-depends=('lightdm' 'lightdm-webkit2-greeter')
+license=('GPL3')
+depends=('lightdm' 'lightdm-webkit2-greeter>=2.2.3' 'ttf-opensans')
 install='lightdm-webkit-theme-aether.install'
 changelog='changelog.txt'
 source=("https://github.com/NoiSek/Aether/archive/v$pkgver.tar.gz")
-md5sums=('0c5771274264d3c377a565573f8e073f')
+md5sums=('b9388bf02055b4d4dd47f3ab4e30869f')
 
 package() {
   cd "$pkgdir"
diff --git a/changelog.txt b/changelog.txt
index fb46a221ae23..76fa87dc449c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,13 @@
+v1.3.0 -- Fri, 17 Mar 2017 06:33:46 GMT
+Adds customization dialogue, distro logos, allows custom Date & Time formatting.
+
+Fixes login issues when used as a lockscreen, properly respects wallpaper
+directory setting.
+
 v1.2.1 -- Thu, 22 Sep 2016 09:44:53 GMT
 
 Fixes date formatting issues, adds wallpaper customization.
-Aether now respects 'background_images' setting in addition 
+Aether now respects 'background_images' setting in addition
 to allowing non-hardcoded wallpapers.
 
 See: https://github.com/NoiSek/Aether#using-your-own-wallpapers
@@ -10,4 +16,4 @@ See: https://github.com/NoiSek/Aether#using-your-own-wallpapers
 
 v1.0 -- Thu, 14 Jul 2016 10:40:24 GMT
 
-Initial release. Feature complete.
\ No newline at end of file
+Initial release. Feature complete.
diff --git a/lightdm-webkit-theme-aether.install b/lightdm-webkit-theme-aether.install
index 7064bc94ae81..634beb9cbdb0 100644
--- a/lightdm-webkit-theme-aether.install
+++ b/lightdm-webkit-theme-aether.install
@@ -1,20 +1,13 @@
 post_install() {
   echo "Setting Aether as your default login theme."
 
-  # These do not work, as values after the comment symbol are still parsed by both of these.
-  #sed -i 's/^webkit-theme\s*=\s*\(.*\)/webkit-theme = lightdm-webkit-theme-aether #\1/g' etc/lightdm/lightdm-webkit2-greeter.conf
-  #sed -i 's/^\(#\?greeter\)-session\s*=\s*\(.*\)/greeter-session = lightdm-webkit2-greeter #\1 #\2/g' etc/lightdm/lightdm.conf
-
-  sed -i 's/^webkit-theme.*/webkit-theme = lightdm-webkit-theme-aether/g' etc/lightdm/lightdm-webkit2-greeter.conf
-  sed -i 's/^#\?greeter-session.*/greeter-session = lightdm-webkit2-greeter/g' etc/lightdm/lightdm.conf
+  sed -i 's/^webkit-theme\s*=\s*\(.*\)/webkit-theme = lightdm-webkit-theme-aether #\1/g' /etc/lightdm/lightdm-webkit2-greeter.conf
+  sed -i 's/^\(#\?greeter\)-session\s*=\s*\(.*\)/greeter-session = lightdm-webkit2-greeter #\1 #\2/g' /etc/lightdm/lightdm.conf
 }
 
 post_remove() {
   echo "Resetting default login theme."
 
-  # These do not work, as values after the comment symbol are still parsed by both of these.
-  #sed -i 's/^webkit-theme.\+#\(.\+\)/webkit-theme = \1/g' etc/lightdm/lightdm-webkit2-greeter.conf
-  #sed -i 's/^greeter-session\+*#\(\+*\)\s#\(\+*\)\s/\1-session = \2/g' etc/lightdm/lightdm.conf
-
-  sed -i 's/^webkit-theme.*/webkit-theme = antergos/g' etc/lightdm/lightdm-webkit2-greeter.conf
+  sed -i 's/^webkit-theme.\+#\(.\+\)/webkit-theme = \1/g' /etc/lightdm/lightdm-webkit2-greeter.conf
+  sed -i 's/^greeter-session\+*#\(\+*\)\s#\(\+*\)\s/\1-session = \2/g' /etc/lightdm/lightdm.conf
 }