diff -u gconf-editor-2.20.0/debian/control.in gconf-editor-2.20.0/debian/control.in --- gconf-editor-2.20.0/debian/control.in +++ gconf-editor-2.20.0/debian/control.in @@ -1,7 +1,8 @@ Source: gconf-editor Section: utils Priority: optional -Maintainer: Josselin Mouette +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.41), @@ -14,7 +15,8 @@ libgnomeui-dev (>= 2.5.4), scrollkeeper, gnome-doc-utils, - pkg-config + pkg-config, + liblaunchpad-integration-dev Standards-Version: 3.7.3 Package: gconf-editor diff -u gconf-editor-2.20.0/debian/control gconf-editor-2.20.0/debian/control --- gconf-editor-2.20.0/debian/control +++ gconf-editor-2.20.0/debian/control @@ -1,8 +1,9 @@ Source: gconf-editor Section: utils Priority: optional -Maintainer: Josselin Mouette -Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge Build-Depends: debhelper (>= 5), cdbs (>= 0.4.41), libgconf2-dev (>= 2.9.2), @@ -14,7 +15,8 @@ libgnomeui-dev (>= 2.5.4), scrollkeeper, gnome-doc-utils, - pkg-config + pkg-config, + liblaunchpad-integration-dev Standards-Version: 3.7.3 Package: gconf-editor diff -u gconf-editor-2.20.0/debian/changelog gconf-editor-2.20.0/debian/changelog --- gconf-editor-2.20.0/debian/changelog +++ gconf-editor-2.20.0/debian/changelog @@ -1,3 +1,16 @@ +gconf-editor (2.20.0-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #189440), Ubuntu remaining changes: + - debian/patches/01_lpi.patch, + - debian/patches/02_autoconf.patch: + + launchpad integration + - debian/patches/03_menu_change.patch: + + mask the menu item of the default menu + - Build-Depends on liblaunchpad-integration-dev + - Updated Maintainer field to Ubuntu Desktop Team + + -- Pedro Fragoso Tue, 05 Feb 2008 22:37:38 +0000 + gconf-editor (2.20.0-2) unstable; urgency=low * debian/patches/01_search-dialog-segfault.patch: @@ -10,6 +23,26 @@ -- Sebastian Dröge Tue, 05 Feb 2008 17:45:52 +0100 +gconf-editor (2.20.0-1ubuntu2) hardy; urgency=low + + * debian/control.in: + - Build-Depends on liblaunchpad-integration-dev + + -- Sebastien Bacher Wed, 14 Nov 2007 09:56:51 +0100 + +gconf-editor (2.20.0-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/patches/01_lpi.patch, + * debian/patches/02_autoconf.patch: + - launchpad integration + * debian/patches/03_menu_change.patch: + - mask the menu item of the default menu + * Build-Depends on liblaunchpad-integration-dev + * Update maintainer field in debian/control with Ubuntu Desktop Team + + -- Maurizio Moriconi Fri, 26 Oct 2007 11:18:29 +0200 + gconf-editor (2.20.0-1) unstable; urgency=low * New upstream translation and bugfix release. only in patch2: unchanged: --- gconf-editor-2.20.0.orig/debian/patches/01_lpi.patch +++ gconf-editor-2.20.0/debian/patches/01_lpi.patch @@ -0,0 +1,42 @@ +diff -Nur gconf-editor-2.15.91/configure.in gconf-editor-2.15.91.new/configure.in +--- gconf-editor-2.15.91/configure.in 2006-08-07 20:33:44.000000000 +0200 ++++ gconf-editor-2.15.91.new/configure.in 2006-08-07 21:28:18.000000000 +0200 +@@ -39,6 +39,7 @@ + PKG_CHECK_MODULES(GCONF_EDITOR, + gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4) + +diff -Nur gconf-editor-2.15.91/src/gconf-editor-window.c gconf-editor-2.15.91.new/src/gconf-editor-window.c +--- gconf-editor-2.15.91/src/gconf-editor-window.c 2006-05-09 07:32:47.000000000 +0200 ++++ gconf-editor-2.15.91.new/src/gconf-editor-window.c 2006-08-07 21:27:59.000000000 +0200 +@@ -32,6 +32,7 @@ + #include "gedit-output-window.h" + #include "gconf-search-dialog.h" + #include ++#include + #include + #include + +@@ -791,6 +792,9 @@ + " " + " " + " " ++ " " ++ " " ++ " " + " " + " " + " " +@@ -1466,6 +1470,9 @@ + exit (EXIT_FAILURE); + } + ++ launchpad_integration_add_ui (window->ui_manager, ++ "/GConfEditorMenu/HelpMenu/LaunchpadItems"); ++ + menubar = gtk_ui_manager_get_widget (window->ui_manager, "/GConfEditorMenu"); + gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0); + only in patch2: unchanged: --- gconf-editor-2.20.0.orig/debian/patches/02_autoconf.patch +++ gconf-editor-2.20.0/debian/patches/02_autoconf.patch @@ -0,0 +1,75 @@ +diff -Nur gconf-editor-2.20.0/configure gconf-editor-2.20.0.new/configure +--- gconf-editor-2.20.0/configure 2007-09-17 23:59:07.000000000 +0200 ++++ gconf-editor-2.20.0.new/configure 2007-09-18 11:32:10.000000000 +0200 +@@ -20757,10 +20757,12 @@ + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.9.2 \\ + gtk+-2.0 >= 2.5.5 \\ ++ launchpad-integration \\ + libgnome-2.0 >= 2.14.0 \\ + libgnomeui-2.0 >= 2.5.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4") 2>&5 + ac_status=$? +@@ -20768,6 +20770,7 @@ + (exit $ac_status); }; then + pkg_cv_GCONF_EDITOR_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4" 2>/dev/null` + else +@@ -20784,10 +20787,12 @@ + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.9.2 \\ + gtk+-2.0 >= 2.5.5 \\ ++ launchpad-integration \\ + libgnome-2.0 >= 2.14.0 \\ + libgnomeui-2.0 >= 2.5.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4") 2>&5 + ac_status=$? +@@ -20795,6 +20800,7 @@ + (exit $ac_status); }; then + pkg_cv_GCONF_EDITOR_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4" 2>/dev/null` + else +@@ -20817,11 +20823,13 @@ + if test $_pkg_short_errors_supported = yes; then + GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4"` + else + GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4"` + fi +@@ -20830,6 +20838,7 @@ + + { { echo "$as_me:$LINENO: error: Package requirements (gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4) were not met: + +@@ -20844,6 +20853,7 @@ + " >&5 + echo "$as_me: error: Package requirements (gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ ++ launchpad-integration \ + libgnome-2.0 >= 2.14.0 \ + libgnomeui-2.0 >= 2.5.4) were not met: + only in patch2: unchanged: --- gconf-editor-2.20.0.orig/debian/patches/03_menu_change.patch +++ gconf-editor-2.20.0/debian/patches/03_menu_change.patch @@ -0,0 +1,11 @@ +diff -Nur gconf-editor-2.18.2/data/gconf-editor.desktop.in.in gconf-editor-2.18.2.new/data/gconf-editor.desktop.in.in +--- gconf-editor-2.18.2/data/gconf-editor.desktop.in.in 2007-03-11 14:22:17.000000000 +0100 ++++ gconf-editor-2.18.2.new/data/gconf-editor.desktop.in.in 2007-08-28 09:47:00.879676560 +0200 +@@ -7,6 +7,7 @@ + Type=Application + Icon=gconf-editor.png + StartupNotify=true ++NoDisplay=true + Categories=GNOME;GTK;System; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gconf-editor