diff -Nru seahorse-3.8.2/debian/changelog seahorse-3.8.2/debian/changelog --- seahorse-3.8.2/debian/changelog 2013-05-26 00:07:21.000000000 +0200 +++ seahorse-3.8.2/debian/changelog 2013-12-15 01:36:31.000000000 +0100 @@ -1,3 +1,16 @@ +seahorse (3.8.2-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. (LP: #1261055) Remaining changes: + - debian/control: + + Drop gnome-doc-utils from Build-Depends. (Closes: #732168) + - debian/patches/use-stable-libsecret.patch: + + Use the stable libsecret. + - debian/patches/use_valid_help_url: + + Let help buttons point to valid documentation references. + * debian/control: Update Vcs-* field. + + -- Artur Rona Sun, 15 Dec 2013 00:32:00 +0100 + seahorse (3.8.2-1) unstable; urgency=low [ Thomas Bechtold ] @@ -11,6 +24,18 @@ -- Andreas Henriksson Sat, 25 May 2013 23:52:47 +0200 +seahorse (3.8.2-0ubuntu2) trusty; urgency=low + + * Rebuild to get ride of the libgcr transition depends (lp: #1241881) + + -- Sebastien Bacher Mon, 11 Nov 2013 11:38:17 +0100 + +seahorse (3.8.2-0ubuntu1) saucy; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 21 May 2013 13:37:17 +0200 + seahorse (3.8.0-1) experimental; urgency=low * New upstream release. @@ -49,6 +74,73 @@ -- Andreas Henriksson Wed, 27 Feb 2013 13:17:59 +0100 +seahorse (3.6.3-0ubuntu1) raring; urgency=low + + * New upstream version + + -- Sebastien Bacher Mon, 12 Nov 2012 11:41:34 +0100 + +seahorse (3.6.2-0ubuntu1) quantal-proposed; urgency=low + + * New upstream release + + Fix problem where keyring items overwrite one another. Regression since + the migration to libsecret. Items stored manually by choosing 'Stored + Password' overwrite one another. (BGO: #686407) + + -- Iain Lane Tue, 23 Oct 2012 09:50:08 +0100 + +seahorse (3.6.1-0ubuntu1) quantal-proposed; urgency=low + + * New upstream version: + - Strip DBus errors before displaying them + - Fix regression for changing a keyring master password (lp: #1048484) + - Updated translations + * debian/patches/use_valid_help_url.patch: + - Let help buttons point to valid documentation references (lp: #853137) + + -- Sebastien Bacher Wed, 17 Oct 2012 19:43:05 +0200 + +seahorse (3.6.0-0ubuntu1) quantal; urgency=low + + * New upstream release (LP: #1056585) + + -- Matthew Fischer Tue, 25 Sep 2012 22:08:25 -0600 + +seahorse (3.5.92-0ubuntu1) quantal; urgency=low + + * New upstream release + - Port to new documentation infrastructure + + BD on yelp-tools for this. + + -- Iain Lane Tue, 18 Sep 2012 17:36:46 +0100 + +seahorse (3.5.91-0ubuntu1) quantal; urgency=low + + * New upstream bugfix release + + -- Robert Ancell Tue, 04 Sep 2012 09:11:46 +1200 + +seahorse (3.5.90-0ubuntu1) quantal; urgency=low + + * New upstream release + + -- Robert Ancell Tue, 21 Aug 2012 17:26:13 +1200 + +seahorse (3.5.4-0ubuntu1) quantal; urgency=low + + * New upstream release (LP: #1025540) + * debian/control: + - Replace build-depends on libgnome-keyring-dev with libsecret-1-dev + - Bump build-depends on libgtk-3-dev + * debian/patches/use-stable-libsecret.patch: + - Use the stable libsecret + * debian/patches/10_gpgme_keyring_finalize_typo.patch: + * debian/patches/11_unavailable_signature_entries.patch: + * debian/patches/12_align_keyids_with_name_userid.patch: + - Applied upstream + + -- Robert Ancell Mon, 30 Jul 2012 15:31:36 +0200 + seahorse (3.4.1-2) unstable; urgency=low * Upload to unstable. diff -Nru seahorse-3.8.2/debian/control seahorse-3.8.2/debian/control --- seahorse-3.8.2/debian/control 2013-05-26 00:09:41.000000000 +0200 +++ seahorse-3.8.2/debian/control 2013-12-15 01:38:10.000000000 +0100 @@ -2,12 +2,12 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: seahorse Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Jordi Mallach , Josselin Mouette , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), dh-autoreconf, @@ -19,7 +19,6 @@ libldap2-dev, libavahi-glib-dev (>= 0.6), libavahi-client-dev (>= 0.6), - gnome-doc-utils, gtk-doc-tools (>= 1.9), libgnome-keyring-dev (>= 3.0.0), libglib2.0-dev (>= 2.10.0), @@ -29,8 +28,7 @@ openssh-client, yelp-tools Standards-Version: 3.9.3 -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu Homepage: http://live.gnome.org/Seahorse Package: seahorse diff -Nru seahorse-3.8.2/debian/control.in seahorse-3.8.2/debian/control.in --- seahorse-3.8.2/debian/control.in 2013-05-26 00:07:32.000000000 +0200 +++ seahorse-3.8.2/debian/control.in 2013-12-15 00:41:11.000000000 +0100 @@ -1,7 +1,8 @@ Source: seahorse Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), @@ -14,7 +15,6 @@ libldap2-dev, libavahi-glib-dev (>= 0.6), libavahi-client-dev (>= 0.6), - gnome-doc-utils, gtk-doc-tools (>= 1.9), libgnome-keyring-dev (>= 3.0.0), libglib2.0-dev (>= 2.10.0), @@ -24,8 +24,7 @@ openssh-client, yelp-tools Standards-Version: 3.9.3 -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/seahorse/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seahorse/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu Homepage: http://live.gnome.org/Seahorse Package: seahorse diff -Nru seahorse-3.8.2/debian/patches/series seahorse-3.8.2/debian/patches/series --- seahorse-3.8.2/debian/patches/series 2013-03-24 16:17:28.000000000 +0100 +++ seahorse-3.8.2/debian/patches/series 2013-12-15 00:12:09.000000000 +0100 @@ -1 +1,3 @@ 30_preferences_menu.patch +use-stable-libsecret.patch +use_valid_help_url.patch diff -Nru seahorse-3.8.2/debian/patches/use-stable-libsecret.patch seahorse-3.8.2/debian/patches/use-stable-libsecret.patch --- seahorse-3.8.2/debian/patches/use-stable-libsecret.patch 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.8.2/debian/patches/use-stable-libsecret.patch 2013-05-21 13:37:36.000000000 +0200 @@ -0,0 +1,13 @@ +Index: seahorse-3.8.2/configure.ac +=================================================================== +--- seahorse-3.8.2.orig/configure.ac 2013-05-21 13:27:58.730407460 +0200 ++++ seahorse-3.8.2/configure.ac 2013-05-21 13:28:08.000000000 +0200 +@@ -336,7 +336,7 @@ + # ----------------------------------------------------------------------------- + # LIBSECRET + +-PKG_CHECK_MODULES([LIBSECRET], libsecret-unstable >= $LIBSECRET_REQUIRED, ++PKG_CHECK_MODULES([LIBSECRET], libsecret-1 >= $LIBSECRET_REQUIRED, + [enable_gnome_keyring=yes],[enable_gnome_keyring=no]) + + if test "$enable_gnome_keyring" = "no"; then diff -Nru seahorse-3.8.2/debian/patches/use_valid_help_url.patch seahorse-3.8.2/debian/patches/use_valid_help_url.patch --- seahorse-3.8.2/debian/patches/use_valid_help_url.patch 1970-01-01 01:00:00.000000000 +0100 +++ seahorse-3.8.2/debian/patches/use_valid_help_url.patch 2013-05-21 13:37:36.000000000 +0200 @@ -0,0 +1,14 @@ +Index: seahorse-3.8.2/libseahorse/seahorse-widget.c +=================================================================== +--- seahorse-3.8.2.orig/libseahorse/seahorse-widget.c 2013-05-21 13:27:59.170407441 +0200 ++++ seahorse-3.8.2/libseahorse/seahorse-widget.c 2013-05-21 13:27:59.166407441 +0200 +@@ -450,6 +450,9 @@ + if (g_str_equal (swidget->name, "key-manager") || + g_str_equal (swidget->name, "keyserver-results")) { + document = g_strdup ("help:" PACKAGE "/introduction"); ++ } else if (g_str_equal (swidget->name, "gkr-keyring") || ++ g_str_equal (swidget->name, "gkr-item-properties")) { ++ document = g_strdup ("help:" PACKAGE "/keyring"); + } else { + document = g_strdup_printf ("help:" PACKAGE "/%s", swidget->name); + }