summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Laue <brad@gentoo.org>2003-08-04 15:53:03 +0000
committerBrad Laue <brad@gentoo.org>2003-08-04 15:53:03 +0000
commitf7c827afa9d3d814e5b5d1c8cd85c93d9d52f223 (patch)
tree42825c07123f5cbad746aece6ae54dc84274ecd6 /app-office
parentMove the oowrapper over from app-office/openoffice (diff)
downloadhistorical-f7c827afa9d3d814e5b5d1c8cd85c93d9d52f223.tar.gz
historical-f7c827afa9d3d814e5b5d1c8cd85c93d9d52f223.tar.bz2
historical-f7c827afa9d3d814e5b5d1c8cd85c93d9d52f223.zip
Fix GNOME menu items
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-bin/Manifest4
-rw-r--r--app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild7
-rw-r--r--app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild9
3 files changed, 13 insertions, 7 deletions
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index b75656b81720..dac58d4c0c6f 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -3,8 +3,8 @@ MD5 98d48815cb1b470eaa680bee025cd825 openoffice-bin-1.0.2.ebuild 6174
MD5 286e13ebb4c41e2b2a502ac3b12fa6b4 openoffice-bin-1.0.3.1.ebuild 6448
MD5 7576a51aef82508612fa18256c0e7c85 openoffice-bin-1.0.3.ebuild 6167
MD5 1d4d7e2d4125513818b334f9be8a9dcb openoffice-bin-1.1_beta2-r1.ebuild 6285
-MD5 caeca7c7e9988ac4657f3c171df9dcea openoffice-bin-1.1_rc1.ebuild 6181
-MD5 9779112886edb410c24ff93c3692a233 openoffice-bin-1.1_rc2.ebuild 6182
+MD5 56ef01c9cde2c8d14a33456381be87a5 openoffice-bin-1.1_rc1.ebuild 6345
+MD5 87cdcf3dcef19c66ccfd76ef09dbfc85 openoffice-bin-1.1_rc2.ebuild 6344
MD5 6bb2dccd6a53a5457be6670d628c77d3 files/digest-openoffice-bin-1.0.2 168
MD5 7f69df73d15c5fca3829e9f3083cf440 files/digest-openoffice-bin-1.0.3 82
MD5 94e303d234eb28b21c53aefdc9f8f19f files/digest-openoffice-bin-1.0.3.1 145
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild
index 4567f9e34c1c..4fbdc94de353 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild,v 1.2 2003/08/01 03:40:08 heim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_rc1.ebuild,v 1.3 2003/08/04 15:52:50 brad Exp $
IUSE="kde gnome"
@@ -148,7 +148,10 @@ src_install() {
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
- for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
+ # Change this to ooo*.desktop from *.desktop for now, since
+ # otherwise two sets of icons will appear in the GNOME menu.
+ # <brad@gentoo.org> (04 Aug 2003)
+ for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop
do
# We have to handle setup differently
perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild
index 842c7299c258..0c24942f9188 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild,v 1.1 2003/08/02 08:29:10 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_rc2.ebuild,v 1.2 2003/08/04 15:52:50 brad Exp $
IUSE="kde gnome"
@@ -147,8 +147,11 @@ src_install() {
# Install the files needed for the catagory
doins ${D}${INSTDIR}/share/gnome/net/.directory
doins ${D}${INSTDIR}/share/gnome/net/.order
-
- for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
+
+ # Change this to ooo*.desktop from *.desktop for now, since
+ # otherwise two sets of icons will appear in the GNOME menu.
+ # <brad@gentoo.org> (04 Aug 2003)
+ for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop
do
# We have to handle setup differently
perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}