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

3 files changed, 12 insertions, 45 deletions

diff --git a/~drtan/parabola-gnome/PKGBUILD b/~drtan/parabola-gnome/PKGBUILD
index e0762987b..c179800cc 100644
--- a/~drtan/parabola-gnome/PKGBUILD
+++ b/~drtan/parabola-gnome/PKGBUILD
@@ -2,18 +2,23 @@
 
 pkgname=parabola-gnome
 pkgver=1.0
-pkgrel=5
+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-2')
-source=('parabola.xml')
-sha256sums=('27f1580c8751c272eb24bc1426cb3a9395c3fa072c89cbf28fd89061fe15a82f')
+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 parabola.xml "${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/"
 }
 
diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/~drtan/parabola-gnome/parabola-gnome.install
index 8d87c609a..8fce17b2e 100644
--- a/~drtan/parabola-gnome/parabola-gnome.install
+++ b/~drtan/parabola-gnome/parabola-gnome.install
@@ -1,11 +1,5 @@
 post_install() {
-  # Change default wallpaper
-  dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/parabola/artwork/stripes.png
-  dbus-launch gsettings set org.gnome.desktop.background picture-options zoom
-  
-  # Change default lock screen wallpaper.
-  dbus-launch gsettings set org.gnome.desktop.screensaver picture-uri file:///usr/share/parabola/artwork/stripes-desaturated.png
-  dbus-launch gsettings set org.gnome.desktop.screensaver picture-options zoom
+  dconf update
 }
 
 post_upgrade() {
@@ -13,17 +7,5 @@ post_upgrade() {
 }
 
 post_remove() {
-  # Reset default wallpaper to default for GNOME (if the user didn't choose some other).
-  if [ $(dbus-launch gsettings get org.gnome.desktop.background picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ]
-  then
-    dbus-launch gsettings reset org.gnome.desktop.background picture-uri
-    dbus-launch gsettings reset org.gnome.desktop.background picture-options
-  fi
-
-  # Reset default lock screen wallpaper to default for GNOME (if the user didn't choose some other).
-  if [ $(dbus-launch gsettings get org.gnome.desktop.screensaver picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ]
-  then
-    dbus-launch gsettings reset org.gnome.desktop.screensaver picture-uri
-    dbus-launch gsettings reset org.gnome.desktop.screensaver picture-options
-  fi
+  post_install $1
 }
diff --git a/~drtan/parabola-gnome/parabola.xml b/~drtan/parabola-gnome/parabola.xml
deleted file mode 100644
index 625bf241c..000000000
--- a/~drtan/parabola-gnome/parabola.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-  <wallpaper deleted="false">
-    <name>Stripes</name>
-    <filename>/usr/share/parabola/artwork/stripes.png</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#ffffff</scolor>
-    <shade_type>solid</shade_type>
-  </wallpaper>
-  <wallpaper deleted="false">
-    <name>Stripes Desaturated</name>
-    <filename>/usr/share/parabola/artwork/stripes-desaturated.png</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#ffffff</scolor>
-    <shade_type>solid</shade_type>
-  </wallpaper>
-</wallpapers>