Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 28 insertions, 27 deletions

diff --git a/~drtan/parabola-artwork/PKGBUILD b/libre/parabola-artwork/PKGBUILD
index 6645b7c74..4833ef726 100644
--- a/~drtan/parabola-artwork/PKGBUILD
+++ b/libre/parabola-artwork/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
 
 pkgname=parabola-artwork
-pkgver=1.0
-pkgrel=5
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="The Parabola artwork"
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('CCPL:cc-by-sa-3.0')
 source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz")
-sha256sums=('4bc7134b7ea4719677963717a6bde295c29fc0369cdd3c1dee1de884cf49f0af ')
+sha256sums=('f8a0d0dde510f76125dbe9106dcb3e2d9af595ad5cfa1028acf10011f8fbb7af ')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-${pkgrel}"
diff --git a/libre/parabola-gnome/PKGBUILD b/libre/parabola-gnome/PKGBUILD
new file mode 100644
index 000000000..6a1984114
--- /dev/null
+++ b/libre/parabola-gnome/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
+
+pkgname=parabola-gnome
+pkgver=1.0.1
+pkgrel=1
+pkgdesc="The Parabola defaults for GNOME"
+arch=('any')
+url="https://parabolagnulinux.org"
+license=('GPL3')
+options=('!emptydirs')
+install=$pkgname.install
+depends=('dbus-glib' 'parabola-artwork>=1.0' 'parabola-artwork<1.1')
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz")
+sha256sums=('9d78c93ea39da8561ff7c7eb822e8ea530609cc4991becae2d0741d2543f69d1')
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
+  install -d ${pkgdir}/usr/share/gnome-background-properties/
+  install -Dm644 gnome-background-properties/parabola.xml "${pkgdir}/usr/share/gnome-background-properties/"
+  install -Dm644 dconf/db/gdm.d/parabola "${pkgdir}/etc/dconf/db/gdm.d/$(date +%Y%m%d%H%M%S%N)"
+  install -Dm644 dconf/db/local.d/parabola "${pkgdir}/etc/dconf/db/local.d/$(date +%Y%m%d%H%M%S%N)"
+  install -d ${pkgdir}/etc/dconf/profile/
+  install -m644 dconf/profile/* "${pkgdir}/etc/dconf/profile/"
+}
+
diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/libre/parabola-gnome/parabola-gnome.install
index 8fce17b2e..8fce17b2e 100644
--- a/~drtan/parabola-gnome/parabola-gnome.install
+++ b/libre/parabola-gnome/parabola-gnome.install
diff --git a/~drtan/parabola-gnome/PKGBUILD b/~drtan/parabola-gnome/PKGBUILD
deleted file mode 100644
index c179800cc..000000000
--- a/~drtan/parabola-gnome/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
-
-pkgname=parabola-gnome
-pkgver=1.0
-pkgrel=6
-pkgdesc="The GNOME configuration for Parabola GNU/Linux-libre"
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL3')
-install=$pkgname.install
-depends=('dbus-glib' 'parabola-artwork>=1.0-4')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz")
-sha256sums=('979ab611fdf9a9cddf97c7f6c646bf39df8765787b077ac0b836e75a67897a08')
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}
-  install -d "${pkgdir}/usr/share/gnome-background-properties"
-  install -m644 gnome-background-properties/01-parabola.xml "${pkgdir}/usr/share/gnome-background-properties/"
-  install -d "${pkgdir}/etc/dconf/db/local.d"
-  install -m644 dconf/db/local.d/* "${pkgdir}/etc/dconf/db/local.d/"
-  install -d "${pkgdir}/etc/dconf/profile"
-  install -m644 dconf/profile/* "${pkgdir}/etc/dconf/profile/"
-}
-