summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-02-10 15:18:40 +0000
committerSamuli Suominen <drac@gentoo.org>2007-02-10 15:18:40 +0000
commitfcc55225c42500c8257754c34f171b28bd022b24 (patch)
tree0ede53efab283a87bea79bf757087ba3d255cda5 /xfce-extra
parentFix also sdl-image automagic in stable vlc (diff)
downloadgentoo-2-fcc55225c42500c8257754c34f171b28bd022b24.tar.gz
gentoo-2-fcc55225c42500c8257754c34f171b28bd022b24.tar.bz2
gentoo-2-fcc55225c42500c8257754c34f171b28bd022b24.zip
Remove panel-plugin/xfce4-mixer.desktop because make install creates it again for bug 166167.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/xfce4-mixer/ChangeLog7
-rw-r--r--xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild5
2 files changed, 10 insertions, 2 deletions
diff --git a/xfce-extra/xfce4-mixer/ChangeLog b/xfce-extra/xfce4-mixer/ChangeLog
index ee5a6e39dc6c..559b9bbd3902 100644
--- a/xfce-extra/xfce4-mixer/ChangeLog
+++ b/xfce-extra/xfce4-mixer/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for xfce-extra/xfce4-mixer
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.75 2007/02/03 02:28:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.76 2007/02/10 15:18:40 drac Exp $
+
+ 10 Feb 2007; Samuli Suominen <drac@gentoo.org>
+ xfce4-mixer-4.4.0-r1.ebuild:
+ Remove panel-plugin/xfce4-mixer.desktop because make install creates it
+ again for bug 166167.
03 Feb 2007; Joshua Nichols <nichoj@gentoo.org>
-xfce4-mixer-4.3.99.2.ebuild, -xfce4-mixer-4.4.0.ebuild:
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild
index c82a5a155e1c..80229c74eaeb 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild,v 1.1 2007/01/31 16:36:25 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.0-r1.ebuild,v 1.2 2007/02/10 15:18:40 drac Exp $
inherit eutils xfce44
@@ -28,6 +28,9 @@ fi
DOCS="AUTHORS ChangeLog NEWS NOTES README TODO"
src_install() {
+ # .desktop file has allready been created by upstrean
+ # and make install tries to create it again. Bug 166167
+ rm panel-plugin/xfce4-mixer.desktop
xfce44_src_install
make_desktop_entry ${PN} "Volume control" ${PN} AudioVideo
}