From acdea4ec467d032109f31ba1c8dfbe5f97f5c462 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sat, 3 Sep 2011 21:03:58 +0000 Subject: [PATCH] Solve the collision with split -l10n package here by revbump and in -l10n by blocker. Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64 --- app-office/libreoffice-bin/ChangeLog | 9 ++++++++- ...n-3.4.3-r1.ebuild => libreoffice-bin-3.4.3-r2.ebuild} | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) rename app-office/libreoffice-bin/{libreoffice-bin-3.4.3-r1.ebuild => libreoffice-bin-3.4.3-r2.ebuild} (98%) diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index d95f7ba483bf..278a2517e53e 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.33 2011/09/03 11:56:58 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.34 2011/09/03 21:03:58 scarabeus Exp $ + +*libreoffice-bin-3.4.3-r2 (03 Sep 2011) + + 03 Sep 2011; Tomáš Chvátal + -libreoffice-bin-3.4.3-r1.ebuild, +libreoffice-bin-3.4.3-r2.ebuild: + Solve the collision with split -l10n package here by revbump and in -l10n by + blocker. 03 Sep 2011; Tomáš Chvátal libreoffice-bin-3.4.3-r1.ebuild: diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild similarity index 98% rename from app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild rename to app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild index 2787969f2326..7c81e18e4103 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild,v 1.3 2011/09/03 19:11:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild,v 1.1 2011/09/03 21:03:58 scarabeus Exp $ EAPI="3" -- 2.26.2