diff -pruN 0.2.4-1/debian/changelog 0.2.4-0ubuntu1/debian/changelog
--- 0.2.4-1/debian/changelog	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/changelog	2011-08-02 21:00:46.000000000 +0000
@@ -1,20 +1,19 @@
-gitg (0.2.4-1) unstable; urgency=low
+gitg (0.2.4-0ubuntu1) oneiric; urgency=low
 
-  * New upstream release.
-  * debian/watch: Look for tar.bz2 files instead.
-  * debian/control: Up build-dep version on gtksourceview.
-
- -- Jonny Lamb <jonny@debian.org>  Wed, 24 Aug 2011 15:52:46 +0100
-
-gitg (0.2.2-1) unstable; urgency=low
-
-  * New upstream release. (Closes: #623732)
-  * debian/control: Add missing dependencies. Thanks to Lubomír Sedlář for
-    the hints. (Closes: #618894)
-  * debian/patches/: Refresh both patches.
-  * debian/control: Update build-dep versions for new release.
+  * New upstream release based on gtk3 (LP: #732782)
+  * debian/compat
+    - Bump compatibility to 8
+  * debian/control
+    - Build-depend on GTK3 and GSettings
+    - Bump debhelper compatibility to 8
+  * debian/patches/0001-Change-Categories-to-Development-RevisionControl.patch
+    - Add to POTFILES.skip
+  * debian/rules
+    - Simplified
+  * debian/watch
+    - Watch for .bz2
 
- -- Jonny Lamb <jonny@debian.org>  Wed, 24 Aug 2011 14:24:29 +0100
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 01 Aug 2011 16:07:36 -0400
 
 gitg (0.1.0-1) unstable; urgency=low
 
diff -pruN 0.2.4-1/debian/compat 0.2.4-0ubuntu1/debian/compat
--- 0.2.4-1/debian/compat	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/compat	2011-08-02 21:00:46.000000000 +0000
@@ -1 +1 @@
-5
+8
diff -pruN 0.2.4-1/debian/control 0.2.4-0ubuntu1/debian/control
--- 0.2.4-1/debian/control	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/control	2011-08-02 21:00:46.000000000 +0000
@@ -1,8 +1,9 @@
 Source: gitg
 Section: vcs
 Priority: optional
-Maintainer: Jonny Lamb <jonny@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, gnome-common, libglib2.0-dev (>= 2.26), libgtk-3-dev (>= 3.0.0), libgtksourceview-3.0-dev (>= 3.0.0), libgconf2-dev, gsettings-desktop-schemas-dev
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jonny Lamb <jonny@debian.org>
+Build-Depends: debhelper (>= 8), autotools-dev, pkg-config, gnome-common, libglib2.0-dev (>= 2.26), libgtk-3-dev (>= 3.0.0), libgtksourceview-3.0-dev (>= 3.0.0), gsettings-desktop-schemas-dev
 Standards-Version: 3.9.1
 Homepage: http://trac.novowork.com/gitg/
 Vcs-Git: git://git.jonnylamb.com/git/packaging/gitg.git
@@ -10,9 +11,9 @@ Vcs-Browser: http://git.jonnylamb.com/?p
 
 Package: gitg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, git, dbus-x11, gsettings-desktop-schemas, libdconf0 | gsettings-backend
+Depends: ${shlibs:Depends}, ${misc:Depends}, git, dbus-x11
 Description: git repository viewer for gtk+/GNOME
- gitg is a fast GTK2 git repository browser for the GNOME desktop.
+ gitg is a fast git repository browser for the GNOME desktop.
  It currently features:
  .
   * Loading large repositories very fast
diff -pruN 0.2.4-1/debian/patches/0001-Change-Categories-to-Development-RevisionControl.patch 0.2.4-0ubuntu1/debian/patches/0001-Change-Categories-to-Development-RevisionControl.patch
--- 0.2.4-1/debian/patches/0001-Change-Categories-to-Development-RevisionControl.patch	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/patches/0001-Change-Categories-to-Development-RevisionControl.patch	2011-08-02 21:00:46.000000000 +0000
@@ -1,4 +1,4 @@
-From d933b82065cce8d9304a8eae945e53647793b6c7 Mon Sep 17 00:00:00 2001
+From 5691eb067b62f2633d4dc6316dc1c54822a3cb24 Mon Sep 17 00:00:00 2001
 From: Jonny Lamb <jonny@debian.org>
 Date: Mon, 23 Mar 2009 12:50:09 +0000
 Subject: [PATCH] Change Categories to Development;RevisionControl;
@@ -8,11 +8,11 @@ Signed-off-by: Jonny Lamb <jonny@debian.
  data/gitg.desktop.in.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/data/gitg.desktop.in.in b/data/gitg.desktop.in.in
-index c350c61..84e0574 100644
---- a/data/gitg.desktop.in.in
-+++ b/data/gitg.desktop.in.in
-@@ -7,7 +7,7 @@ TryExec=gitg
+Index: oneiric/data/gitg.desktop.in.in
+===================================================================
+--- oneiric.orig/data/gitg.desktop.in.in	2011-07-27 02:13:16.811448623 -0400
++++ oneiric/data/gitg.desktop.in.in	2011-07-27 02:24:55.427362832 -0400
+@@ -7,7 +7,7 @@
  Terminal=false
  Type=Application
  Icon=gitg
@@ -21,3 +21,12 @@ index c350c61..84e0574 100644
  #X-GNOME-DocPath=gitg/gitg.xml
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gitg
+Index: oneiric/po/POTFILES.skip
+===================================================================
+--- oneiric.orig/po/POTFILES.skip	2011-07-27 02:25:10.567708901 -0400
++++ oneiric/po/POTFILES.skip	2011-07-27 02:25:13.647779304 -0400
+@@ -2,3 +2,4 @@
+ data/gitgdiff.lang
+ data/gitgstyle.xml
+ data/org.gnome.gitg.gschema.xml.in
++.pc/0001-Change-Categories-to-Development-RevisionControl.patch/data/gitg.desktop.in.in
diff -pruN 0.2.4-1/debian/patches/0002-libgitg-make-a-static-library.patch 0.2.4-0ubuntu1/debian/patches/0002-libgitg-make-a-static-library.patch
--- 0.2.4-1/debian/patches/0002-libgitg-make-a-static-library.patch	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/patches/0002-libgitg-make-a-static-library.patch	2011-08-02 20:58:28.000000000 +0000
@@ -1,4 +1,4 @@
-From 33ee8635e672b09b894e8c560fe2d1411b9cfa4c Mon Sep 17 00:00:00 2001
+From 326bcdc194e6a691963bbd2df60aee5c2fa01fc5 Mon Sep 17 00:00:00 2001
 From: Jonny Lamb <jonny@debian.org>
 Date: Fri, 18 Mar 2011 22:04:35 +0000
 Subject: [PATCH] libgitg: make a static library
@@ -12,10 +12,10 @@ Signed-off-by: Jonny Lamb <jonny@debian.
  4 files changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/gitg/Makefile.am b/gitg/Makefile.am
-index 50dc17f..fff5459 100644
+index 5aa8e35..4beb266 100644
 --- a/gitg/Makefile.am
 +++ b/gitg/Makefile.am
-@@ -61,7 +61,7 @@ gitg_LDADD =		\
+@@ -67,7 +67,7 @@ gitg_LDADD =		\
  	$(PACKAGE_LIBS) \
  	$(top_builddir)/libgitg/libgitg-1.0.la
  
@@ -25,10 +25,10 @@ index 50dc17f..fff5459 100644
  uidir = $(datadir)/gitg/ui/
  ui_DATA = \
 diff --git a/gitg/Makefile.in b/gitg/Makefile.in
-index fee7e32..2463615 100644
+index 94020e0..10ef1b1 100644
 --- a/gitg/Makefile.in
 +++ b/gitg/Makefile.in
-@@ -351,7 +351,7 @@ gitg_LDADD = \
+@@ -343,7 +343,7 @@ gitg_LDADD = \
  	$(PACKAGE_LIBS) \
  	$(top_builddir)/libgitg/libgitg-1.0.la
  
@@ -52,10 +52,10 @@ index a6f6572..1036b3a 100644
  libgitg_1_0_la_LIBADD = $(GITG_LIBS)
  
 diff --git a/libgitg/Makefile.in b/libgitg/Makefile.in
-index 41e9486..56726ee 100644
+index 5635547..32d8494 100644
 --- a/libgitg/Makefile.in
 +++ b/libgitg/Makefile.in
-@@ -296,8 +296,7 @@ INCLUDES = \
+@@ -295,8 +295,7 @@ INCLUDES = \
  	-DLIBDIR=\""$(libdir)"\"					\
  	-DGITG_LOCALEDIR=\""$(datadir)/locale"\"
  
diff -pruN 0.2.4-1/debian/rules 0.2.4-0ubuntu1/debian/rules
--- 0.2.4-1/debian/rules	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/rules	2011-08-02 21:00:46.000000000 +0000
@@ -14,45 +14,12 @@ endif
 
 include $(CURDIR)/debian/update-patches.mk
 
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
 	dh_install
-	dh_installman
-	dh_installchangelogs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_configure:
+	dh_auto_configure -- $(configure_flags)
+
+%:
+	dh $@
\ No newline at end of file
diff -pruN 0.2.4-1/debian/source/format 0.2.4-0ubuntu1/debian/source/format
--- 0.2.4-1/debian/source/format	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/source/format	2011-08-02 20:58:28.000000000 +0000
@@ -1 +1 @@
-3.0 (quilt)
\ No newline at end of file
+3.0 (quilt)
diff -pruN 0.2.4-1/debian/watch 0.2.4-0ubuntu1/debian/watch
--- 0.2.4-1/debian/watch	2011-08-24 14:52:46.000000000 +0000
+++ 0.2.4-0ubuntu1/debian/watch	2011-08-02 21:00:46.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/gitg/([\d\.]+)/gitg-(.*)\.tar\.bz2 debian uupdate
\ No newline at end of file
+http://ftp.gnome.org/pub/GNOME/sources/gitg/([\d\.]+)/gitg-(.*)\.tar\.bz2 debian uupdate
diff -pruN 0.2.4-1/.pc/0001-Change-Categories-to-Development-RevisionControl.patch/po/POTFILES.skip 0.2.4-0ubuntu1/.pc/0001-Change-Categories-to-Development-RevisionControl.patch/po/POTFILES.skip
--- 0.2.4-1/.pc/0001-Change-Categories-to-Development-RevisionControl.patch/po/POTFILES.skip	1970-01-01 00:00:00.000000000 +0000
+++ 0.2.4-0ubuntu1/.pc/0001-Change-Categories-to-Development-RevisionControl.patch/po/POTFILES.skip	2011-01-13 20:58:56.000000000 +0000
@@ -0,0 +1,4 @@
+data/gitg.desktop.in
+data/gitgdiff.lang
+data/gitgstyle.xml
+data/org.gnome.gitg.gschema.xml.in
diff -pruN 0.2.4-1/po/POTFILES.skip 0.2.4-0ubuntu1/po/POTFILES.skip
--- 0.2.4-1/po/POTFILES.skip	2011-01-13 20:58:56.000000000 +0000
+++ 0.2.4-0ubuntu1/po/POTFILES.skip	2011-08-25 00:23:46.000000000 +0000
@@ -2,3 +2,4 @@ data/gitg.desktop.in
 data/gitgdiff.lang
 data/gitgstyle.xml
 data/org.gnome.gitg.gschema.xml.in
+.pc/0001-Change-Categories-to-Development-RevisionControl.patch/data/gitg.desktop.in.in