aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-01-23 13:30:40 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-01-23 13:30:40 -0600
commitae9923ee9132b676eafb0be46ed58fd721be86c7 (patch)
treef8f1b32a65be4516dea5c6eab64f9dff7d02c6e5
parent0160f71aade79304b99fc300a778534874cbf178 (diff)
downloadaports-ae9923ee9132b676eafb0be46ed58fd721be86c7.tar.bz2
aports-ae9923ee9132b676eafb0be46ed58fd721be86c7.tar.xz
testing/gnome-panel: actually update the scripts this time
-rw-r--r--testing/gnome-panel/APKBUILD2
-rw-r--r--testing/gnome-panel/gnome-panel.post-install6
-rw-r--r--testing/gnome-panel/gnome-panel.post-upgrade6
-rw-r--r--testing/gnome-panel/gnome-panel.pre-deinstall5
4 files changed, 16 insertions, 3 deletions
diff --git a/testing/gnome-panel/APKBUILD b/testing/gnome-panel/APKBUILD
index f1710f7664..43783044ff 100644
--- a/testing/gnome-panel/APKBUILD
+++ b/testing/gnome-panel/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=gnome-panel
pkgver=2.32.1
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME Panel"
url="http://projects.gnome.org/gnome-panel"
arch="all"
diff --git a/testing/gnome-panel/gnome-panel.post-install b/testing/gnome-panel/gnome-panel.post-install
index 692eb5b275..fcaa5925a1 100644
--- a/testing/gnome-panel/gnome-panel.post-install
+++ b/testing/gnome-panel/gnome-panel.post-install
@@ -4,7 +4,6 @@ for i in \
clock.schemas \
fish.schemas \
panel-compatibility.schemas \
- panel-default-setup.entries \
panel-general.schemas \
panel-global.schemas \
panel-object.schemas \
@@ -16,3 +15,8 @@ for i in \
GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
done
+
+echo "Installing GConf2 default entries."
+GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
+/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
+ /etc/gconf/schemas/panel-default-setup.entries >/dev/null
diff --git a/testing/gnome-panel/gnome-panel.post-upgrade b/testing/gnome-panel/gnome-panel.post-upgrade
index 692eb5b275..fcaa5925a1 100644
--- a/testing/gnome-panel/gnome-panel.post-upgrade
+++ b/testing/gnome-panel/gnome-panel.post-upgrade
@@ -4,7 +4,6 @@ for i in \
clock.schemas \
fish.schemas \
panel-compatibility.schemas \
- panel-default-setup.entries \
panel-general.schemas \
panel-global.schemas \
panel-object.schemas \
@@ -16,3 +15,8 @@ for i in \
GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
done
+
+echo "Installing GConf2 default entries."
+GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
+/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
+ /etc/gconf/schemas/panel-default-setup.entries >/dev/null
diff --git a/testing/gnome-panel/gnome-panel.pre-deinstall b/testing/gnome-panel/gnome-panel.pre-deinstall
index b6a62b43bf..60038cee32 100644
--- a/testing/gnome-panel/gnome-panel.pre-deinstall
+++ b/testing/gnome-panel/gnome-panel.pre-deinstall
@@ -16,3 +16,8 @@ for i in \
GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
done
+
+echo "Uninstalling GConf2 default entries."
+GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
+/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
+ /etc/gconf/schemas/panel-default-setup.entries >/dev/null