diff -Nru gegl-0.0.22/debian/changelog gegl-0.0.22/debian/changelog
--- gegl-0.0.22/debian/changelog	2010-05-02 11:59:31.000000000 +0200
+++ gegl-0.0.22/debian/changelog	2010-07-31 13:57:48.000000000 +0200
@@ -1,3 +1,12 @@
+gegl (0.0.22-2ubuntu1) maverick; urgency=low
+
+  * Merge with Debian unstable (LP: #612009), remaining changes:
+    - debian/control: Add homepage field (Closes: #591042)
+    - debian/rules: Build without libavformat
+    - debian/watch: Add for uscan (Closes: #591044)
+
+ -- Artur Rona <ari-tczew@tlen.pl>  Sat, 31 Jul 2010 12:55:57 +0200
+
 gegl (0.0.22-2) unstable; urgency=low
 
   * debian/patches/01_gegl_PATH_MAX.patch:
@@ -25,6 +34,40 @@
 
  -- Josselin Mouette <joss@debian.org>  Fri, 30 Apr 2010 17:57:29 +0200
 
+gegl (0.0.22-0ubuntu4) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 05 Mar 2010 04:34:06 +0100
+
+gegl (0.0.22-0ubuntu3) jaunty; urgency=low
+
+  * Drop build-dependencies on libavcodec-dev and libavformat-dev, which
+    are not allowed to be included on the Ubuntu CDs per TB resolution.
+    Building ff-load.so can be re-instated later if the plugin is split
+    into its own separate package.
+  * Kill the libgegl-0.0-dbg package, which we don't need in Ubuntu.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 Mar 2009 17:33:05 +0000
+
+gegl (0.0.22-0ubuntu2) jaunty; urgency=low
+
+  * Drop unnecessary Build-Depends on libopenraw-dev, fixes FTBFS (bugs
+    LP: #315778, LP: #308274).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Fri, 06 Mar 2009 15:15:08 +0000
+
+gegl (0.0.22-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release (LP: #315778).
+  * Bump Standards-Version to 3.8.0.
+  * Created debian watch.
+  * Updated Build Depends.
+  * Created libgegl-0.0-dbg package.
+
+ -- Allisson Azevedo <allisson@gmail.com>  Sun, 11 Jan 2009 08:54:07 -0300
+
 gegl (0.0.20-1) unstable; urgency=low
 
   * New upstream release
diff -Nru gegl-0.0.22/debian/control gegl-0.0.22/debian/control
--- gegl-0.0.22/debian/control	2010-05-02 12:04:26.000000000 +0200
+++ gegl-0.0.22/debian/control	2010-07-31 13:58:42.000000000 +0200
@@ -6,8 +6,9 @@
 Source: gegl
 Section: libs
 Priority: optional
-Maintainer: Ross Burton <ross@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Rob Bradford <robster@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Rob Bradford <robster@debian.org>, Ross Burton <ross@debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs,
                autotools-dev,
@@ -27,6 +28,7 @@
                libjpeg62-dev,
                libspiro-dev
 Standards-Version: 3.8.4
+Homepage: http://www.gegl.org/
 
 Package: gegl
 Architecture: any
diff -Nru gegl-0.0.22/debian/control.in gegl-0.0.22/debian/control.in
--- gegl-0.0.22/debian/control.in	2010-05-02 11:07:53.000000000 +0200
+++ gegl-0.0.22/debian/control.in	2010-07-31 13:12:04.000000000 +0200
@@ -1,7 +1,8 @@
 Source: gegl
 Section: libs
 Priority: optional
-Maintainer: Ross Burton <ross@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                cdbs,
@@ -22,6 +23,7 @@
                libjpeg62-dev,
                libspiro-dev
 Standards-Version: 3.8.4
+Homepage: http://www.gegl.org/
 
 Package: gegl
 Architecture: any
diff -Nru gegl-0.0.22/debian/rules gegl-0.0.22/debian/rules
--- gegl-0.0.22/debian/rules	2010-04-30 17:57:27.000000000 +0200
+++ gegl-0.0.22/debian/rules	2010-07-31 12:54:11.000000000 +0200
@@ -11,6 +11,8 @@
 
 export LDFLAGS += -Wl,--as-needed
 
+DEB_CONFIGURE_USER_FLAGS = --without-libavformat
+
 DEB_DH_MAKESHLIBS_ARGS_libgegl-0.0-0 += \
         -V'libgegl-0.0-0 (>= 0.0.22)' \
         -Xusr/lib/gegl-0.0
diff -Nru gegl-0.0.22/debian/watch gegl-0.0.22/debian/watch
--- gegl-0.0.22/debian/watch	1970-01-01 01:00:00.000000000 +0100
+++ gegl-0.0.22/debian/watch	2010-07-31 12:26:29.000000000 +0200
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gimp.org/pub/gegl/0.0/gegl-(\d.*)\.tar\.bz2