summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gardiner <obz@gentoo.org>2005-11-06 03:30:20 +0000
committerMike Gardiner <obz@gentoo.org>2005-11-06 03:30:20 +0000
commitf7f4c40d391997cd0abab902022952606e0d7c8a (patch)
treec28d3247fccc44b50dd7c28f4e4a272b58c19a2f /gnome-base
parentMarked Stable on amd64. (diff)
downloadgentoo-2-f7f4c40d391997cd0abab902022952606e0d7c8a.tar.gz
gentoo-2-f7f4c40d391997cd0abab902022952606e0d7c8a.tar.bz2
gentoo-2-f7f4c40d391997cd0abab902022952606e0d7c8a.zip
Don't remove panel-default-setup.entries during pkg_postinst, it causes problems with binary packages, and file ownership. See bug #111648.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-panel/ChangeLog7
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild3
-rw-r--r--gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild3
3 files changed, 8 insertions, 5 deletions
diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 5c0b834ca7ab..de6d7cdafadc 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-panel
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.152 2005/10/10 07:30:45 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.153 2005/11/06 03:30:20 obz Exp $
+
+ 06 Nov 2005; Mike Gardiner <obz@gentoo.org> gnome-panel-2.10.2.ebuild,
+ gnome-panel-2.12.1.ebuild:
+ Don't remove panel-default-setup.entries during pkg_postinst, it causes
+ problems with binary packages, and file ownership. See #111648.
10 Oct 2005; Hardave Riar <hardave@gentoo.org> gnome-panel-2.10.2.ebuild:
Stable on mips.
diff --git a/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild
index d0684e81c499..014cb26fc9d9 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild,v 1.12 2005/10/10 07:30:45 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.10.2.ebuild,v 1.13 2005/11/06 03:30:20 obz Exp $
inherit eutils gnome2
@@ -59,7 +59,6 @@ pkg_postinst() {
GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
${ROOT}/usr/bin/gconftool-2 --direct --config-source \
${GCONF_CONFIG_SOURCE} --load=${entries}
- rm -f ${entries}
fi
local updater=`which gtk-update-icon-cache`
diff --git a/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild
index e3817f7f0296..e1ef300332cd 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild,v 1.1 2005/10/08 19:48:10 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.12.1.ebuild,v 1.2 2005/11/06 03:30:20 obz Exp $
inherit gnome2
@@ -59,7 +59,6 @@ pkg_postinst() {
GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
${ROOT}/usr/bin/gconftool-2 --direct --config-source \
${GCONF_CONFIG_SOURCE} --load=${entries}
- rm -f ${entries}
fi
# Calling this late so it doesn't process the GConf schemas file we already