diff -Nru gwyddion-2.29/debian/changelog gwyddion-2.29/debian/changelog --- gwyddion-2.29/debian/changelog 2012-09-11 03:39:24.000000000 -0400 +++ gwyddion-2.29/debian/changelog 2012-09-25 10:30:52.000000000 -0400 @@ -1,3 +1,10 @@ +gwyddion (2.29-1ubuntu1) quantal; urgency=low + + * Merge from Debian experimental. Remaining Ubuntu changes: + - Disabled global menu in Unity. + + -- Nicola Ferralis Tue, 25 Sep 2012 10:29:45 -0400 + gwyddion (2.29-1) experimental; urgency=low * New upstream version diff -Nru gwyddion-2.29/debian/control gwyddion-2.29/debian/control --- gwyddion-2.29/debian/control 2012-03-29 04:34:00.000000000 -0400 +++ gwyddion-2.29/debian/control 2012-09-25 10:31:39.000000000 -0400 @@ -1,7 +1,7 @@ Source: gwyddion Section: science Priority: optional -Maintainer: Debian Med Packaging Team +Maintainer: Ubuntu Developers DM-Upload-Allowed: yes Uploaders: Jan Beyer , Andreas Tille diff -Nru gwyddion-2.29/debian/patches/disable-global-menu-unity.diff gwyddion-2.29/debian/patches/disable-global-menu-unity.diff --- gwyddion-2.29/debian/patches/disable-global-menu-unity.diff 1969-12-31 19:00:00.000000000 -0500 +++ gwyddion-2.29/debian/patches/disable-global-menu-unity.diff 2012-09-25 10:28:33.000000000 -0400 @@ -0,0 +1,14 @@ +Description: Disables global menus under Unity. +Origin: Nicola Ferralis +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.29/debian/patches/series gwyddion-2.29/debian/patches/series --- gwyddion-2.29/debian/patches/series 2012-04-25 01:57:45.000000000 -0400 +++ gwyddion-2.29/debian/patches/series 2012-09-25 10:28:33.000000000 -0400 @@ -1,2 +1,3 @@ fix-manpage-section-for-debian.diff fix-rpath-issue.patch +disable-global-menu-unity.diff