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

4 files changed, 47 insertions, 8 deletions

diff --git a/~drtan/parabola-artwork/PKGBUILD b/~drtan/parabola-artwork/PKGBUILD
index 2ba35ee1f..bbb6337aa 100644
--- a/~drtan/parabola-artwork/PKGBUILD
+++ b/~drtan/parabola-artwork/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=parabola-artwork
 pkgver=1.0
-pkgrel=1
-pkgdesc="Artwork for Parabola GNU/Linux-libre artwork"
+pkgrel=2
+pkgdesc="The artwork for Parabola GNU/Linux-libre."
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('CCPL:cc-by-sa-3.0')
 source=("http://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz")
-sha256sums=('e25dd78927bc56976820859f9054878221c2380435129dc7063d3636c077cdc8')
+sha256sums=('9a20cd3e725adc89dc9165452919316c69331d10e2f6a278a810075c9f006e31')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-${pkgrel}"
diff --git a/~drtan/parabola-gnome/PKGBUILD b/~drtan/parabola-gnome/PKGBUILD
index e3f3b62e1..c0f9d3e97 100644
--- a/~drtan/parabola-gnome/PKGBUILD
+++ b/~drtan/parabola-gnome/PKGBUILD
@@ -2,16 +2,18 @@
 
 pkgname=parabola-gnome
 pkgver=1.0
-pkgrel=2
-pkgdesc="A default GNOME configuration for Parabola GNU/Linux-libre"
+pkgrel=4
+pkgdesc="The GNOME configuration for Parabola GNU/Linux-libre"
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL3')
-depends=('parabola-artwork>=1.0')
+install=$pkgname.install
+depends=('dbus-glib' 'parabola-artwork>=1.0-2')
 source=('parabola.xml')
-sha256sums=('60365e38f0aa39c63e885c7e7fbc0e0e0f78eff93aecee9977ec832eb2447950')
+sha256sums=('7d9e3d67663f5b8f1ce9edf47bd74e3ea70d3a33c37318d08f5939a75b9efb23')
 
 package() {
   install -d "${pkgdir}/usr/share/gnome-background-properties"
   install -m644 parabola.xml "${pkgdir}/usr/share/gnome-background-properties/"
 }
+
diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/~drtan/parabola-gnome/parabola-gnome.install
new file mode 100644
index 000000000..8d87c609a
--- /dev/null
+++ b/~drtan/parabola-gnome/parabola-gnome.install
@@ -0,0 +1,29 @@
+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
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+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
+}
diff --git a/~drtan/parabola-gnome/parabola.xml b/~drtan/parabola-gnome/parabola.xml
index cb0229d5c..ca0b5f9ff 100644
--- a/~drtan/parabola-gnome/parabola.xml
+++ b/~drtan/parabola-gnome/parabola.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
 <wallpapers>
-  <wallpaper>
+  <wallpaper deleted="false">
     <name>Stripes</name>
     <filename>/usr/share/parabola/wallpapers/stripes.png</filename>
     <options>zoom</options>
@@ -9,4 +9,12 @@
     <scolor>#ffffff</scolor>
     <shade_type>solid</shade_type>
   </wallpaper>
+  <wallpaper deleted="false">
+    <name>Stripes Desaturated</name>
+    <filename>/usr/share/parabola/wallpapers/stripes-desaturated.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#ffffff</scolor>
+    <shade_type>solid</shade_type>
+  </wallpaper>
 </wallpapers>