From 8fbddda976ffc978e2933dbf74999f752d50a285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Sat, 6 Apr 2013 12:01:08 +0000
Subject: [PATCH] merge minor fixes from 4.0.x

svn: r21908
---
 MANIFEST.in                        | 1 -
 debian/control                     | 2 +-
 debian/gramps.manpages             | 2 +-
 gramps/plugins/webreport/webcal.py | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index f0115cb0d..7329c8d54 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -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
diff --git a/debian/control b/debian/control
index cb8d73fe0..7dff34541 100644
--- a/debian/control
+++ b/debian/control
@@ -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
diff --git a/debian/gramps.manpages b/debian/gramps.manpages
index a8e9b0cf8..7c619bdac 100644
--- a/debian/gramps.manpages
+++ b/debian/gramps.manpages
@@ -1 +1 @@
-data/man/gramps.1
+data/man/gramps.1.in
diff --git a/gramps/plugins/webreport/webcal.py b/gramps/plugins/webreport/webcal.py
index ea96b1c52..e08bb1b66 100644
--- a/gramps/plugins/webreport/webcal.py
+++ b/gramps/plugins/webreport/webcal.py
@@ -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