summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2008-09-15 18:49:18 +0000
committerAndreas Proschofsky <suka@gentoo.org>2008-09-15 18:49:18 +0000
commit91ec25c2c8f3b336350f9b652fe17e7d035c5d18 (patch)
tree4c53a00a511e86e10699aa8d559ce9594a382e07 /app-office
parentRemove old versions (diff)
downloadhistorical-91ec25c2c8f3b336350f9b652fe17e7d035c5d18.tar.gz
historical-91ec25c2c8f3b336350f9b652fe17e7d035c5d18.tar.bz2
historical-91ec25c2c8f3b336350f9b652fe17e7d035c5d18.zip
Fix qstart-icon snafu
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-bin/ChangeLog6
-rw-r--r--app-office/openoffice-bin/Manifest4
-rw-r--r--app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild6
3 files changed, 11 insertions, 5 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index fb3981b4d5da..af78c3cb1f21 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice-bin
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.195 2008/09/15 12:14:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.196 2008/09/15 18:49:18 suka Exp $
+
+ 15 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-bin-3.0.0_rc1.ebuild:
+ Fix qstart-icon snafu
15 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
openoffice-bin-3.0.0_rc1.ebuild:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 24f047867fa5..ceafeb58e4f7 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -208,6 +208,6 @@ DIST OOo_3.0.0rc1_20080904_LinuxX86-64_langpack_zh-CN.tar.gz 16299565 RMD160 ea6
DIST OOo_3.0.0rc1_20080904_LinuxX86-64_langpack_zh-TW.tar.gz 16468663 RMD160 0f4add30e1b0cc07f905dead26ee0867e33452dc SHA1 e2857195cece97d4f9d194e605d794ebefad4af2 SHA256 30546398e5d6d82383b82c3731aa4a29a7fb3c6be054f87be6c322713156f3c2
DIST OOo_3.0.0rc1_20080904_LinuxX86-64_langpack_zu.tar.gz 21088867 RMD160 0610c89a97a81b5cf697bfcfe0a3b6166c36a0ab SHA1 f152b4f3cad8f3623a15f0d62e4016d12a527f2b SHA256 4fa9376cc48fa853e1ed8985407db5e5196d6907343c2059ebac9a1952a213c4
EBUILD openoffice-bin-2.4.1.ebuild 5360 RMD160 874a1c40cc74f3714bd736f056cff2f138a4a2e7 SHA1 6d39209c5a1ef5455f4a7ea05f0886782ca9919f SHA256 6c0e96afdda0d8c2192dae1e5576809993c43caa6f5409e692268feb91119f7c
-EBUILD openoffice-bin-3.0.0_rc1.ebuild 6354 RMD160 657e61bf66bf96cd454cb64703924152f8555467 SHA1 0e17913aede4081c3badfd929941730ebd2d35fc SHA256 a52a47406eaddfbe5a2ed160706d4fed420367a885c75c4a0095a0d69444bd37
-MISC ChangeLog 35542 RMD160 3e0b7d1eb3e33d13fbfa69bc3f0369d879a30cf7 SHA1 42e96763fbee16675a5ef4ba422996ab1cb88e63 SHA256 c5842ae56cff9e001e3a8801161ff954417e6282e4ff8bd3a497856c8a3bdbe8
+EBUILD openoffice-bin-3.0.0_rc1.ebuild 6398 RMD160 591fc29f92e3fc761b4cfef5494c8fb1d79a4f7f SHA1 b8bd908a3d62a30eb9b98a0658c930bc519df887 SHA256 d18769126d3eee2584b4216a7da0c660309e134fbc0bcd9d4ebc4148cd777486
+MISC ChangeLog 35655 RMD160 73437ea0bb0c930dfad1e6a412c98b670ca05bd2 SHA1 286acd261e2f0f8699f941d09fb40a8019577b7d SHA256 117927c12bef8de7dbae51f2a1a1a5a0f7535df99add6020c802931f2d4c692f
MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
diff --git a/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild b/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild
index f7a9e05e9990..9f5d77847090 100644
--- a/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild,v 1.3 2008/09/15 12:14:29 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild,v 1.4 2008/09/15 18:49:18 suka Exp $
inherit eutils fdo-mime rpm multilib
@@ -132,7 +132,9 @@ src_install () {
sed -i -e s/openofficeorg3-${desk}/ooo-${desk}/g openoffice.org-${desk}.desktop || die
domenu openoffice.org-${desk}.desktop
insinto /usr/share/pixmaps
- newins "${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg3-${desk}.png" ooo-${desk}.png
+ if [ "${desk}" != "qstart" ] ; then
+ newins "${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg3-${desk}.png" ooo-${desk}.png
+ fi
done
insinto /usr/share/mime/packages