summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2007-06-07 15:14:12 +0000
committerJim Ramsay <lack@gentoo.org>2007-06-07 15:14:12 +0000
commit585b125d80b355cdcf18b6e43d07c6aac6adcca4 (patch)
tree7335079e14e5da11bac648da8afd46baed41ca8a /x11-wm
parentAdd tk check for bug 176980, thanks to Elliott Sales de Andrade (diff)
downloadgentoo-2-585b125d80b355cdcf18b6e43d07c6aac6adcca4.tar.gz
gentoo-2-585b125d80b355cdcf18b6e43d07c6aac6adcca4.tar.bz2
gentoo-2-585b125d80b355cdcf18b6e43d07c6aac6adcca4.zip
Bug 181151 - CVS ate my patch
(Portage version: 2.1.2.7)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fluxbox/ChangeLog6
-rw-r--r--x11-wm/fluxbox/files/1.0_rc3/startfluxbox_doesnt.patch9
2 files changed, 6 insertions, 9 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 28c626f5869c..25c975894047 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/fluxbox
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.218 2007/06/06 22:01:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.219 2007/06/07 15:14:12 lack Exp $
+
+ 07 Jun 2007; Jim Ramsay <lack@gentoo.org>
+ files/1.0_rc3/startfluxbox_doesnt.patch:
+ Bug 181151 - CVS ate my patch
*fluxbox-1.0_rc3-r3 (06 Jun 2007)
diff --git a/x11-wm/fluxbox/files/1.0_rc3/startfluxbox_doesnt.patch b/x11-wm/fluxbox/files/1.0_rc3/startfluxbox_doesnt.patch
index fceafaa60923..17bf353916ad 100644
--- a/x11-wm/fluxbox/files/1.0_rc3/startfluxbox_doesnt.patch
+++ b/x11-wm/fluxbox/files/1.0_rc3/startfluxbox_doesnt.patch
@@ -1,12 +1,5 @@
--- fluxbox-1.0rc3/util/startfluxbox.in 2007-03-19 13:57:15.000000000 -0600
-+++ fluxbox-1.0rc3-svn-4917/util/startfluxbox.in 2007-03-27 20:56:21.000000000 -0600
-@@ -1,5 +1,5 @@
- #!/bin/sh
--# $Id: startfluxbox_doesnt.patch,v 1.1 2007/06/06 22:01:05 lack Exp $
-+# $Id: startfluxbox_doesnt.patch,v 1.1 2007/06/06 22:01:05 lack Exp $
-
- command="`basename \"$0\"`"
- startup="$HOME/.fluxbox/startup"
++++ fluxbox-1.0rc3/util/startfluxbox.in 2007-03-27 20:56:21.000000000 -0600
@@ -86,5 +86,5 @@
) > "$startup"
fi