diff -Nru gtkpod-2.1.4/debian/changelog gtkpod-2.1.4/debian/changelog
--- gtkpod-2.1.4/debian/changelog	2014-07-31 13:52:13.000000000 +0000
+++ gtkpod-2.1.4/debian/changelog	2015-01-15 07:41:22.000000000 +0000
@@ -1,3 +1,12 @@
+gtkpod (2.1.4-5) unstable; urgency=medium
+
+  * debian/: fix upgrade issues from former versions (Closes: #774891)
+  * debian/copyright: minor typos fixed
+  * debian/control: S-V bump 3.9.5 => 3.9.6 (no changes needed)
+  * debian/control: Uploader e-mail address updated
+
+ -- Matteo F. Vescovi <mfv@debian.org>  Thu, 15 Jan 2015 08:41:20 +0100
+
 gtkpod (2.1.4-4) unstable; urgency=medium
 
   * debian/control: autotools-dev b-dep dropped
diff -Nru gtkpod-2.1.4/debian/control gtkpod-2.1.4/debian/control
--- gtkpod-2.1.4/debian/control	2014-07-31 13:30:04.000000000 +0000
+++ gtkpod-2.1.4/debian/control	2015-01-15 07:39:58.000000000 +0000
@@ -2,7 +2,7 @@
 Section: sound
 Priority: extra
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
-Uploaders: Matteo F. Vescovi <mfvescovi@gmail.com>
+Uploaders: Matteo F. Vescovi <mfv@debian.org>
 Build-Depends: autoconf,
                automake,
                debhelper (>= 9),
@@ -30,13 +30,14 @@
                pkg-config,
                pkg-kde-tools,
                python-dev (>= 2.6.6-3~)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.gtkpod.org
 Vcs-Git: git://anonscm.debian.org/pkg-gtkpod/packages/gtkpod.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gtkpod/packages/gtkpod.git
 
 Package: gtkpod
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: gtkpod-data (= ${source:Version}),
          libatomicparsley0 (= ${binary:Version}),
          libgtkpod1 (= ${binary:Version}),
diff -Nru gtkpod-2.1.4/debian/copyright gtkpod-2.1.4/debian/copyright
--- gtkpod-2.1.4/debian/copyright	2013-10-25 13:53:32.000000000 +0000
+++ gtkpod-2.1.4/debian/copyright	2015-01-12 10:34:21.000000000 +0000
@@ -10,7 +10,7 @@
 Copyright: 2002-2007, Jorg Schuler <jcsjcs at users.sourceforge.net>
 License: GPL-2+
 
-Files: ltmain.h
+Files: ltmain.sh
 Copyright: 2002-2011, Jorg Schuler <jcsjcs at users.sourceforge.net>
 License: GPL-2+
 
@@ -54,7 +54,7 @@
 Copyright: 2007, P.G. Richardson <phantom_sf at users.sourceforge.net>
 License: GPL-2+
 
-Files: libs/atomicparsley/*
+Files: libs/atomic-parsley/*
 Copyright: 2005-2007, puck_lock <puck_lock at users.sourceforge.net>
            2012, Paul Richardson <phantom_sf at users.sourceforge.net>
 License: GPL-2+
@@ -65,7 +65,7 @@
            2004, Jens Taprogge <jens.taprogge at post.rwth-aachen.de>
 License: GPL-2+
 
-Files: plugins/filetype_mp4/mp4file.* plugins/filetype_m4a/mp4file.*
+Files: plugins/filetype_mp4/mp4file.* plugins/filetype_m4a/m4afile.*
 Copyright: 2002-2005, Jorg Schuler <jcsjcs at users sourceforge net>
  Note: code for mp4_get_file_info() is based on mp4info.cpp of the
  mpeg4ip project
diff -Nru gtkpod-2.1.4/debian/gtkpod.maintscript gtkpod-2.1.4/debian/gtkpod.maintscript
--- gtkpod-2.1.4/debian/gtkpod.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ gtkpod-2.1.4/debian/gtkpod.maintscript	2015-01-12 10:31:26.000000000 +0000
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/gtkpod gtkpod-data 2.1.4-5~ gtkpod -- "$@"