diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2010-07-14 12:06:29 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2010-07-14 12:06:29 +0000 |
| commit | 70300eeec3071145fd45ee272da98783a903fda7 (patch) | |
| tree | b54da520b51b3b25a7924a31b7575d16f974c382 /app-misc/gramps | |
| parent | Add perl-5.12 as provider (diff) | |
| download | gentoo-2-70300eeec3071145fd45ee272da98783a903fda7.tar.gz gentoo-2-70300eeec3071145fd45ee272da98783a903fda7.tar.bz2 gentoo-2-70300eeec3071145fd45ee272da98783a903fda7.zip | |
fix patch finally, thanks arfrever for pointing out
(Portage version: 2.1.8.3/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'app-misc/gramps')
| -rw-r--r-- | app-misc/gramps/ChangeLog | 9 | ||||
| -rw-r--r-- | app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch | 22 | ||||
| -rw-r--r-- | app-misc/gramps/gramps-3.2.3-r2.ebuild (renamed from app-misc/gramps/gramps-3.2.3-r1.ebuild) | 2 |
3 files changed, 29 insertions, 4 deletions
diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog index f1de95773559..89754d24a108 100644 --- a/app-misc/gramps/ChangeLog +++ b/app-misc/gramps/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/gramps # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.131 2010/07/14 09:16:20 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.132 2010/07/14 12:06:29 fauli Exp $ + +*gramps-3.2.3-r2 (14 Jul 2010) + + 14 Jul 2010; Christian Faulhammer <fauli@gentoo.org> + -gramps-3.2.3-r1.ebuild, +gramps-3.2.3-r2.ebuild, + files/gramps-3.2.3-use_bsddb3.patch: + fix patch finally, thanks arfrever for pointing out *gramps-3.2.3-r1 (14 Jul 2010) diff --git a/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch b/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch index 9ea7a4e3efa4..cd492192a1a1 100644 --- a/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch +++ b/app-misc/gramps/files/gramps-3.2.3-use_bsddb3.patch @@ -96,7 +96,7 @@ diff -r -u gramps-3.2.3.orig/src/gen/db/write.py gramps-3.2.3/src/gen/db/write.p diff -r -u gramps-3.2.3.orig/src/GrampsAboutDialog.py gramps-3.2.3/src/GrampsAboutDialog.py --- gramps-3.2.3.orig/src/GrampsAboutDialog.py 2010-07-14 11:01:39.950040977 +0200 -+++ gramps-3.2.3/src/GrampsAboutDialog.py 2010-07-14 11:07:08.703288777 +0200 ++++ gramps-3.2.3/src/GrampsAboutDialog.py 2010-07-14 14:00:20.613290384 +0200 @@ -30,7 +30,7 @@ from gen.ggettext import gettext as _ import os @@ -106,9 +106,18 @@ diff -r -u gramps-3.2.3.orig/src/GrampsAboutDialog.py gramps-3.2.3/src/GrampsAbo ##import logging ##_LOG = logging.getLogger(".GrampsAboutDialog") +@@ -124,7 +124,7 @@ + "Distribution: %s") + % (elipses(str(const.VERSION)), + elipses(str(sys.version).replace('\n','')), +- elipses(str(bsddb.__version__)), ++ elipses(str(bsddb3.__version__)), + elipses(os.environ.get('LANG','')), + elipses(operatingsystem), + elipses(distribution))) diff -r -u gramps-3.2.3.orig/src/GrampsLogger/_ErrorReportAssistant.py gramps-3.2.3/src/GrampsLogger/_ErrorReportAssistant.py --- gramps-3.2.3.orig/src/GrampsLogger/_ErrorReportAssistant.py 2010-07-14 11:01:39.820290663 +0200 -+++ gramps-3.2.3/src/GrampsLogger/_ErrorReportAssistant.py 2010-07-14 11:07:07.753040488 +0200 ++++ gramps-3.2.3/src/GrampsLogger/_ErrorReportAssistant.py 2010-07-14 14:00:13.771042190 +0200 @@ -5,7 +5,7 @@ import pygtk import gobject @@ -118,6 +127,15 @@ diff -r -u gramps-3.2.3.orig/src/GrampsLogger/_ErrorReportAssistant.py gramps-3. class ErrorReportAssistant(object): +@@ -119,7 +119,7 @@ + "gobject version: %s\n"\ + "cairo version : %s"\ + % (str(sys.version).replace('\n',''), +- str(bsddb.__version__), ++ str(bsddb3.__version__), + str(const.VERSION), + os.environ.get('LANG',''), + operatingsystem, diff -r -u gramps-3.2.3.orig/src/gui/editors/editfamily.py gramps-3.2.3/src/gui/editors/editfamily.py --- gramps-3.2.3.orig/src/gui/editors/editfamily.py 2010-07-14 11:01:39.871291221 +0200 +++ gramps-3.2.3/src/gui/editors/editfamily.py 2010-07-14 11:07:07.987288707 +0200 diff --git a/app-misc/gramps/gramps-3.2.3-r1.ebuild b/app-misc/gramps/gramps-3.2.3-r2.ebuild index 7223e3eb2418..ef3355bdcdf8 100644 --- a/app-misc/gramps/gramps-3.2.3-r1.ebuild +++ b/app-misc/gramps/gramps-3.2.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.2.3-r1.ebuild,v 1.1 2010/07/14 09:16:20 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.2.3-r2.ebuild,v 1.1 2010/07/14 12:06:29 fauli Exp $ EAPI=2 |