update to trunk

(bzr r13879.1.11)

35 files changed, 732 insertions, 7 deletions

diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 5e4e0666b..ad41e844a 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -479,6 +479,8 @@ if [ ${add_python} = "true" ]; then
 			$cp_cmd -RL "$packages_path/_imagingcms.so" "$pkgpython"
 			$cp_cmd -RL "$packages_path/_imagingft.so" "$pkgpython"
 			$cp_cmd -RL "$packages_path/_imagingmath.so" "$pkgpython"
+		else  # we build Pillow with +tkinter
+			$cp_cmd -RL "$packages_path/_tkinter.so" "$pkgpython"
 		fi
 		$cp_cmd -RL "$packages_path/sk1libs" "$pkgpython"
 		$cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython"
diff --git a/packaging/macosx/ports/python/py-gobject/Portfile b/packaging/macosx/ports/python/py-gobject/Portfile
new file mode 100644
index 000000000..3503ef1db
--- /dev/null
+++ b/packaging/macosx/ports/python/py-gobject/Portfile
@@ -0,0 +1,77 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem      1.0
+PortGroup       python 1.0
+
+name            py-gobject
+set my_name     pygobject
+version         2.28.6
+revision        101
+epoch           20110613
+set branch      [join [lrange [split ${version} .] 0 1] .]
+categories-append   gnome
+license         LGPL-2.1+
+maintainers     jwa openmaintainer
+platforms       darwin
+python.versions	26 27 33 34
+
+description     Python bindings for GObject.
+
+long_description \
+    PyGObject provides a convenient wrapper for the GObject+ library \
+    for use in Python programs, and takes care of many of the boring details \
+    such as managing memory and type casting. \
+    When combined with PyGTK, PyORBit and gnome-python, \
+    it can be used to write full featured Gnome applications.
+
+homepage        http://www.pygtk.org/
+master_sites    gnome:sources/${my_name}/${branch}/
+distname        ${my_name}-${version}
+use_xz			yes
+
+checksums       rmd160  4bc5e8546a5029d3d6b154629ab3fa4023d96bef \
+                sha256  fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
+
+if {$subport ne $name} {
+    depends_build-append   port:pkgconfig
+    depends_lib-append     path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                port:libffi \
+                port:py${python.version}-cairo \
+    			port:gobject-introspection
+
+    patch.pre_args  -p1
+    patchfiles  patch-pygi-info.c-p1.diff \
+                00git_class_init.patch \
+                00git_fix_qdata_warning.patch \
+                00git_gio_flag_type.patch
+
+    use_configure			yes
+    configure.python        ${python.bin}
+    configure.env-append    PKG_CONFIG_PATH='${python.prefix}/lib/pkgconfig'
+    configure.pre_args      --prefix='${python.prefix}'
+    configure.args-append	--disable-glibtest \
+                            --enable-introspection=no
+    configure.cppflags-append \
+                            -I${python.prefix}/include \
+        -I${prefix}/include/cairo
+    build.cmd		[portbuild::build_getmaketype]
+    build.target	
+
+    destroot.cmd            ${build.cmd}
+    destroot.target         install
+    destroot.destdir        DESTDIR=${destroot}
+
+    test.run        yes
+    test.env        PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*]
+    test.target     check
+
+    post-destroot {
+        set docdir ${prefix}/share/doc/${subport}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \
+            ${destroot}${docdir}
+    }
+}
+
+livecheck.type  none
diff --git a/packaging/macosx/ports/python/py-gobject/files/00git_class_init.patch b/packaging/macosx/ports/python/py-gobject/files/00git_class_init.patch
new file mode 100644
index 000000000..01f79d6ce
--- /dev/null
+++ b/packaging/macosx/ports/python/py-gobject/files/00git_class_init.patch
@@ -0,0 +1,316 @@
+From 9456ba70fdb98b3a4eb7ee2f630182387a54ca00 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Tue, 19 Feb 2013 15:39:56 +0100
+Subject: [PATCH] Move property and signal creation into _class_init()
+
+We must not add class interfaces after g_type_class_ref() has been called the
+first time. Move signal and property creation from pyg_type_register() into
+pyg_object_class_init(), and drop the hack of registering interfaces twice.
+
+This is a backport of commit efcb0f9fd for 2.28.x. This allows old pygtk
+applications to work with pygobject 2.28.x and glib 2.35.x.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694108
+Bug-Ubuntu: https://launchpad.net/bugs/1129309
+---
+ gobject/gobjectmodule.c | 177 +++++++++++++++++++-----------------------------
+ 1 file changed, 70 insertions(+), 107 deletions(-)
+
+diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
+index 2a84606..91f7315 100644
+--- a/gobject/gobjectmodule.c
++++ b/gobject/gobjectmodule.c
+@@ -312,13 +312,6 @@ pyg_object_get_property (GObject *object, guint property_id,
+     pyglib_gil_state_release(state);
+ }
+ 
+-static void
+-pyg_object_class_init(GObjectClass *class, PyObject *py_class)
+-{
+-    class->set_property = pyg_object_set_property;
+-    class->get_property = pyg_object_get_property;
+-}
+-
+ typedef struct _PyGSignalAccumulatorData {
+     PyObject *callable;
+     PyObject *user_data;
+@@ -484,15 +477,14 @@ override_signal(GType instance_type, const gchar *signal_name)
+ }
+ 
+ static PyObject *
+-add_signals (GType instance_type, PyObject *signals)
++add_signals (GObjectClass *klass, PyObject *signals)
+ {
+     gboolean ret = TRUE;
+-    GObjectClass *oclass;
+     Py_ssize_t pos = 0;
+     PyObject *key, *value, *overridden_signals = NULL;
++    GType instance_type = G_OBJECT_CLASS_TYPE (klass);
+ 
+     overridden_signals = PyDict_New();
+-    oclass = g_type_class_ref(instance_type);
+     while (PyDict_Next(signals, &pos, &key, &value)) {
+ 	const gchar *signal_name;
+         gchar *signal_name_canon, *c;
+@@ -530,7 +522,6 @@ add_signals (GType instance_type, PyObject *signals)
+ 	if (!ret)
+ 	    break;
+     }
+-    g_type_class_unref(oclass);
+     if (ret)
+         return overridden_signals;
+     else {
+@@ -800,14 +791,12 @@ pyg_param_spec_from_object (PyObject *tuple)
+ }
+ 
+ static gboolean
+-add_properties (GType instance_type, PyObject *properties)
++add_properties (GObjectClass *klass, PyObject *properties)
+ {
+     gboolean ret = TRUE;
+-    GObjectClass *oclass;
+     Py_ssize_t pos = 0;
+     PyObject *key, *value;
+ 
+-    oclass = g_type_class_ref(instance_type);
+     while (PyDict_Next(properties, &pos, &key, &value)) {
+ 	const gchar *prop_name;
+ 	GType prop_type;
+@@ -873,7 +862,7 @@ add_properties (GType instance_type, PyObject *properties)
+ 	Py_DECREF(slice);
+ 
+ 	if (pspec) {
+-	    g_object_class_install_property(oclass, 1, pspec);
++	    g_object_class_install_property(klass, 1, pspec);
+ 	} else {
+             PyObject *type, *value, *traceback;
+ 	    ret = FALSE;
+@@ -883,7 +872,7 @@ add_properties (GType instance_type, PyObject *properties)
+                 g_snprintf(msg, 256,
+ 			   "%s (while registering property '%s' for GType '%s')",
+                PYGLIB_PyUnicode_AsString(value),
+-			   prop_name, g_type_name(instance_type));
++			   prop_name, G_OBJECT_CLASS_NAME(klass));
+                 Py_DECREF(value);
+                 value = PYGLIB_PyUnicode_FromString(msg);
+             }
+@@ -892,11 +881,63 @@ add_properties (GType instance_type, PyObject *properties)
+ 	}
+     }
+ 
+-    g_type_class_unref(oclass);
+     return ret;
+ }
+ 
+ static void
++pyg_object_class_init(GObjectClass *class, PyObject *py_class)
++{
++    PyObject *gproperties, *gsignals, *overridden_signals;
++    PyObject *class_dict = ((PyTypeObject*) py_class)->tp_dict;
++
++    class->set_property = pyg_object_set_property;
++    class->get_property = pyg_object_get_property;
++
++    /* install signals */
++    /* we look this up in the instance dictionary, so we don't
++     * accidentally get a parent type's __gsignals__ attribute. */
++    gsignals = PyDict_GetItemString(class_dict, "__gsignals__");
++    if (gsignals) {
++	if (!PyDict_Check(gsignals)) {
++	    PyErr_SetString(PyExc_TypeError,
++			    "__gsignals__ attribute not a dict!");
++	    return;
++	}
++	if (!(overridden_signals = add_signals(class, gsignals))) {
++	    return;
++	}
++        if (PyDict_SetItemString(class_dict, "__gsignals__",
++				 overridden_signals)) {
++            return;
++        }
++        Py_DECREF(overridden_signals);
++
++        PyDict_DelItemString(class_dict, "__gsignals__");
++    } else {
++	PyErr_Clear();
++    }
++
++    /* install properties */
++    /* we look this up in the instance dictionary, so we don't
++     * accidentally get a parent type's __gproperties__ attribute. */
++    gproperties = PyDict_GetItemString(class_dict, "__gproperties__");
++    if (gproperties) {
++	if (!PyDict_Check(gproperties)) {
++	    PyErr_SetString(PyExc_TypeError,
++			    "__gproperties__ attribute not a dict!");
++	    return;
++	}
++	if (!add_properties(class, gproperties)) {
++	    return;
++	}
++	PyDict_DelItemString(class_dict, "__gproperties__");
++	/* Borrowed reference. Py_DECREF(gproperties); */
++    } else {
++	PyErr_Clear();
++    }
++}
++
++static void
+ pyg_register_class_init(GType gtype, PyGClassInitFunc class_init)
+ {
+     GSList *list;
+@@ -1068,7 +1109,7 @@ pygobject__g_instance_init(GTypeInstance   *instance,
+  */
+ static void
+ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+-                        PyObject *bases, gboolean new_interfaces,
++                        PyObject *bases,
+                         GType *parent_interfaces, guint n_parent_interfaces)
+ {
+     int i;
+@@ -1082,7 +1123,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+         guint k;
+         PyObject *base = PyTuple_GET_ITEM(bases, i);
+         GType itype;
+-        gboolean is_new = TRUE;
+         const GInterfaceInfo *iinfo;
+         GInterfaceInfo iinfo_copy;
+ 
+@@ -1099,16 +1139,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+         if (!G_TYPE_IS_INTERFACE(itype))
+             continue;
+ 
+-        for (k = 0; k < n_parent_interfaces; ++k) {
+-            if (parent_interfaces[k] == itype) {
+-                is_new = FALSE;
+-                break;
+-            }
+-        }
+-
+-        if ((new_interfaces && !is_new) || (!new_interfaces && is_new))
+-            continue;
+-
+         iinfo = pyg_lookup_interface_info(itype);
+         if (!iinfo) {
+             gchar *error;
+@@ -1129,7 +1159,7 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type,
+ int
+ pyg_type_register(PyTypeObject *class, const char *type_name)
+ {
+-    PyObject *gtype, *gsignals, *gproperties, *overridden_signals;
++    PyObject *gtype;
+     GType parent_type, instance_type;
+     GType *parent_interfaces;
+     guint n_parent_interfaces;
+@@ -1216,88 +1246,22 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
+     }
+ 
+     /*
+-     * Note: Interfaces to be implemented are searched twice.  First
+-     * we register interfaces that are already implemented by a parent
+-     * type.  The second time, the remaining interfaces are
+-     * registered, i.e. the ones that are not implemented by a parent
+-     * type.  In between these two loops, properties and signals are
+-     * registered.  It has to be done this way, in two steps,
+-     * otherwise glib will complain.  If registering all interfaces
+-     * always before properties, you get an error like:
+-     *
+-     *    ../gobject:121: Warning: Object class
+-     *    test_interface+MyObject doesn't implement property
+-     *    'some-property' from interface 'TestInterface'
+-     *
+-     * If, on the other hand, you register interfaces after
+-     * registering the properties, you get something like:
+-     *
+-     *     ../gobject:121: Warning: cannot add interface type
+-     *    `TestInterface' to type `test_interface+MyUnknown', since
+-     *    type `test_interface+MyUnknown' already conforms to
+-     *    interface
+-     *
+-     * This looks like a GLib quirk, but no bug has been filed
+-     * upstream.  However we have a unit test for this particular
+-     * problem, which can be found in test_interfaces.py, class
+-     * TestInterfaceImpl.
++     * Note, all interfaces need to be registered before the first
++     * g_type_class_ref(), see bug #686149.
+      *
+      * See also comment above pyg_type_add_interfaces().
+      */
+-    pyg_type_add_interfaces(class, instance_type, class->tp_bases, FALSE,
++    pyg_type_add_interfaces(class, instance_type, class->tp_bases,
+                             parent_interfaces, n_parent_interfaces);
+ 
+-    /* we look this up in the instance dictionary, so we don't
+-     * accidentally get a parent type's __gsignals__ attribute. */
+-    gsignals = PyDict_GetItemString(class->tp_dict, "__gsignals__");
+-    if (gsignals) {
+-	if (!PyDict_Check(gsignals)) {
+-	    PyErr_SetString(PyExc_TypeError,
+-			    "__gsignals__ attribute not a dict!");
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-	if (!(overridden_signals = add_signals(instance_type, gsignals))) {
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-        if (PyDict_SetItemString(class->tp_dict, "__gsignals__",
+-				 overridden_signals)) {
+-            g_free(parent_interfaces);
+-            return -1;
+-        }
+-        Py_DECREF(overridden_signals);
+-    } else {
+-	PyErr_Clear();
+-    }
+ 
+-    /* we look this up in the instance dictionary, so we don't
+-     * accidentally get a parent type's __gsignals__ attribute. */
+-    gproperties = PyDict_GetItemString(class->tp_dict, "__gproperties__");
+-    if (gproperties) {
+-	if (!PyDict_Check(gproperties)) {
+-	    PyErr_SetString(PyExc_TypeError,
+-			    "__gproperties__ attribute not a dict!");
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-	if (!add_properties(instance_type, gproperties)) {
+-            g_free(parent_interfaces);
+-	    return -1;
+-	}
+-	PyDict_DelItemString(class->tp_dict, "__gproperties__");
+-	/* Borrowed reference. Py_DECREF(gproperties); */
+-    } else {
+-	PyErr_Clear();
++    gclass = g_type_class_ref(instance_type);
++    if (PyErr_Occurred() != NULL) {
++        g_type_class_unref(gclass);
++        g_free(parent_interfaces);
++        return -1;
+     }
+ 
+-    /* Register new interfaces, that are _not_ already defined by
+-     * the parent type.  FIXME: See above.
+-     */
+-    pyg_type_add_interfaces(class, instance_type, class->tp_bases, TRUE,
+-                            parent_interfaces, n_parent_interfaces);
+-
+-    gclass = g_type_class_ref(instance_type);
+     if (pyg_run_class_init(instance_type, gclass, class)) {
+         g_type_class_unref(gclass);
+         g_free(parent_interfaces);
+@@ -1306,9 +1270,8 @@ pyg_type_register(PyTypeObject *class, const char *type_name)
+     g_type_class_unref(gclass);
+     g_free(parent_interfaces);
+ 
+-    if (gsignals)
+-        PyDict_DelItemString(class->tp_dict, "__gsignals__");
+-
++    if (PyErr_Occurred() != NULL)
++        return -1;
+     return 0;
+ }
+ 
+-- 
+1.8.1.2
+
diff --git a/packaging/macosx/ports/python/py-gobject/files/00git_fix_qdata_warning.patch b/packaging/macosx/ports/python/py-gobject/files/00git_fix_qdata_warning.patch
new file mode 100644
index 000000000..ed4b5d2b9
--- /dev/null
+++ b/packaging/macosx/ports/python/py-gobject/files/00git_fix_qdata_warning.patch
@@ -0,0 +1,28 @@
+From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001
+From: Ivan Stankovic <ivan.stankovic@avl.com>
+Date: Tue, 21 Feb 2012 12:24:58 +0100
+Subject: [PATCH 1/2] Fix set_qdata warning on accessing NULL gobject property
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661155
+---
+ gobject/pygobject.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/gobject/pygobject.c b/gobject/pygobject.c
+index 6c2f06c..70dc89a 100644
+--- a/gobject/pygobject.c
++++ b/gobject/pygobject.c
+@@ -991,7 +991,9 @@ pygobject_new(GObject *obj)
+ PyObject *
+ pygobject_new_sunk(GObject *obj)
+ {
+-    g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++    if (obj)
++       g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1));
++       
+     return pygobject_new_full(obj, TRUE, NULL);
+ }
+ 
+-- 
+1.7.9.1
+
diff --git a/packaging/macosx/ports/python/py-gobject/files/00git_gio_flag_type.patch b/packaging/macosx/ports/python/py-gobject/files/00git_gio_flag_type.patch
new file mode 100644
index 000000000..78e7ddfd5
--- /dev/null
+++ b/packaging/macosx/ports/python/py-gobject/files/00git_gio_flag_type.patch
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+1.7.9.1
+
diff --git a/packaging/macosx/ports/python/py-gobject/files/patch-pygi-info.c-p1.diff b/packaging/macosx/ports/python/py-gobject/files/patch-pygi-info.c-p1.diff
new file mode 100644
index 000000000..b5a3d519d
--- /dev/null
+++ b/packaging/macosx/ports/python/py-gobject/files/patch-pygi-info.c-p1.diff
@@ -0,0 +1,28 @@
+--- a/gi/pygi-info.c.orig	2014-01-15 09:16:11.000000000 +0200
++++ b/gi/pygi-info.c	2014-01-15 09:16:52.000000000 +0200
+@@ -162,9 +162,6 @@
+         case GI_INFO_TYPE_CONSTANT:
+             type = &PyGIConstantInfo_Type;
+             break;
+-        case GI_INFO_TYPE_ERROR_DOMAIN:
+-            type = &PyGIErrorDomainInfo_Type;
+-            break;
+         case GI_INFO_TYPE_UNION:
+             type = &PyGIUnionInfo_Type;
+             break;
+@@ -481,7 +478,6 @@
+                 case GI_INFO_TYPE_INVALID:
+                 case GI_INFO_TYPE_FUNCTION:
+                 case GI_INFO_TYPE_CONSTANT:
+-                case GI_INFO_TYPE_ERROR_DOMAIN:
+                 case GI_INFO_TYPE_VALUE:
+                 case GI_INFO_TYPE_SIGNAL:
+                 case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@
+                     case GI_INFO_TYPE_INVALID:
+                     case GI_INFO_TYPE_FUNCTION:
+                     case GI_INFO_TYPE_CONSTANT:
+-                    case GI_INFO_TYPE_ERROR_DOMAIN:
+                     case GI_INFO_TYPE_VALUE:
+                     case GI_INFO_TYPE_SIGNAL:
+                     case GI_INFO_TYPE_PROPERTY:
diff --git a/packaging/scripts/lp-mark-bugs-released b/packaging/scripts/lp-mark-bugs-released
new file mode 100755
index 000000000..f18f1468a
--- /dev/null
+++ b/packaging/scripts/lp-mark-bugs-released
@@ -0,0 +1,75 @@
+#!/usr/bin/python
+
+# Copyright (c) 2010 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3 as published
+# by the # Free Software Foundation
+#
+# lp-mark-bugs-released is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+
+'''Mark bugs that are Fix Committed on a release to be Fix Released'''
+
+import datetime
+import os
+import sys
+import tempfile
+
+from launchpadlib.launchpad import Launchpad
+from launchpadlib.errors import HTTPError
+
+opt_dry_run = True
+
+def mark_released (bug):
+    if bug.status == 'Fix Committed':
+        print "Marking bug " + str(bug.bug.id) + " as 'Fix Released'"
+        bug.status = "Fix Released"
+        if not opt_dry_run:
+            bug.lp_save()
+
+def main():
+    if len(sys.argv) != 3:
+        print >> sys.stderr, '''Mark bugs 'Fix Committed' on a release as released
+
+    Usage: %s <project name> <version>''' % sys.argv[0]
+        sys.exit(1)
+
+    (project, version) = sys.argv[1:]
+
+    try:
+        launchpad = Launchpad.login_with('ubuntu-dev-tools', 'production')
+    except Exception, error:
+        print >> sys.stderr, 'Could not connect to Launchpad:', str(error)
+        sys.exit(2)
+
+    try:
+        # Look up the project using the Launchpad instance.
+        proj = launchpad.projects[project]
+        # Find the release in the project's releases collection.
+        release = None
+        for rel in proj.releases:
+            if rel.version == version:
+                release = rel
+                break
+        if not release:
+            print >> sys.stderr, '''Unable to find release: %s''' % version
+            sys.exit(1)
+
+        # Mark any fix committed bugs released
+        for task in release.milestone.searchTasks(status="Fix Committed"):
+            if task.milestone is None:
+                for othertask in task.related_tasks:
+                    if othertask.milestone.name == release.milestone.name:
+                        mark_released(othertask)
+            else:
+                mark_released(task)
+
+    except HTTPError, error:
+        print 'An error happened in the upload:', error.content
+        sys.exit(1)
+
+if __name__ == '__main__':
+    main()
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 71b5bc16b..fe2d9bb9d 100755
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -125,6 +125,7 @@ ShowUninstDetails hide
 !insertmacro INKLANGFILE German
 !insertmacro INKLANGFILE Greek
 !insertmacro INKLANGFILE Indonesian
+!insertmacro INKLANGFILE Icelandics
 !insertmacro INKLANGFILE Italian
 !insertmacro INKLANGFILE Japanese
 !insertmacro INKLANGFILE Polish
@@ -236,7 +237,7 @@ VIProductVersion ${VERSION_X.X.X.X}
 VIAddVersionKey ProductName Inkscape
 VIAddVersionKey Comments "Licensed under the GNU GPL"
 VIAddVersionKey CompanyName inkscape.org
-VIAddVersionKey LegalCopyright "© 2012 Inkscape"
+VIAddVersionKey LegalCopyright "© 2015 Inkscape"
 VIAddVersionKey FileDescription Inkscape
 VIAddVersionKey FileVersion ${VERSION_X.X.X.X}
 VIAddVersionKey ProductVersion ${VERSION_X.X.X.X}
@@ -543,6 +544,7 @@ SectionGroup "$(Languages)" SecLanguages ; Languages sections {{{
   !insertmacro Language Hungarian         hu
   !insertmacro Language Armenian          hy
   !insertmacro Language Indonesian        id
+  !insertmacro Language Icelandic         is
   !insertmacro Language Italian           it
   !insertmacro Language Japanese          ja
   !insertmacro Language Khmer             km
@@ -672,6 +674,7 @@ Function .onInit ; initialise the installer {{{2
   !insertmacro LanguageAutoSelect German        1031
   !insertmacro LanguageAutoSelect Greek         1032
   !insertmacro LanguageAutoSelect Indonesian    1057
+  !insertmacro LanguageAutoSelect Icelandic     861
   !insertmacro LanguageAutoSelect Italian       1040
   !insertmacro LanguageAutoSelect Japanese      1041
   !insertmacro LanguageAutoSelect Polish        1045
@@ -806,6 +809,7 @@ Function .onInit ; initialise the installer {{{2
   !insertmacro Parameter hu             ${SecHungarian}
   !insertmacro Parameter hy             ${SecArmenian}
   !insertmacro Parameter id             ${SecIndonesian}
+  !insertmacro Parameter is             ${SecIcelandic}
   !insertmacro Parameter it             ${SecItalian}
   !insertmacro Parameter ja             ${SecJapanese}
   !insertmacro Parameter km             ${SecKhmer}
diff --git a/packaging/win32/languages/Breton.nsh b/packaging/win32/languages/Breton.nsh
index 198410360..c73ced5aa 100644
--- a/packaging/win32/languages/Breton.nsh
+++ b/packaging/win32/languages/Breton.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Kroateg"
 ${LangFileString} lng_hu "Hungareg"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indoneseg"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italianeg"
 ${LangFileString} lng_ja "Japoneg"
 ${LangFileString} lng_km "Khmereg"
diff --git a/packaging/win32/languages/Catalan.nsh b/packaging/win32/languages/Catalan.nsh
index 01dc65597..7f3a967df 100644
--- a/packaging/win32/languages/Catalan.nsh
+++ b/packaging/win32/languages/Catalan.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_id "Indonesi"
 ${LangFileString} lng_hr "Croat"
 ${LangFileString} lng_hu "Hongar�s"
 ${LangFileString} lng_hy "Armenian"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Itali�"
 ${LangFileString} lng_ja "Japon�s"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Czech.nsh b/packaging/win32/languages/Czech.nsh
index cbd8866c8..50c830a82 100644
--- a/packaging/win32/languages/Czech.nsh
+++ b/packaging/win32/languages/Czech.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Chorvat�tina"
 ${LangFileString} lng_hu "Ma�ar�tina"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Ital�tina"
 ${LangFileString} lng_ja "Japon�tina"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Dutch.nsh b/packaging/win32/languages/Dutch.nsh
index d207d3411..6ee5a6875 100644
--- a/packaging/win32/languages/Dutch.nsh
+++ b/packaging/win32/languages/Dutch.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Kroatisch"
 ${LangFileString} lng_hu "Hongaars"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesisch"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiaans"
 ${LangFileString} lng_ja "Japans"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/English.nsh b/packaging/win32/languages/English.nsh
index ea1ed72af..856adbcde 100644
--- a/packaging/win32/languages/English.nsh
+++ b/packaging/win32/languages/English.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Croatian"
 ${LangFileString} lng_hu "Hungarian"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italian"
 ${LangFileString} lng_ja "Japanese"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Finnish.nsh b/packaging/win32/languages/Finnish.nsh
index 9b2f04401..fc5d0be9b 100644
--- a/packaging/win32/languages/Finnish.nsh
+++ b/packaging/win32/languages/Finnish.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "kroatia"
 ${LangFileString} lng_hu "unkari"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "italia"
 ${LangFileString} lng_ja "japani"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/French.nsh b/packaging/win32/languages/French.nsh
index 40650d42f..7d14f19e3 100644
--- a/packaging/win32/languages/French.nsh
+++ b/packaging/win32/languages/French.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Croatian"
 ${LangFileString} lng_hu "Hongrois"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indon�sien"
+${LangFileString} lng_is "Islandais"
 ${LangFileString} lng_it "Italien"
 ${LangFileString} lng_ja "Japonais"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Galician.nsh b/packaging/win32/languages/Galician.nsh
index 61b76475e..d151c552e 100644
--- a/packaging/win32/languages/Galician.nsh
+++ b/packaging/win32/languages/Galician.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Croata"
 ${LangFileString} lng_hu "H�ngaro"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesio"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Xapon�s"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/German.nsh b/packaging/win32/languages/German.nsh
index 88a5c4b69..7c5438b79 100644
--- a/packaging/win32/languages/German.nsh
+++ b/packaging/win32/languages/German.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Kroatisch"
 ${LangFileString} lng_hu "Ungarisch"
 ${LangFileString} lng_hy "Armenisch"
 ${LangFileString} lng_id "Indonesian"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italienisch"
 ${LangFileString} lng_ja "Japanisch"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Greek.nsh b/packaging/win32/languages/Greek.nsh
index 4b6a1a3ad..c8955aa63 100644
--- a/packaging/win32/languages/Greek.nsh
+++ b/packaging/win32/languages/Greek.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "��������"
 ${LangFileString} lng_hu "��������"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "�����������"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "�������"
 ${LangFileString} lng_ja "�����������"
 ${LangFileString} lng_km "����"
diff --git a/packaging/win32/languages/Hebrew.nsh b/packaging/win32/languages/Hebrew.nsh
index 173f6810e..7c677f714 100644
--- a/packaging/win32/languages/Hebrew.nsh
+++ b/packaging/win32/languages/Hebrew.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "�������"
 ${LangFileString} lng_hu "�������"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "���������"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "�������"
 ${LangFileString} lng_ja "�����"
 ${LangFileString} lng_km "�����"
diff --git a/packaging/win32/languages/Icelandic.nsh b/packaging/win32/languages/Icelandic.nsh
new file mode 100644
index 000000000..c84251e20
--- /dev/null
+++ b/packaging/win32/languages/Icelandic.nsh
@@ -0,0 +1,118 @@
+;Language: Icelandic (861, CP1252)
+;By Adib Taraben <theadib@gmail.com>
+;Translation by Sveinn � Felli <sv1@fellsnet.is>
+${LangFileString} CaptionDescription "Opin� og frj�lst teikniforrit fyrir vigramyndir (Scalable Vector Graphics)"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) er gefi� �t me� GNU General Public License (GPL) notkunarleyfinu. Notkunarleyfi� er haft h�r me� eing�ngu til uppl�singar. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape hefur �egar veri� sett upp af notandanum $0.$\r$\nEf �� heldur �fram g�ti veri� a� uppsetningin heppna�ist ekki!$\r$\nSkr��u �ig inn sem $0 og reyndu aftur."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 hefur �egar veri� sett upp. $\nViltu fjarl�gja fyrri �tg�funa ��ur en �� setur upp $(^Name)?"
+${LangFileString} OK_CANCEL_DESC "$\n$\n�ttu � '� lagi / OK' til a� halda �fram e�a � 'H�tta vi� / CANCEL' til a� h�tta vi�."
+${LangFileString} NO_ADMIN "�� ert ekki me� kerfisstj�rar�ttindi.$\r$\nUppsetning Inkscape fyrir alla notendur er ekki l�kleg til a� heppnast.$\r$\nTaktu haki� �r 'Setja upp fyrir alla notendur' valkostinum."
+${LangFileString} NOT_SUPPORTED "Inkscape keyrir ekki � Windows 95/98/ME!$\r$\nSko�a�u opinberu heimas��una til a� sj� �tarlegri uppl�singar."
+${LangFileString} Full "Full"
+${LangFileString} Optimal "Bestu�"
+${LangFileString} Minimal "L�gmarks"
+${LangFileString} Core "Inkscape SVG ritillinn (krafist)"
+${LangFileString} CoreDesc "Kjarni Inkscape skr�a og dll a�ger�as�fn"
+${LangFileString} GTKFiles "GTK+ keyrsluumhverfi (krafist)"
+${LangFileString} GTKFilesDesc "Fj�lkerfa myndr�nt GUI t�lasett, nota� af Inkscape"
+${LangFileString} Shortcuts "Fl�tilei�ir"
+${LangFileString} ShortcutsDesc "Fl�tilei�ir til a� r�sa Inkscape"
+${LangFileString} Alluser "Setja upp fyrir alla notendur"
+${LangFileString} AlluserDesc "Setja �etta forrit upp fyrir alla sem nota �essa t�lvu (allir notendur)"
+${LangFileString} Desktop "Skj�bor�"
+${LangFileString} DesktopDesc "B�a til fl�tilei� fyrir Inkscape � skj�bor�inu (Desktop)"
+${LangFileString} Startmenu "A�alvalmynd"
+${LangFileString} StartmenuDesc "B�a til f�rslu � a�alvalmynd (Start Menu) fyrir Inkscape"
+${LangFileString} Quicklaunch "Fl�tir�sing"
+${LangFileString} QuicklaunchDesc "B�a til fl�tilei� fyrir Inkscape � fl�tir�sistikunni (Quick Launch)"
+${LangFileString} SVGWriter "Opna SVG skr�r me� Inkscape"
+${LangFileString} SVGWriterDesc "Velja Inkscape sem sj�lfgefi� forrit til a� vinna me� SVG skr�r"
+${LangFileString} ContextMenu "Samhengisvalmynd"
+${LangFileString} ContextMenuDesc "B�ta Inkscape inn � samhengisvalmynd (Context Menu) fyrir SVG skr�r"
+${LangFileString} DeletePrefs "Ey�a pers�nulegum kj�rstillingum"
+${LangFileString} DeletePrefsDesc "Ey�a pers�nulegum kj�rstillingum sem hafa or�i� eftir fr� fyrri uppsetningum"
+${LangFileString} Addfiles "Vi�b�tarskr�r"
+${LangFileString} AddfilesDesc "Vi�b�tarskr�r"
+${LangFileString} Examples "S�nid�mi"
+${LangFileString} ExamplesDesc "S�nid�mi um notkun Inkscape"
+${LangFileString} Tutorials "Kennsluefni"
+${LangFileString} TutorialsDesc "Kennsluefni fyrir notkun Inkscape"
+${LangFileString} Languages "���ingar"
+${LangFileString} LanguagesDesc "Setja inn �msar ���ingar � Inkscape"
+${LangFileString} lng_am "Amhar�ska"
+${LangFileString} lng_ar "Arab�ska"
+${LangFileString} lng_az "Azerbadjanska"
+${LangFileString} lng_be "Hv�tr�ssneska"
+${LangFileString} lng_bg "B�lgarska"
+${LangFileString} lng_bn "Bengalska"
+${LangFileString} lng_bn_BD "Bangladesh bengalska"
+${LangFileString} lng_br "Bret�nska"
+${LangFileString} lng_ca "Katal�nska"
+${LangFileString} lng_ca@valencia "Valens��nsk katal�nska"
+${LangFileString} lng_cs "T�kkneska"
+${LangFileString} lng_da "Danska"
+${LangFileString} lng_de "��ska"
+${LangFileString} lng_dz "Dzongkha"
+${LangFileString} lng_el "Gr�ska"
+${LangFileString} lng_en "Enska"
+${LangFileString} lng_en_AU "�str�lsk enska"
+${LangFileString} lng_en_CA "Kanad�sk enska"
+${LangFileString} lng_en_GB "Bresk enska"
+${LangFileString} lng_en_US@piglatin "Pig Lat�na"
+${LangFileString} lng_eo "Esperant�"
+${LangFileString} lng_es "Sp�nska"
+${LangFileString} lng_es_MX "Mex�k�nsk sp�nska"
+${LangFileString} lng_et "Eistneska"
+${LangFileString} lng_eu "Baskneska"
+${LangFileString} lng_fa "Farsi"
+${LangFileString} lng_fi "Finnska"
+${LangFileString} lng_fr "Franska"
+${LangFileString} lng_ga "�rska"
+${LangFileString} lng_gl "Galis�ska"
+${LangFileString} lng_he "Hebreska"
+${LangFileString} lng_hr "Kr�at�ska"
+${LangFileString} lng_hu "Ungverska"
+${LangFileString} lng_hy "Armenska"
+${LangFileString} lng_id "Ind�nes�ska"
+${LangFileString} lng_is "�slenska"
+${LangFileString} lng_it "�talska"
+${LangFileString} lng_ja "Japanska"
+${LangFileString} lng_km "Khmer�ska"
+${LangFileString} lng_ko "K�reska"
+${LangFileString} lng_lt "Lith�enska"
+${LangFileString} lng_lv "Lettneska"
+${LangFileString} lng_mk "Maked�nska"
+${LangFileString} lng_mn "Mong�lska"
+${LangFileString} lng_ne "Nepalska"
+${LangFileString} lng_nb "Norskt b�km�l"
+${LangFileString} lng_nl "Hollenska"
+${LangFileString} lng_nn "N�norska"
+${LangFileString} lng_pa "Panjabi"
+${LangFileString} lng_pl "P�lska"
+${LangFileString} lng_pt "Port�galska"
+${LangFileString} lng_pt_BR "Brasil�sk port�galska"
+${LangFileString} lng_ro "R�menska"
+${LangFileString} lng_ru "R�ssneska"
+${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sk "Sl�vak�ska"
+${LangFileString} lng_sl "Sl�venska"
+${LangFileString} lng_sq "Albanska"
+${LangFileString} lng_sr "Serbneska"
+${LangFileString} lng_sr@latin "Serbneska me� latnesku letri"
+${LangFileString} lng_sv "S�nska"
+${LangFileString} lng_te "Tel�g�"
+${LangFileString} lng_th "T�lenska"
+${LangFileString} lng_tr "Tyrkneska"
+${LangFileString} lng_uk "�kra�nska"
+${LangFileString} lng_vi "V�etnamska"
+${LangFileString} lng_zh_CN "Einf�ldu� k�nverska"
+${LangFileString} lng_zh_TW "Hef�bundin k�nverska"
+${LangFileString} UInstOpt "Valkostir vi� fjarl�gingu"
+${LangFileString} UInstOpt1 "�kveddu hva� �� vilt gera fyrir �essa aukavalkosti"
+${LangFileString} PurgePrefs "Halda pers�nulegum kj�rstillingum"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log fannst ekki!$\r$\nFjarl�g�u forriti� me� �v� a� hreinsa �t �r m�ppunni $INSTDIR yourself!"
+${LangFileString} FileChanged "Skr�in $filename hefur breyst eftir uppsetningu.$\r$\nViltu samt ey�a �essari skr�?"
+${LangFileString} Yes "J�"
+${LangFileString} AlwaysYes "alltaf svara J�"
+${LangFileString} No "Nei"
+${LangFileString} AlwaysNo "alltaf svara Nei"
diff --git a/packaging/win32/languages/Indonesian.nsh b/packaging/win32/languages/Indonesian.nsh
index 5f002f642..f64c884a9 100644
--- a/packaging/win32/languages/Indonesian.nsh
+++ b/packaging/win32/languages/Indonesian.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Kroasia"
 ${LangFileString} lng_hu "Hongaria"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Bahasa Indonesia"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italia"
 ${LangFileString} lng_ja "Jepang"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Italian.nsh b/packaging/win32/languages/Italian.nsh
index 57e9d5441..234694e8e 100644
--- a/packaging/win32/languages/Italian.nsh
+++ b/packaging/win32/languages/Italian.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Croato"
 ${LangFileString} lng_hu "Ungherese"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesiano"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Giopponese"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Japanese.nsh b/packaging/win32/languages/Japanese.nsh
index 7174cde56..6cb58c2d9 100644
--- a/packaging/win32/languages/Japanese.nsh
+++ b/packaging/win32/languages/Japanese.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "�N���A�`�A��"
 ${LangFileString} lng_hu "�n���K���[��"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "�C���h�l�V�A��"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "�C�^���A��"
 ${LangFileString} lng_ja "���{��"
 ${LangFileString} lng_km "�N���[����"
diff --git a/packaging/win32/languages/Polish.nsh b/packaging/win32/languages/Polish.nsh
index 4f58f5337..0e184d616 100644
--- a/packaging/win32/languages/Polish.nsh
+++ b/packaging/win32/languages/Polish.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Chorwacki"
 ${LangFileString} lng_hu "W�gierski"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonezyjski"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "W�oski"
 ${LangFileString} lng_ja "Japo�ski"
 ${LangFileString} lng_km "Kmerski"
diff --git a/packaging/win32/languages/PortugueseBR.nsh b/packaging/win32/languages/PortugueseBR.nsh
index 530679d8d..ef15c0ca2 100644
--- a/packaging/win32/languages/PortugueseBR.nsh
+++ b/packaging/win32/languages/PortugueseBR.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_hr "Croata"
 ${LangFileString} lng_hu "H�ngaro"
 ${LangFileString} lng_id "Indon�sio"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Japon�s"
 ${LangFileString} lng_km "Khmer"
diff --git a/packaging/win32/languages/Romanian.nsh b/packaging/win32/languages/Romanian.nsh
index 076a71a0c..bae1c4fc2 100644
--- a/packaging/win32/languages/Romanian.nsh
+++ b/packaging/win32/languages/Romanian.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Croat�"
 ${LangFileString} lng_hu "Maghiar�"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonezian�"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italian�"
 ${LangFileString} lng_ja "Japonez�"
 ${LangFileString} lng_km "Khmer�"
diff --git a/packaging/win32/languages/Russian.nsh b/packaging/win32/languages/Russian.nsh
index 374484438..9b75a0a3e 100644
--- a/packaging/win32/languages/Russian.nsh
+++ b/packaging/win32/languages/Russian.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "����������"
 ${LangFileString} lng_hu "����������"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "�������������"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "�����������"
 ${LangFileString} lng_ja "��������"
 ${LangFileString} lng_km "���������"
diff --git a/packaging/win32/languages/SimpChinese.nsh b/packaging/win32/languages/SimpChinese.nsh
index 742dd2db9..a06918a4b 100644
--- a/packaging/win32/languages/SimpChinese.nsh
+++ b/packaging/win32/languages/SimpChinese.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "???ް???????"
 ${LangFileString} lng_hu "????????"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "ӡ????"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "????????"
 ${LangFileString} lng_ja "????"
 ${LangFileString} lng_km "??????"
diff --git a/packaging/win32/languages/Slovak.nsh b/packaging/win32/languages/Slovak.nsh
index 5d635daf8..6d98b70e9 100644
--- a/packaging/win32/languages/Slovak.nsh
+++ b/packaging/win32/languages/Slovak.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "chorv�t�ina"
 ${LangFileString} lng_hu "ma�ar�ina"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "indon�z�tina"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "talian�ina"
 ${LangFileString} lng_ja "japon�ina"
 ${LangFileString} lng_km "khm�r�ina"
diff --git a/packaging/win32/languages/Slovenian.nsh b/packaging/win32/languages/Slovenian.nsh
index 2b64519e6..f5562b502 100644
--- a/packaging/win32/languages/Slovenian.nsh
+++ b/packaging/win32/languages/Slovenian.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "hrva�ki"
 ${LangFileString} lng_hu "mad�arski"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "indonezijski"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "italijanski"
 ${LangFileString} lng_ja "japonski"
 ${LangFileString} lng_km "kmerski"
diff --git a/packaging/win32/languages/Spanish.nsh b/packaging/win32/languages/Spanish.nsh
index 509a2bc13..be38de68c 100644
--- a/packaging/win32/languages/Spanish.nsh
+++ b/packaging/win32/languages/Spanish.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "Croata"
 ${LangFileString} lng_hu "H�ngaro"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesio"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Japon�s"
 ${LangFileString} lng_km "Jemer"
diff --git a/packaging/win32/languages/TradChinese.nsh b/packaging/win32/languages/TradChinese.nsh
index bf19fed87..d38e6a872 100644
--- a/packaging/win32/languages/TradChinese.nsh
+++ b/packaging/win32/languages/TradChinese.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "�Jù�J��Ȼy"
 ${LangFileString} lng_hu "�I���Q�y"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "�L���y"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "�q�j�Q��"
 ${LangFileString} lng_ja "���"
 ${LangFileString} lng_km "���ֻy"
diff --git a/packaging/win32/languages/Ukrainian.nsh b/packaging/win32/languages/Ukrainian.nsh
index 3ba057f7a..1db81f196 100644
--- a/packaging/win32/languages/Ukrainian.nsh
+++ b/packaging/win32/languages/Ukrainian.nsh
@@ -73,6 +73,7 @@ ${LangFileString} lng_hr "�����������"
 ${LangFileString} lng_hu "���������"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "�������������"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "����������"
 ${LangFileString} lng_ja "���������"
 ${LangFileString} lng_km "����������"
diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs
index 6dbb6cdfc..0f1e9f2b9 100644
--- a/packaging/wix/inkscape.wxs
+++ b/packaging/wix/inkscape.wxs
@@ -2,15 +2,18 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

 	<?include version.wxi?>

 

+    <!-- change Product Id for every new version and subversion, do not change UpgradeCode -->

 	<Product Name="$(var.FullProductName)" Id='81922150-317e-4bb0-a31d-ff1c14f707c5' UpgradeCode='4d5fedaa-84a0-48be-bd2a-08246398361a' Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='inkscape.org'>

 

 		<Package Id='*' Keywords='Installer' Description="Inkscape Installer" Comments='inkscape is registered trademark of inkscape.org' Manufacturer='inkscape.org' InstallerVersion='$(var.InstallerVersion)' Platform='$(var.Platform)' Languages='1033' Compressed='yes' SummaryCodepage='1252' />

-

+        

 		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />

 		<Property Id='DiskPrompt' Value="inkscape Installation [1]" />

 

 		<Property Id='ALLUSERS' Value="2" />

-

+        

+        <MajorUpgrade DowngradeErrorMessage="A newer version is already installed." />

+		

 		<DirectoryRef Id="ApplicationProgramsFolder">

 			<Component Id="ApplicationShortcut" Guid="37de8ea4-e83a-4e40-8f9c-c6066b78d935" Win64='$(var.Win64)' >

 				<Shortcut Id="ApplicationStartMenuShortcut" 

@@ -22,7 +25,7 @@
 								Name="Inkscape Homepage"

 									   Target="http://www.inkscape.org/"/>

 				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>

-				<RegistryValue Root="HKCU" Key="Software\Microsoft\MyApplicationName" Name="installed" Type="integer" Value="1" KeyPath="yes"/>

+				<RegistryValue Root="HKCU" Key="Software\inkscape.org\Inkscape" Name="startmenu_installed" Type="integer" Value="1" KeyPath="yes"/>

 			</Component>

 		</DirectoryRef>

 

@@ -31,7 +34,7 @@
 				<!-- Shortcut Id="desktopFoobar10" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' Icon="file_inkscape_exe" IconIndex="0" / -->

 				<Shortcut Id="desktopFoobar10" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' />

 				<RemoveFolder Id="DesktopFolder" On="uninstall"/>

-				<RegistryValue Root="HKCU" Key="Software\Microsoft\MyApplicationName" Name="installed" Type="integer" Value="1" KeyPath="yes"/>

+				<RegistryValue Root="HKCU" Key="Software\inkscape.org\Inkscape" Name="desktop_installed" Type="integer" Value="1" KeyPath="yes"/>

 			</Component>

 		</DirectoryRef>

 

diff --git a/packaging/wix/wixenv.bat b/packaging/wix/wixenv.bat
index c798a9ce1..2cddd7146 100644
--- a/packaging/wix/wixenv.bat
+++ b/packaging/wix/wixenv.bat
@@ -5,12 +5,12 @@ ver | findstr /i "6\.1\." > nul
 IF %ERRORLEVEL% EQU 0 goto win7

 

 @rem all other cases

-IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.8\bin

+IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.9\bin

 IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs

 goto setpath

 

 :win7

-IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.8\bin

+IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.9\bin

 IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs

 

 :setpath