update to 3.2.3 changes: -bugfixes -translation updatesdiff -r1.10 -r1.11 pkgsrc/databases/gramps3/Makefile
(drochner)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.10 2010/05/04 11:04:59 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.11 2010/05/18 16:38:53 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= gramps-3.2.1 | 4 | DISTNAME= gramps-3.2.3 | |
5 | CATEGORIES= databases | 5 | CATEGORIES= databases | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/} | |
7 | 7 | |||
8 | MAINTAINER= drochner@NetBSD.org | 8 | MAINTAINER= drochner@NetBSD.org | |
9 | HOMEPAGE= http://gramps-project.org/ | 9 | HOMEPAGE= http://gramps-project.org/ | |
10 | COMMENT= Genealogical Research and Analysis Management Programming System V3 | 10 | COMMENT= Genealogical Research and Analysis Management Programming System V3 | |
11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
12 | 12 | |||
13 | DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils | 13 | DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | USE_TOOLS+= msgfmt pkg-config intltool msgconv | 17 | USE_TOOLS+= msgfmt pkg-config intltool msgconv |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.5 2010/05/04 11:04:59 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.6 2010/05/18 16:38:53 drochner Exp $ | |
2 | bin/gramps | 2 | bin/gramps | |
3 | man/fr/man1/gramps.1 | 3 | man/fr/man1/gramps.1 | |
4 | man/man1/gramps.1 | 4 | man/man1/gramps.1 | |
5 | man/nl/man1/gramps.1 | 5 | man/nl/man1/gramps.1 | |
6 | man/pl/man1/gramps.1 | 6 | man/pl/man1/gramps.1 | |
7 | man/sv/man1/gramps.1 | 7 | man/sv/man1/gramps.1 | |
8 | share/application-registry/gramps.applications | 8 | share/application-registry/gramps.applications | |
9 | share/applications/gramps.desktop | 9 | share/applications/gramps.desktop | |
10 | share/gramps/Assistant.py | 10 | share/gramps/Assistant.py | |
11 | share/gramps/Assistant.pyc | 11 | share/gramps/Assistant.pyc | |
12 | share/gramps/Assistant.pyo | 12 | share/gramps/Assistant.pyo | |
13 | share/gramps/AutoComp.py | 13 | share/gramps/AutoComp.py | |
14 | share/gramps/AutoComp.pyc | 14 | share/gramps/AutoComp.pyc |
@@ -1,20 +1,18 @@ | @@ -1,20 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2010/05/04 11:04:59 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.8 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (gramps-3.2.1.tar.gz) = 3dee19907ac2da7245ccb8e15e9b3c1e124fd53f | 3 | SHA1 (gramps-3.2.3.tar.gz) = 156622b7a51189fb2c105e29ff33978d4c165be4 | |
4 | RMD160 (gramps-3.2.1.tar.gz) = 1641c19212dbba1b7d3292c04e1f47b3e6fa3b4c | 4 | RMD160 (gramps-3.2.3.tar.gz) = b0a9c7a3065c6ed24a2f5b7e548fe5bcf2c1927c | |
5 | Size (gramps-3.2.1.tar.gz) = 7196866 bytes | 5 | Size (gramps-3.2.3.tar.gz) = 7234196 bytes | |
6 | SHA1 (patch-aa) = 7de4ac7901f647b910833881ed4825e49773ac69 | 6 | SHA1 (patch-aa) = 7de4ac7901f647b910833881ed4825e49773ac69 | |
7 | SHA1 (patch-ab) = a70c9ee5706e6028230492e87946de5fc0514e21 | 7 | SHA1 (patch-ab) = a70c9ee5706e6028230492e87946de5fc0514e21 | |
8 | SHA1 (patch-ac) = 4d5661d1c2e8453fb71b29a4d971024713041ae0 | 8 | SHA1 (patch-ac) = 982702e3c36246da35e0f016f696d52f3af37f24 | |
9 | SHA1 (patch-ad) = 1e1059359b07d5a63d96d1d0528969c23cea0691 | 9 | SHA1 (patch-ad) = 1e1059359b07d5a63d96d1d0528969c23cea0691 | |
10 | SHA1 (patch-ae) = 933d5ca25274d76bb5e0826df5fe2661352f450f | 10 | SHA1 (patch-ae) = 933d5ca25274d76bb5e0826df5fe2661352f450f | |
11 | SHA1 (patch-ag) = 41a74f38b33d05bf3c42fae1b4bc836df963972e | 11 | SHA1 (patch-ag) = 41a74f38b33d05bf3c42fae1b4bc836df963972e | |
12 | SHA1 (patch-ah) = 3b79020f44a313924156a9a3220e9afc95e7be71 | 12 | SHA1 (patch-ah) = 3b79020f44a313924156a9a3220e9afc95e7be71 | |
13 | SHA1 (patch-ai) = cf12741a4bfa24465bb1f7dfb98910ca49d23a7f | 13 | SHA1 (patch-ai) = cf12741a4bfa24465bb1f7dfb98910ca49d23a7f | |
14 | SHA1 (patch-aj) = 6f6be0045e94b7f95200a389dbff591e5006315c | 14 | SHA1 (patch-aj) = 6f6be0045e94b7f95200a389dbff591e5006315c | |
15 | SHA1 (patch-ak) = 6920c334b14a4d7b2ce46910978e9c10f35a9507 | 15 | SHA1 (patch-ak) = 6920c334b14a4d7b2ce46910978e9c10f35a9507 | |
16 | SHA1 (patch-al) = 9c0c39c6ecf20d0066ff4b887a3248ced34178a4 | 16 | SHA1 (patch-al) = 9c0c39c6ecf20d0066ff4b887a3248ced34178a4 | |
17 | SHA1 (patch-am) = 3a39556ea040ee98ffd274f8daa8bc0af62b0909 | 17 | SHA1 (patch-am) = 3a39556ea040ee98ffd274f8daa8bc0af62b0909 | |
18 | SHA1 (patch-an) = 8718d828677431367916e9d079e23fee415662f2 | 18 | SHA1 (patch-an) = 1f6f0625c206d2f4a8420d985a8608d444a82597 | |
19 | SHA1 (patch-ao) = 6206c59e6527c754595d868336bb9a35e5777f41 | |||
20 | SHA1 (patch-ap) = c0aafa9abf4ddabd5be8a9c6bc4cb60bbd3c8fcb |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-aa,v 1.2 2010/05/04 11:05:00 drochner Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | --- src/gui/editors/editfamily.py.orig 2010-03-15 07:21:30.000000000 +0000 | 3 | --- src/gui/editors/editfamily.py.orig 2010-03-15 07:21:30.000000000 +0000 | |
4 | +++ src/gui/editors/editfamily.py | 4 | +++ src/gui/editors/editfamily.py | |
5 | @@ -26,7 +26,7 @@ | 5 | @@ -26,7 +26,7 @@ | |
6 | # python modules | 6 | # python modules | |
7 | # | 7 | # | |
8 | #------------------------------------------------------------------------- | 8 | #------------------------------------------------------------------------- | |
9 | -from bsddb import db as bsddb_db | 9 | -from bsddb import db as bsddb_db | |
10 | +from bsddb3 import db as bsddb_db | 10 | +from bsddb3 import db as bsddb_db | |
11 | from gen.ggettext import gettext as _ | 11 | from gen.ggettext import gettext as _ | |
12 | from DdTargets import DdTargets | 12 | from DdTargets import DdTargets | |
13 | import cPickle as pickle | 13 | import cPickle as pickle |
@@ -1,22 +1,14 @@ | @@ -1,22 +1,14 @@ | |||
1 | $NetBSD: patch-ac,v 1.2 2010/05/04 11:05:00 drochner Exp $ | 1 | $NetBSD: patch-ac,v 1.3 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | --- src/GrampsLogger/_ErrorReportAssistant.py.orig 2010-03-15 07:21:07.000000000 +0000 | 3 | --- src/GrampsLogger/_ErrorReportAssistant.py.orig 2010-05-17 05:30:59.000000000 +0000 | |
4 | +++ src/GrampsLogger/_ErrorReportAssistant.py | 4 | +++ src/GrampsLogger/_ErrorReportAssistant.py | |
5 | @@ -5,7 +5,7 @@ import gtk | 5 | @@ -5,7 +5,8 @@ import gtk | |
6 | import pygtk | 6 | import pygtk | |
7 | import gobject | 7 | import gobject | |
8 | import cairo | 8 | import cairo | |
9 | -import sys, os,bsddb | 9 | -import sys, os,bsddb | |
10 | +import sys, os,bsddb3 | 10 | +import sys, os | |
11 | +import bsddb3 as bsddb | |||
11 | 12 | |||
12 | 13 | |||
13 | class ErrorReportAssistant(object): | 14 | class ErrorReportAssistant(object): | |
14 | @@ -119,7 +119,7 @@ class ErrorReportAssistant(object): | |||
15 | "gobject version: %s\n"\ | |||
16 | "cairo version : %s"\ | |||
17 | % (str(sys.version).replace('\n',''), | |||
18 | - str(bsddb.__version__), | |||
19 | + str(bsddb3.__version__), | |||
20 | str(const.VERSION), | |||
21 | os.environ.get('LANG',''), | |||
22 | operatingsystem, |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ad,v 1.2 2010/05/04 11:05:00 drochner Exp $ | 1 | $NetBSD: patch-ad,v 1.3 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | --- src/gen/db/write.py.orig 2010-03-18 15:38:37.000000000 +0000 | 3 | --- src/gen/db/write.py.orig 2010-03-18 15:38:37.000000000 +0000 | |
4 | +++ src/gen/db/write.py | 4 | +++ src/gen/db/write.py | |
5 | @@ -39,7 +39,7 @@ import bisect | 5 | @@ -39,7 +39,7 @@ import bisect | |
6 | from functools import wraps | 6 | from functools import wraps | |
7 | 7 | |||
8 | from gen.ggettext import gettext as _ | 8 | from gen.ggettext import gettext as _ | |
9 | -from bsddb import dbshelve, db | 9 | -from bsddb import dbshelve, db | |
10 | +from bsddb3 import dbshelve, db | 10 | +from bsddb3 import dbshelve, db | |
11 | import logging | 11 | import logging | |
12 | from sys import maxint | 12 | from sys import maxint | |
13 | 13 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ab,v 1.3 2010/05/04 11:05:00 drochner Exp $ | 1 | $NetBSD: patch-ab,v 1.4 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | --- src/cli/clidbman.py.orig 2010-03-15 07:21:31.000000000 +0000 | 3 | --- src/cli/clidbman.py.orig 2010-03-15 07:21:31.000000000 +0000 | |
4 | +++ src/cli/clidbman.py | 4 | +++ src/cli/clidbman.py | |
5 | @@ -109,7 +109,7 @@ class CLIDbManager(object): | 5 | @@ -109,7 +109,7 @@ class CLIDbManager(object): | |
6 | Returns (people_count, version_number) of current DB. | 6 | Returns (people_count, version_number) of current DB. | |
7 | Returns ("Unknown", "Unknown") if invalid DB or other error. | 7 | Returns ("Unknown", "Unknown") if invalid DB or other error. | |
8 | """ | 8 | """ | |
9 | - from bsddb import dbshelve, db | 9 | - from bsddb import dbshelve, db | |
10 | + from bsddb3 import dbshelve, db | 10 | + from bsddb3 import dbshelve, db | |
11 | from gen.db import META, PERSON_TBL | 11 | from gen.db import META, PERSON_TBL | |
12 | env = db.DBEnv() | 12 | env = db.DBEnv() | |
13 | flags = db.DB_CREATE | db.DB_PRIVATE |\ | 13 | flags = db.DB_CREATE | db.DB_PRIVATE |\ |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-ae,v 1.4 2010/05/04 11:05:00 drochner Exp $ | 1 | $NetBSD: patch-ae,v 1.5 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | --- src/gen/db/read.py.orig 2010-03-18 15:39:23.000000000 +0000 | 3 | --- src/gen/db/read.py.orig 2010-03-18 15:39:23.000000000 +0000 | |
4 | +++ src/gen/db/read.py | 4 | +++ src/gen/db/read.py | |
5 | @@ -35,7 +35,7 @@ import random | 5 | @@ -35,7 +35,7 @@ import random | |
6 | import locale | 6 | import locale | |
7 | import os | 7 | import os | |
8 | from sys import maxint | 8 | from sys import maxint | |
9 | -from bsddb import db | 9 | -from bsddb import db | |
10 | +from bsddb3 import db | 10 | +from bsddb3 import db | |
11 | from gen.ggettext import gettext as _ | 11 | from gen.ggettext import gettext as _ | |
12 | 12 | |||
13 | import logging | 13 | import logging |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-an,v 1.1 2010/05/04 11:05:00 drochner Exp $ | 1 | $NetBSD: patch-an,v 1.2 2010/05/18 16:38:53 drochner Exp $ | |
2 | 2 | |||
3 | --- src/GrampsAboutDialog.py.orig 2010-03-15 07:21:34.000000000 +0000 | 3 | --- src/GrampsAboutDialog.py.orig 2010-05-17 05:31:23.000000000 +0000 | |
4 | +++ src/GrampsAboutDialog.py | 4 | +++ src/GrampsAboutDialog.py | |
5 | @@ -30,7 +30,7 @@ | 5 | @@ -30,7 +30,7 @@ | |
6 | from gen.ggettext import gettext as _ | 6 | from gen.ggettext import gettext as _ | |
7 | import os | 7 | import os | |
8 | import sys | 8 | import sys | |
9 | -import bsddb | 9 | -import bsddb | |
10 | +import bsddb3 | 10 | +import bsddb3 as bsddb | |
11 | 11 | |||
12 | ##import logging | 12 | ##import logging | |
13 | ##_LOG = logging.getLogger(".GrampsAboutDialog") | 13 | ##_LOG = logging.getLogger(".GrampsAboutDialog") |