diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2015-01-26 07:51:41 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2015-01-26 07:51:41 +0000 |
| commit | 64788d70b1891b5cf449399c3032932dbd28856b (patch) | |
| tree | ffe8c627f70ac782dccc34134114a696aff96bcb /app-admin/conky | |
| parent | dev-python/bokeh: Version Bump, #529986; thanks Marius Brehler for the upgrad... (diff) | |
| download | gentoo-2-64788d70b1891b5cf449399c3032932dbd28856b.tar.gz gentoo-2-64788d70b1891b5cf449399c3032932dbd28856b.tar.bz2 gentoo-2-64788d70b1891b5cf449399c3032932dbd28856b.zip | |
Clean up patch (bug #537680).
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 14f7a9d52028..a7048d4aa5da 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/conky -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.223 2014/10/28 20:54:26 jer Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.224 2015/01/26 07:51:41 jer Exp $ + + 26 Jan 2015; Jeroen Roovers <jer@gentoo.org> + files/conky-1.9.0-diskio-dmmajor.patch: + Clean up patch (bug #537680). 28 Oct 2014; Jeroen Roovers <jer@gentoo.org> conky-1.9.0-r3.ebuild, +files/conky-1.9.0-tinfo.patch: diff --git a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch index 38ace86f2048..db3516aa292b 100644 --- a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch +++ b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch @@ -1,8 +1,3 @@ -diff --git a/src/.linux.c.swp b/src/.linux.c.swp -index 909d454..f6fc388 100644 -Binary files a/src/.linux.c.swp and b/src/.linux.c.swp differ -diff --git a/src/linux.c b/src/linux.c -index ce5f733..bbf8dc5 100644 --- a/src/linux.c +++ b/src/linux.c @@ -80,6 +80,10 @@ |