summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-04-14 23:38:04 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-04-14 23:38:04 +0000
commit8ab5e048e83ce979409631df2044424e7137d8ac (patch)
tree5fe10e155e92c574822f222e601091d0281dc54d /app-misc/pwsafe
parentadded qt3support use flag, fixes bug #346355. (diff)
downloadgentoo-2-8ab5e048e83ce979409631df2044424e7137d8ac.tar.gz
gentoo-2-8ab5e048e83ce979409631df2044424e7137d8ac.tar.bz2
gentoo-2-8ab5e048e83ce979409631df2044424e7137d8ac.zip
Fix bug 363511, cvs was trying to be too smart and broke the patch
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/pwsafe')
-rw-r--r--app-misc/pwsafe/ChangeLog6
-rw-r--r--app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch9
2 files changed, 5 insertions, 10 deletions
diff --git a/app-misc/pwsafe/ChangeLog b/app-misc/pwsafe/ChangeLog
index 6f4144e77bf7..f528f2431202 100644
--- a/app-misc/pwsafe/ChangeLog
+++ b/app-misc/pwsafe/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/pwsafe
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pwsafe/ChangeLog,v 1.9 2011/04/13 08:43:50 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pwsafe/ChangeLog,v 1.10 2011/04/14 23:38:04 nirbheek Exp $
+
+ 14 Apr 2011; Christopher Head (Hawk777) <headch@gmail.com>
+ files/pwsafe-0.2.0-cvs-1.57.patch:
+ Fix bug 363511, cvs was trying to be too smart and broke the patch
*pwsafe-0.2.0-r1 (13 Apr 2011)
diff --git a/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch b/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
index 9119abed769e..7f62eb59d429 100644
--- a/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
+++ b/app-misc/pwsafe/files/pwsafe-0.2.0-cvs-1.57.patch
@@ -6,15 +6,6 @@ retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pwsafe.cpp 30 Sep 2005 10:30:56 -0000 1.56
+++ pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57
-@@ -3,7 +3,7 @@
-
- Copyright (C) 2004-2005 Nicolas S. Dade
-
-- $Id: pwsafe-0.2.0-cvs-1.57.patch,v 1.1 2011/04/13 08:43:49 nirbheek Exp $
-+ $Id: pwsafe-0.2.0-cvs-1.57.patch,v 1.1 2011/04/13 08:43:49 nirbheek Exp $
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
@@ -3346,6 +3346,12 @@
}