Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/merkaartor: merkaartor-9999.ebuild ChangeLog
Date: Wed, 01 Apr 2015 06:17:42
Message-Id: 20150401061735.1C74714F84@oystercatcher.gentoo.org
1 jlec 15/04/01 06:17:34
2
3 Modified: merkaartor-9999.ebuild ChangeLog
4 Log:
5 Drop patch as it was merged by upstream
6
7 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
8
9 Revision Changes Path
10 1.17 sci-geosciences/merkaartor/merkaartor-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.17&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.17&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?r1=1.16&r2=1.17
15
16 Index: merkaartor-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
19 retrieving revision 1.16
20 retrieving revision 1.17
21 diff -u -r1.16 -r1.17
22 --- merkaartor-9999.ebuild 31 Mar 2015 13:15:04 -0000 1.16
23 +++ merkaartor-9999.ebuild 1 Apr 2015 06:17:33 -0000 1.17
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.16 2015/03/31 13:15:04 jlec Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.17 2015/04/01 06:17:33 jlec Exp $
29
30 EAPI=5
31
32 @@ -57,7 +57,6 @@
33 $(qt4_get_bindir)/lrelease src/src.pro || die
34 fi
35
36 - epatch "${FILESDIR}"/${P}-system-libs.patch
37 epatch_user
38 }
39
40
41
42
43 1.32 sci-geosciences/merkaartor/ChangeLog
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.32&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.32&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?r1=1.31&r2=1.32
48
49 Index: ChangeLog
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v
52 retrieving revision 1.31
53 retrieving revision 1.32
54 diff -u -r1.31 -r1.32
55 --- ChangeLog 31 Mar 2015 13:15:04 -0000 1.31
56 +++ ChangeLog 1 Apr 2015 06:17:33 -0000 1.32
57 @@ -1,6 +1,10 @@
58 # ChangeLog for sci-geosciences/merkaartor
59 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
60 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.31 2015/03/31 13:15:04 jlec Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.32 2015/04/01 06:17:33 jlec Exp $
62 +
63 + 01 Apr 2015; Justin Lecher <jlec@g.o>
64 + -files/merkaartor-9999-system-libs.patch, merkaartor-9999.ebuild:
65 + Drop patch as it was merged by upstream
66
67 *merkaartor-0.18.1-r1 (31 Mar 2015)