diff -u seahorse-2.26.0/debian/control seahorse-2.26.0/debian/control --- seahorse-2.26.0/debian/control +++ seahorse-2.26.0/debian/control @@ -23,6 +23,7 @@ libgtk2.0-dev (>= 2.10.0), libxml2-dev (>= 2.6.0), libebook1.2-dev (>= 1.7.90), + liblaunchpad-integration-dev (>= 0.1.17), gnome-pkg-tools, libtasn1-3-dev Standards-Version: 3.7.2 diff -u seahorse-2.26.0/debian/control.in seahorse-2.26.0/debian/control.in --- seahorse-2.26.0/debian/control.in +++ seahorse-2.26.0/debian/control.in @@ -23,6 +23,7 @@ libgtk2.0-dev (>= 2.10.0), libxml2-dev (>= 2.6.0), libebook1.2-dev (>= 1.7.90), + liblaunchpad-integration-dev (>= 0.1.17), gnome-pkg-tools, libtasn1-3-dev Standards-Version: 3.7.2 diff -u seahorse-2.26.0/debian/changelog seahorse-2.26.0/debian/changelog --- seahorse-2.26.0/debian/changelog +++ seahorse-2.26.0/debian/changelog @@ -1,3 +1,14 @@ +seahorse (2.26.0-0ubuntu4) jaunty; urgency=low + + * Add support for Launchpad-Integration (LP: #347684) + * debian/control.in + - add build-depend on liblaunchpad-integration-dev + * debian/patches + - added 01_lpi.patch for launchpad integration + - updated 80_autoconf.patch to include changes + + -- Andreas Moog Tue, 24 Mar 2009 10:15:54 +0100 + seahorse (2.26.0-0ubuntu3) jaunty; urgency=low * debian/control.in diff -u seahorse-2.26.0/debian/patches/series seahorse-2.26.0/debian/patches/series --- seahorse-2.26.0/debian/patches/series +++ seahorse-2.26.0/debian/patches/series @@ -1,3 +1,4 @@ +01_lpi.patch 08_force_ssh.patch 11_ubuntu_keyserver.patch 80_autoconf_update.patch diff -u seahorse-2.26.0/debian/patches/80_autoconf_update.patch seahorse-2.26.0/debian/patches/80_autoconf_update.patch --- seahorse-2.26.0/debian/patches/80_autoconf_update.patch +++ seahorse-2.26.0/debian/patches/80_autoconf_update.patch @@ -1,7 +1,7 @@ Index: seahorse-2.26.0/configure =================================================================== --- seahorse-2.26.0.orig/configure 2009-03-14 20:17:22.000000000 +0100 -+++ seahorse-2.26.0/configure 2009-03-16 02:20:31.706382945 +0100 ++++ seahorse-2.26.0/configure 2009-03-24 10:15:06.206189887 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -8571,7 +8571,7 @@ break 2 fi done -@@ -17016,28 +17248,28 @@ +@@ -17016,30 +17248,30 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -8600,33 +8600,50 @@ else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0\"") >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0") 2>&5 +- ($PKG_CONFIG --exists --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_SEAHORSE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0" 2>/dev/null` +- pkg_cv_SEAHORSE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0" 2>/dev/null` ++ pkg_cv_SEAHORSE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration" 2>/dev/null` else -@@ -17052,10 +17284,10 @@ + pkg_failed=yes + fi +@@ -17052,12 +17284,12 @@ pkg_cv_SEAHORSE_LIBS="$SEAHORSE_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0\"") >&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0") 2>&5 +- ($PKG_CONFIG --exists --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_SEAHORSE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0" 2>/dev/null` +- pkg_cv_SEAHORSE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0" 2>/dev/null` ++ pkg_cv_SEAHORSE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration" 2>/dev/null` else -@@ -17083,7 +17315,7 @@ + pkg_failed=yes + fi +@@ -17076,14 +17308,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0"` ++ SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration"` + else +- SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0"` ++ SEAHORSE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration"` + fi # Put the nasty error message in config.log where it belongs echo "$SEAHORSE_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0) were not met: -+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration) were not met: $SEAHORSE_PKG_ERRORS @@ -8635,7 +8652,7 @@ See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0) were not met: -+$as_echo "$as_me: error: Package requirements (libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0) were not met: ++$as_echo "$as_me: error: Package requirements (libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration) were not met: $SEAHORSE_PKG_ERRORS only in patch2: unchanged: --- seahorse-2.26.0.orig/debian/patches/01_lpi.patch +++ seahorse-2.26.0/debian/patches/01_lpi.patch @@ -0,0 +1,47 @@ +Index: seahorse-2.26.0/configure.in +=================================================================== +--- seahorse-2.26.0.orig/configure.in 2009-03-24 10:13:58.346196373 +0100 ++++ seahorse-2.26.0/configure.in 2009-03-24 10:14:24.110196571 +0100 +@@ -49,7 +49,7 @@ + AC_SUBST([GTK_CFLAGS]) + + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +-PKG_CHECK_MODULES(SEAHORSE, libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0) ++PKG_CHECK_MODULES(SEAHORSE, libglade-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration) + + + AC_MSG_CHECKING([for some Win32 platform]) +Index: seahorse-2.26.0/src/seahorse-key-manager.ui +=================================================================== +--- seahorse-2.26.0.orig/src/seahorse-key-manager.ui 2009-03-24 10:14:11.270195292 +0100 ++++ seahorse-2.26.0/src/seahorse-key-manager.ui 2009-03-24 10:14:24.110196571 +0100 +@@ -29,6 +29,7 @@ + + + ++ + + + +Index: seahorse-2.26.0/src/seahorse-viewer.c +=================================================================== +--- seahorse-2.26.0.orig/src/seahorse-viewer.c 2009-03-24 10:14:16.562195699 +0100 ++++ seahorse-2.26.0/src/seahorse-viewer.c 2009-03-24 10:14:46.278191825 +0100 +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + enum { + PROP_0, +@@ -647,6 +648,9 @@ + gtk_window_add_accel_group (GTK_WINDOW (win), + gtk_ui_manager_get_accel_group (pv->ui_manager)); + ++ launchpad_integration_add_ui (pv->ui_manager, ++ "/menubar/Help/LaunchpadItems"); ++ + include_basic_actions (self); + + g_signal_connect (SEAHORSE_VIEW (self), "selection-changed",