diff -Nru gimp-2.8.14/debian/changelog gimp-2.8.14/debian/changelog
--- gimp-2.8.14/debian/changelog	2015-07-23 07:40:45.000000000 +1000
+++ gimp-2.8.14/debian/changelog	2015-11-13 07:48:35.000000000 +1100
@@ -1,3 +1,33 @@
+gimp (2.8.14-1.2ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable. (LP: #1515763) Remaining changes:
+    - debian/patches/02_help-message.patch,
+      debian/patches/03_gimp.desktop.in.in.patch:
+      + Update some strings for Ubuntu.
+    - debian/rules:
+      + Set gettext domain and update translation templates.
+
+ -- Jackson Doak <noskcaj@ubuntu.com>  Fri, 13 Nov 2015 07:48:18 +1100
+
+gimp (2.8.14-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Upload to unstable.
+
+ -- Matteo F. Vescovi <mfv@debian.org>  Mon, 05 Oct 2015 17:26:27 +0200
+
+gimp (2.8.14-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Ari Pollak ]
+  * Install appstream appdata (Closes: #785661)
+
+  [ Matteo F. Vescovi ]
+  * debian/: fix build-dependency against GEGL 0.3.0 (Closes: #790421)
+
+ -- Matteo F. Vescovi <mfv@debian.org>  Mon, 28 Sep 2015 14:22:59 +0200
+
 gimp (2.8.14-1ubuntu2) wily; urgency=medium
 
   * debian/control:
@@ -2084,7 +2114,7 @@
     so I'm satisfied. Closes: #52634
 
  -- Ben Gertzfield <che@debian.org>  Thu, 10 Aug 2000 11:15:10 -0700
-  
+
 gimp1.1 (1.1.19-1) unstable; urgency=low
 
   * New upstream version. Please don't let there be any i18n breakage
@@ -2584,4 +2614,3 @@
 
  -- Rob Browning <osiris@cs.utexas.edu>  Mon, 27 Jan 1997 01:04:31 -0600
 
-
diff -Nru gimp-2.8.14/debian/gimp.install gimp-2.8.14/debian/gimp.install
--- gimp-2.8.14/debian/gimp.install	2013-02-24 03:51:09.000000000 +1100
+++ gimp-2.8.14/debian/gimp.install	2015-10-07 15:11:17.000000000 +1100
@@ -8,6 +8,7 @@
 usr/lib/gimp/2.0/interpreters/
 usr/lib/gimp/2.0/plug-ins/
 usr/lib/gimp/2.0/python/
+usr/share/appdata
 usr/share/applications
 usr/share/man/man1/gimp.1
 usr/share/man/man1/gimp-?.?.1
diff -Nru gimp-2.8.14/debian/patches/bump_Babl-GEGL_versions.patch gimp-2.8.14/debian/patches/bump_Babl-GEGL_versions.patch
--- gimp-2.8.14/debian/patches/bump_Babl-GEGL_versions.patch	1970-01-01 10:00:00.000000000 +1000
+++ gimp-2.8.14/debian/patches/bump_Babl-GEGL_versions.patch	2015-07-23 19:39:09.000000000 +1000
@@ -0,0 +1,46 @@
+diff --git a/app/sanity.c b/app/sanity.c
+index febddfb..85fea55 100644
+--- a/app/sanity.c
++++ b/app/sanity.c
+@@ -351,7 +351,7 @@ sanity_check_babl (void)
+ 
+ #define BABL_REQUIRED_MAJOR 0
+ #define BABL_REQUIRED_MINOR 1
+-#define BABL_REQUIRED_MICRO 10
++#define BABL_REQUIRED_MICRO 12
+ 
+   babl_get_version (&babl_major_version,
+                     &babl_minor_version,
+@@ -388,7 +388,7 @@ sanity_check_gegl (void)
+   gint gegl_micro_version;
+ 
+ #define GEGL_REQUIRED_MAJOR 0
+-#define GEGL_REQUIRED_MINOR 2
++#define GEGL_REQUIRED_MINOR 3
+ #define GEGL_REQUIRED_MICRO 0
+ 
+   gegl_get_version (&gegl_major_version,
+diff --git a/configure.ac b/configure.ac
+index 26812b6..4252fe9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,8 +40,8 @@ m4_define([gimp_stable],
+ m4_define([gimp_full_name], [GNU Image Manipulation Program])
+ 
+ # required versions of other packages
+-m4_define([babl_required_version], [0.1.10])
+-m4_define([gegl_required_version], [0.2.0])
++m4_define([babl_required_version], [0.1.12])
++m4_define([gegl_required_version], [0.3.0])
+ m4_define([glib_required_version], [2.30.2])
+ m4_define([atk_required_version], [2.2.0])
+ m4_define([gtk_required_version], [2.24.10])
+@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
+ ###############################
+ 
+ PKG_CHECK_MODULES(BABL, babl >= babl_required_version)
+-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version)
++PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
+ PKG_CHECK_MODULES(ATK, atk >= atk_required_version)
+ 
+ AM_PATH_GLIB_2_0(glib_required_version, :,
diff -Nru gimp-2.8.14/debian/patches/series gimp-2.8.14/debian/patches/series
--- gimp-2.8.14/debian/patches/series	2015-07-22 07:06:42.000000000 +1000
+++ gimp-2.8.14/debian/patches/series	2015-11-13 07:47:36.000000000 +1100
@@ -1,5 +1,5 @@
 disable-internal-help-browser
 01_hurd_ftbfs.patch
+bump_Babl-GEGL_versions.patch
 02_help-message.patch
 03_gimp.desktop.in.in.patch
-04_gegl-0.3.patch