merge minor fixes from 4.0.x

svn: r21908
This commit is contained in:
Jérôme Rapinat 2013-04-06 12:01:08 +00:00
parent 01b4b7dc4e
commit 8fbddda976
4 changed files with 3 additions and 4 deletions

View File

@ -21,7 +21,6 @@ recursive-include windows *
# Remove files created in the build
exclude data/tips.xml
exclude gramps/gen/const.py
exclude gramps/plugins/lib/holidays.xml
exclude po/.intltool-merge-cache
global-exclude *.pyc

2
debian/control vendored
View File

@ -9,7 +9,7 @@ Homepage: http://www.gramps-project.org/
Package: gramps
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-gobject (>= 3.3.2), librsvg2
Depends: ${misc:Depends}, ${python:Depends}, python-gobject (>= 3.3.2), librsvg2-2
Recommends: python-pyicu, python-osmgpsmap, graphviz, xdg-utils
Suggests: ttf-freefont, python-gtkspell, gexiv2, rcs, python-imaging, python-pygoocanvas
Description: Gramps (Genealogical Research and Analysis Management

View File

@ -1 +1 @@
data/man/gramps.1
data/man/gramps.1.in

View File

@ -51,7 +51,7 @@ log = logging.getLogger(".WebPage")
from gramps.gen.lib import Date, Name, NameType, Person
from gramps.gen.lib.date import Today
from gramps.gen.const import PROGRAM_NAME, URL_HOMEPAGE, USER_HOME
from gramps.versioin import VERSION
from gramps.version import VERSION
from gramps.gen.constfunc import win
from gramps.gen.config import config
from gramps.gen.plug.report import Report