summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2005-12-11 11:16:12 +0000
committerDaniel Black <dragonheart@gentoo.org>2005-12-11 11:16:12 +0000
commitf4c37391601be5086c17f27d25f98a3c584eef1b (patch)
tree658c480b96817e3e53f1a9afb3f7b02c625e9658 /app-admin
parentx86 stable for bug #112842. (diff)
downloadgentoo-2-f4c37391601be5086c17f27d25f98a3c584eef1b.tar.gz
gentoo-2-f4c37391601be5086c17f27d25f98a3c584eef1b.tar.bz2
gentoo-2-f4c37391601be5086c17f27d25f98a3c584eef1b.zip
silly cvs stuff in patches - bug #^%#115170
(Portage version: 2.0.53)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/conky/ChangeLog6
-rw-r--r--app-admin/conky/files/conky-1.3.4-arraybounds.patch13
2 files changed, 7 insertions, 12 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9c6985db38d2..f51cb90fc2ea 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.15 2005/12/11 03:36:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.16 2005/12/11 11:16:12 dragonheart Exp $
+
+ 11 Dec 2005; Daniel Black <dragonheart@gentoo.org>
+ files/conky-1.3.4-arraybounds.patch:
+ silly cvs stuff in patches - bug #^%#115170
*conky-1.3.4-r2 (11 Dec 2005)
diff --git a/app-admin/conky/files/conky-1.3.4-arraybounds.patch b/app-admin/conky/files/conky-1.3.4-arraybounds.patch
index 954f900d191b..22e64c4b3c05 100644
--- a/app-admin/conky/files/conky-1.3.4-arraybounds.patch
+++ b/app-admin/conky/files/conky-1.3.4-arraybounds.patch
@@ -1,14 +1,5 @@
--- src/conky.h.old 2005-11-30 01:08:25.000000000 -0500
+++ src/conky.h 2005-11-29 12:35:21.000000000 -0500
-@@ -3,7 +3,7 @@
- *
- * This program is licensed under BSD license, read COPYING
- *
-- * $Id: conky-1.3.4-arraybounds.patch,v 1.1 2005/12/11 03:36:33 dragonheart Exp $
-+ * $Id: conky-1.3.4-arraybounds.patch,v 1.1 2005/12/11 03:36:33 dragonheart Exp $
- */
-
- #ifndef _conky_h_
@@ -55,6 +55,9 @@
#define CRIT_ERR(s, varargs...) \
{ fprintf(stderr, "Conky: " s "\n", ##varargs); exit(EXIT_FAILURE); }
@@ -26,8 +17,8 @@
*
* This program is licensed under BSD license, read COPYING
*
-- * $Id: conky-1.3.4-arraybounds.patch,v 1.1 2005/12/11 03:36:33 dragonheart Exp $
-+ * $Id: conky-1.3.4-arraybounds.patch,v 1.1 2005/12/11 03:36:33 dragonheart Exp $
+- * $Id: conky-1.3.4-arraybounds.patch,v 1.2 2005/12/11 11:16:12 dragonheart Exp $
++ * $Id: conky-1.3.4-arraybounds.patch,v 1.2 2005/12/11 11:16:12 dragonheart Exp $
*/
#include "conky.h"