diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-01-23 15:33:23 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-01-23 15:33:23 -0600 |
| commit | 64a73e2b0615f9d271cb9f47f2c6216dc1cc348a (patch) | |
| tree | 8de579a266f1f96dc5435f12584286372ab88c96 /testing/gnome-panel | |
| parent | ae9923ee9132b676eafb0be46ed58fd721be86c7 (diff) | |
| download | aports-64a73e2b0615f9d271cb9f47f2c6216dc1cc348a.tar.bz2 aports-64a73e2b0615f9d271cb9f47f2c6216dc1cc348a.tar.xz | |
testing/gnome-panel: really fix up defaults installation this time
Diffstat (limited to 'testing/gnome-panel')
| -rw-r--r-- | testing/gnome-panel/APKBUILD | 2 | ||||
| -rw-r--r-- | testing/gnome-panel/gnome-panel.post-install | 7 | ||||
| -rw-r--r-- | testing/gnome-panel/gnome-panel.post-upgrade | 7 | ||||
| -rw-r--r-- | testing/gnome-panel/gnome-panel.pre-deinstall | 8 |
4 files changed, 10 insertions, 14 deletions
diff --git a/testing/gnome-panel/APKBUILD b/testing/gnome-panel/APKBUILD index 43783044ff..ff94352f37 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=3 +pkgrel=5 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 fcaa5925a1..06060f9059 100644 --- a/testing/gnome-panel/gnome-panel.post-install +++ b/testing/gnome-panel/gnome-panel.post-install @@ -16,7 +16,6 @@ for i in \ /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 +GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` +echo "Installing GConf2 default entries to ${GCONF_CONFIG_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 fcaa5925a1..06060f9059 100644 --- a/testing/gnome-panel/gnome-panel.post-upgrade +++ b/testing/gnome-panel/gnome-panel.post-upgrade @@ -16,7 +16,6 @@ for i in \ /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 +GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` +echo "Installing GConf2 default entries to ${GCONF_CONFIG_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 60038cee32..96aa7274d4 100644 --- a/testing/gnome-panel/gnome-panel.pre-deinstall +++ b/testing/gnome-panel/gnome-panel.pre-deinstall @@ -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 \ @@ -17,7 +16,6 @@ for i in \ /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 +GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` +echo "Uninstalling GConf2 default entries from ${GCONF_CONFIG_SOURCE}" +/usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload /etc/gconf/schemas/panel-default-setup.entries >/dev/null |