diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-03 21:03:58 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-03 21:03:58 +0000 |
commit | 85cc4402465fcb0f6a041cb54bbd0c92232cbc56 (patch) | |
tree | 4a88f80ef0d7fe468327e57d1e17c30250cff172 | |
parent | Revision bump in order to REALLY avoid the collisions, the -l10n will block t... (diff) | |
download | gentoo-2-85cc4402465fcb0f6a041cb54bbd0c92232cbc56.tar.gz gentoo-2-85cc4402465fcb0f6a041cb54bbd0c92232cbc56.tar.bz2 gentoo-2-85cc4402465fcb0f6a041cb54bbd0c92232cbc56.zip |
Solve the collision with split -l10n package here by revbump and in -l10n by blocker.
(Portage version: 2.2.0_alpha52/cvs/Linux x86_64)
-rw-r--r-- | app-office/libreoffice-bin/ChangeLog | 9 | ||||
-rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-3.4.3-r2.ebuild (renamed from app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild) | 2 |
2 files changed, 9 insertions, 2 deletions
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 <scarabeus@gentoo.org> + -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 <scarabeus@gentoo.org> 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 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" |