diff -Nru gwyddion-2.31/debian/changelog gwyddion-2.31/debian/changelog
--- gwyddion-2.31/debian/changelog	2013-02-22 15:10:38.000000000 -0500
+++ gwyddion-2.31/debian/changelog	2013-02-23 23:19:24.000000000 -0500
@@ -1,15 +1,36 @@
+gwyddion (2.31-1ubuntu1) raring; urgency=low
+
+  * Merge from Debian experimental (LP: #1132338). Remaining Ubuntu changes:
+   - Disabled global menu in Unity.
+
+ -- Nicola Ferralis <feranick@hotmail.com>  Sat, 23 Feb 2013 23:09:51 -0500
+
 gwyddion (2.31-1) experimental; urgency=low
 
   * New upstream release
 
  -- Jan Beyer <jan@beathovn.de>  Fri, 22 Feb 2013 21:07:16 +0100
 
+gwyddion (2.30-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian experimental (LP: #1127545). Remaining Ubuntu changes:
+   - Disabled global menu in Unity.
+
+ -- Nicola Ferralis <feranick@hotmail.com>  Sat, 16 Feb 2013 16:53:51 -0500
+
 gwyddion (2.30-2) experimental; urgency=low
 
   * Include upstream patch to fix crashing colour selectors
 
  -- Jan Beyer <jan@beathovn.de>  Sun, 03 Feb 2013 21:06:11 +0100
 
+gwyddion (2.30-1ubuntu1) raring; urgency=low
+ 
+  * Merge from Debian experimental (LP: #1056237). Remaining Ubuntu changes:
+   - Disabled global menu in Unity.
+ 
+ -- Julian Taylor <jtaylor@ubuntu.com>  Thu, 03 Jan 2013 18:49:42 +0100
+
 gwyddion (2.30-1) experimental; urgency=low
 
   * New upstream release
@@ -25,6 +46,13 @@
 
  -- Andreas Tille <tille@debian.org>  Tue, 11 Sep 2012 09:22:34 +0200
 
+gwyddion (2.28-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+   - Disabled global menu in Unity.
+
+ -- Nicola Ferralis <feranick@hotmail.com>  Thu, 31 May 2012 10:26:31 -0400
+
 gwyddion (2.28-2) unstable; urgency=low
 
   * debian/gwyddion-common.install
diff -Nru gwyddion-2.31/debian/control gwyddion-2.31/debian/control
--- gwyddion-2.31/debian/control	2012-03-29 04:44:59.000000000 -0400
+++ gwyddion-2.31/debian/control	2013-02-23 23:19:25.000000000 -0500
@@ -1,7 +1,8 @@
 Source: gwyddion
 Section: science
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Jan Beyer <jan@beathovn.de>,
  Andreas Tille <tille@debian.org>
diff -Nru gwyddion-2.31/debian/patches/disable-global-menu-unity.diff gwyddion-2.31/debian/patches/disable-global-menu-unity.diff
--- gwyddion-2.31/debian/patches/disable-global-menu-unity.diff	1969-12-31 19:00:00.000000000 -0500
+++ gwyddion-2.31/debian/patches/disable-global-menu-unity.diff	2013-02-23 23:19:32.000000000 -0500
@@ -0,0 +1,14 @@
+Description: Disables global menus under Unity.
+Origin: Nicola Ferralis <feranick@hotmail.com>
+Bug-Ubuntu: https://launchpad.net/bugs/787532
+diff -Nru gwyddion-2.24.orig//app/gwyddion.c gwyddion-2.24/app/gwyddion.c
+--- gwyddion-2.24.orig//app/gwyddion.c	2011-01-20 04:31:45.000000000 -0500
++++ gwyddion-2.24/app/gwyddion.c	2011-05-28 18:31:44.658543000 -0400
+@@ -111,6 +111,7 @@
+     gwy_app_settings_create_config_dir(NULL);
+     debug_time(timer, "init");
+     setup_locale_from_win32_registry();
++    g_unsetenv("UBUNTU_MENUPROXY");
+     gtk_init(&argc, &argv);
+     debug_time(timer, "gtk_init()");
+     gwy_remote_do(app_options.remote, argc - 1, argv + 1);
diff -Nru gwyddion-2.31/debian/patches/series gwyddion-2.31/debian/patches/series
--- gwyddion-2.31/debian/patches/series	2013-02-22 15:10:38.000000000 -0500
+++ gwyddion-2.31/debian/patches/series	2013-02-23 23:19:33.000000000 -0500
@@ -1,2 +1,3 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
+disable-global-menu-unity.diff