Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/meld: ChangeLog meld-1.7.1.ebuild
Date: Sun, 31 Mar 2013 04:18:08
Message-Id: 20130331041804.6F4122171D@flycatcher.gentoo.org
1 tetromino 13/03/31 04:18:04
2
3 Modified: ChangeLog meld-1.7.1.ebuild
4 Log:
5 Fix .desktop file sed.
6
7 (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
8
9 Revision Changes Path
10 1.163 dev-util/meld/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.163&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.163&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?r1=1.162&r2=1.163
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v
19 retrieving revision 1.162
20 retrieving revision 1.163
21 diff -u -r1.162 -r1.163
22 --- ChangeLog 30 Mar 2013 21:27:48 -0000 1.162
23 +++ ChangeLog 31 Mar 2013 04:18:04 -0000 1.163
24 @@ -1,6 +1,9 @@
25 # ChangeLog for dev-util/meld
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.162 2013/03/30 21:27:48 eva Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.163 2013/03/31 04:18:04 tetromino Exp $
29 +
30 + 31 Mar 2013; Alexandre Rostovtsev <tetromino@g.o> meld-1.7.1.ebuild:
31 + Fix .desktop file sed.
32
33 *meld-1.7.1 (30 Mar 2013)
34
35
36
37
38 1.2 dev-util/meld/meld-1.7.1.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild?r1=1.1&r2=1.2
43
44 Index: meld-1.7.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- meld-1.7.1.ebuild 30 Mar 2013 21:27:48 -0000 1.1
51 +++ meld-1.7.1.ebuild 31 Mar 2013 04:18:04 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.1 2013/03/30 21:27:48 eva Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.2 2013/03/31 04:18:04 tetromino Exp $
57
58 EAPI="5"
59 GCONF_DEBUG="no"
60 @@ -62,9 +62,8 @@
61 -i po/Makefile || die "sed 6 failed"
62 fi
63
64 - # Fix .desktop entry, upstream bug #686978
65 - sed -e '/Encoding/d' \
66 - -e 's/(MimeType.*)/\1/' \
67 + # Fix .desktop entry
68 + sed -e 's/\(MimeType.*\)/\1;/' \
69 -i data/meld.desktop.in || die
70
71 gnome2_src_prepare