diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-03-31 04:18:04 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-03-31 04:18:04 +0000 |
| commit | 4dfbe14f94ca474794f8970774dcd93fccd7f816 (patch) | |
| tree | fcb68a325e79c321e52f7793de536c25b69099e6 /dev-util | |
| parent | Version bump, see http://www.winehq.org/announce/1.5.27 for the announcement. (diff) | |
| download | gentoo-2-4dfbe14f94ca474794f8970774dcd93fccd7f816.tar.gz gentoo-2-4dfbe14f94ca474794f8970774dcd93fccd7f816.tar.bz2 gentoo-2-4dfbe14f94ca474794f8970774dcd93fccd7f816.zip | |
Fix .desktop file sed.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/meld/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.7.1.ebuild | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 1aa42c060c6d..492ae2e6041e 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/meld # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.162 2013/03/30 21:27:48 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.163 2013/03/31 04:18:04 tetromino Exp $ + + 31 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> meld-1.7.1.ebuild: + Fix .desktop file sed. *meld-1.7.1 (30 Mar 2013) diff --git a/dev-util/meld/meld-1.7.1.ebuild b/dev-util/meld/meld-1.7.1.ebuild index 17f1eaad656c..8a367cfdaf15 100644 --- a/dev-util/meld/meld-1.7.1.ebuild +++ b/dev-util/meld/meld-1.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.1 2013/03/30 21:27:48 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.2 2013/03/31 04:18:04 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -62,9 +62,8 @@ src_prepare() { -i po/Makefile || die "sed 6 failed" fi - # Fix .desktop entry, upstream bug #686978 - sed -e '/Encoding/d' \ - -e 's/(MimeType.*)/\1/' \ + # Fix .desktop entry + sed -e 's/\(MimeType.*\)/\1;/' \ -i data/meld.desktop.in || die gnome2_src_prepare |