summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2013-07-24 16:43:03 +0000
committerDaniel Pielmeier <billie@gentoo.org>2013-07-24 16:43:03 +0000
commit95069177ce894bed062a3d31a74ccee63ed604f3 (patch)
treea9c3282984a37c5b897c7f27dea4aaafe616a8e9
parentStable for HPPA (bug #477976). (diff)
downloadgentoo-2-95069177ce894bed062a3d31a74ccee63ed604f3.tar.gz
gentoo-2-95069177ce894bed062a3d31a74ccee63ed604f3.tar.bz2
gentoo-2-95069177ce894bed062a3d31a74ccee63ed604f3.zip
Fix bug #477726. Thanks to Marckus J. for the report.
(Portage version: 2.1.12.2/cvs/Linux i686, signed Manifest commit with key 215AD14D)
-rw-r--r--app-admin/conky/ChangeLog5
-rw-r--r--app-admin/conky/conky-1.9.0-r2.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index b222fa305d94..7704ddc479b0 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.208 2013/03/23 16:48:21 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.209 2013/07/24 16:43:03 billie Exp $
+
+ 24 Jul 2013; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0-r2.ebuild:
+ Fix bug #477726. Thanks to Marckus J. for the report.
23 Mar 2013; Daniel Pielmeier <billie@gentoo.org> metadata.xml:
Remove proxy-maintainers. They are not required if the user in metadata is
diff --git a/app-admin/conky/conky-1.9.0-r2.ebuild b/app-admin/conky/conky-1.9.0-r2.ebuild
index dc958c1a9111..9e6abea20349 100644
--- a/app-admin/conky/conky-1.9.0-r2.ebuild
+++ b/app-admin/conky/conky-1.9.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.7 2013/02/12 20:21:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.8 2013/07/24 16:43:03 billie Exp $
EAPI=5
@@ -105,7 +105,7 @@ src_configure() {
src_install() {
default
- dohtml doc/{config_settings.html,docs.html,lua.html,variables.html}
+ dohtml doc/*.html
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/ftdetect
@@ -123,7 +123,7 @@ src_install() {
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+ elog "You can find sample configurations at ${ROOT%/}/etc/conky."
elog "To customize, copy to ~/.conkyrc and edit it to your liking."
elog
elog "There are pretty html docs available at the conky homepage"