diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-04-30 07:21:31 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-04-30 07:21:31 +0000 |
| commit | ee971fc24b19e915c2d1638615b53b8a8701159e (patch) | |
| tree | 9e140eff768b9661ba017b57c49cebbf1fe5b191 /x11-terms | |
| parent | Force python2 fixing bug #312237 (diff) | |
| download | gentoo-2-ee971fc24b19e915c2d1638615b53b8a8701159e.tar.gz gentoo-2-ee971fc24b19e915c2d1638615b53b8a8701159e.tar.bz2 gentoo-2-ee971fc24b19e915c2d1638615b53b8a8701159e.zip | |
Fix bug #289361
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms')
4 files changed, 32 insertions, 3 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog index 6cde80b87334..22d5e89542e8 100644 --- a/x11-terms/gnome-terminal/ChangeLog +++ b/x11-terms/gnome-terminal/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-terms/gnome-terminal # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.214 2010/04/26 19:43:21 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.215 2010/04/30 07:21:30 pacho Exp $ + + 30 Apr 2010; Pacho Ramos <pacho@gentoo.org> + gnome-terminal-2.26.3.1-r2.ebuild, + +files/gnome-terminal-2.26.3.1-en_GB.patch, gnome-terminal-2.28.2.ebuild: + Fix British English documentation translation. Thanks to Daniel Schömer + for pointing to the issue and Markus Meier for reporting bug #289361. This + is solved by upstream in >2.30.1 26 Apr 2010; Pacho Ramos <pacho@gentoo.org> gnome-terminal-2.26.3.1-r2.ebuild, diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch new file mode 100644 index 000000000000..5e7e8b4a71cd --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.26.3.1-en_GB.patch @@ -0,0 +1,16 @@ +Fixing bug #289361 with a patch based in Daniel Schömer one and upstream +commit 712fd4ab3056439a553dd650153a382b94073fac by Philip Withnall +This is solved by upstream in gnome-terminal > 2.30.1 +http://bugs.gentoo.org/show_bug.cgi?id=289361 +https://bugzilla.gnome.org/show_bug.cgi?id=617206 +--- help/en_GB/en_GB.po~ 2009-12-14 21:26:09.000000000 +0100 ++++ help/en_GB/en_GB.po 2010-04-30 09:02:08.000000000 +0200 +@@ -1167,7 +1167,7 @@ + + #: C/gnome-terminal.xml:670(guilabel) + msgid "Disable menu shortcut key (F10 by default)" +-msgstr "Disable menu shortcut key (<keycap>F10</keycap> by default)" ++msgstr "Disable menu shortcut key (F10 by default)" + + #: C/gnome-terminal.xml:672(para) + msgid "" diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild index cadc20690825..ad9a861c1009 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.11 2010/04/27 04:50:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.26.3.1-r2.ebuild,v 1.12 2010/04/30 07:21:30 pacho Exp $ inherit eutils gnome2 @@ -53,6 +53,9 @@ src_unpack() { # gnome-doc-utils. See bug #304091 epatch "${FILESDIR}"/${P}-remove-plural.patch + # Fix British English documentation translation (bug #289361) + epatch "${FILESDIR}"/${PN}-2.26.3.1-en_GB.patch + # patch gnome terminal to report as GNOME rather than xterm # This needs to resolve a few bugs (#120294,) # Leave out for now; causing too many problems diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild index 2c6c83b509cc..0209c798bbba 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild,v 1.2 2010/01/06 19:24:42 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.28.2.ebuild,v 1.3 2010/04/30 07:21:30 pacho Exp $ GCONF_DEBUG="no" @@ -38,6 +38,9 @@ src_unpack() { # Use login shell by default (#12900) epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch + # Fix British English documentation translation (bug #289361) + epatch "${FILESDIR}"/${PN}-2.26.3.1-en_GB.patch + # patch gnome terminal to report as GNOME rather than xterm # This needs to resolve a few bugs (#120294,) # Leave out for now; causing too many problems |