=== modified file 'debian/changelog'
--- debian/changelog	2015-09-13 21:19:18 +0000
+++ debian/changelog	2015-10-31 11:44:16 +0000
@@ -1,3 +1,12 @@
+gyp (0.1+20150913git1f374df9-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+      debian/preinst:
+        - help dpkg when /usr/lib/python2.7/dist-packages/gyp-0.1.egg-info
+        is changed from a symlink to a directory (LP: #1246730)
+
+ -- Hans Joachim Desserud <ubuntu@desserud.org>  Sat, 31 Oct 2015 12:42:33 +0100
+
 gyp (0.1+20150913git1f374df9-1) unstable; urgency=medium
 
   * Upstream update to git 1f374df9 (Closes: #798516)
@@ -12,6 +21,14 @@
 
  -- Jérémy Lal <kapouer@melix.org>  Sun, 13 Sep 2015 21:19:18 +0200
 
+gyp (0.1~svn1729-3ubuntu1) trusty; urgency=low
+
+  * debian/preinst:
+    - help dpkg when /usr/lib/python2.7/dist-packages/gyp-0.1.egg-info
+      is changed from a symlink to a directory (LP: #1246730)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Mar 2014 16:34:26 +0100
+
 gyp (0.1~svn1729-3) unstable; urgency=low
 
   * Build-Depends on python-setuptools. (Closes: #724516)

=== added file 'debian/preinst'
--- debian/preinst	1970-01-01 00:00:00 +0000
+++ debian/preinst	2015-10-31 11:38:26 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+EGG=/usr/lib/python2.7/dist-packages/gyp-0.1.egg-info
+
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 0.1~svn1729-3ubuntu1; then
+   # remove symlink from the old package, it gets replaced with a directory
+   # in the new package but dpkg will not handle this automatically, it
+   # needs manual help, see https://wiki.debian.org/Teams/Dpkg/FAQ#Q:_Will_dpkg_replace_a_symlink_with_a_directory_or_vice_versa.3F
+   # bugreport against gyp: LP: #1246730
+   if [ -L $EGG ]; then
+       rm -f $EGG
+   fi
+fi
+