Merge lp:~ari-tczew/seahorse/ubuntu into lp:~ubuntu-desktop/seahorse/ubuntu

[Artur Rona]

[Robert Ancell (robert-ancell)]

You forgot to bzr rm the files in debian/patches that are no longer used.
"Drop gnome-doc-utils from Build-Depends. (Closes: #732168)" - This bug reference doesn't seem to relate to this?
I also drop an obsolete build-depends on libgnome-keyring-dev

If you want to reduce the delta, you could ask debian to drop the build-depends on gnome-doc-utils and libgnome-keyring-dev.

Uploaded with these changes, thanks Artur!

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-21 11:37:21 +0000
+++ debian/changelog	2013-12-15 01:06:36 +0000
@@ -1,9 +1,79 @@
+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 <[e-mail]>  Sun, 15 Dec 2013 00:32:00 +0100
+
+seahorse (3.8.2-1) unstable; urgency=low
+
+  [ Thomas Bechtold ]
+  * New upstream release
+
+  [ Andreas Henriksson ]
+  * Drop gnupg2 Build-Conflicts added in 1.0-1, should be fixed since
+    a long time. See patch added in 1.0.1-6 and later merged upstream.
+    (Previous related changes are tagged with bug #407800)
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  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 <[e-mail]>  Mon, 11 Nov 2013 11:38:17 +0100
+
 seahorse (3.8.2-0ubuntu1) saucy; urgency=low
 
   * New upstream version
 
  -- Sebastien Bacher <[e-mail]>  Tue, 21 May 2013 13:37:17 +0200
 
+seahorse (3.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Thomas Bechtold <[e-mail]>  Mon, 25 Mar 2013 21:40:43 +0100
+
+seahorse (3.7.91-1) experimental; urgency=low
+
+  * The "where's the tarball?" release.
+    - 3.7.92 tagged in upstream git, but no tarball on ftp.gnome.org
+
+  * New upstream release.
+  * Let dh-autoreconf patch in --as-needed via
+    DEB_DH_AUTORECONF_ARGS and drop debian/patches/99_ltmain_as-needed.patch
+  * Drop ancient debian/patches/08_force_ssh.patch and just build-depend
+    on openssh-client. Gosh for maintenance cost vs micro-optimization.
+
+ -- Andreas Henriksson <[e-mail]>  Sun, 24 Mar 2013 16:07:45 +0100
+
+seahorse (3.6.3-1) experimental; urgency=low
+
+  [ Thomas Bechtold ]
+  * New upstream release (Closes: #701648)
+  * debian/patches/10_gpgme_keyring_finalize_typo.patch:
+    - removed, applied upstream
+  * debian/patches/11_unavailable_signature_entries.patch:
+    - removed, applied upstream
+  * debian/patches/12_align_keyids_with_name_userid.patch
+    - removed, applied upstream
+  * debian/control
+    - Bump libgtk build-depends
+    - Add libsecret to build-depends
+
+  [ Andreas Henriksson ]
+  * Add build-dependency on yelp-tools needed by build system for help
+
+ -- Andreas Henriksson <[e-mail]>  Wed, 27 Feb 2013 13:17:59 +0100
+
 seahorse (3.6.3-0ubuntu1) raring; urgency=low
 
   * New upstream version
@@ -1226,3 +1296,6 @@
 
  -- Anthony Mulcahy <[e-mail]>  Mon, 10 Jan 2000 22:17:00 +0900
 
+Local variables:
+mode: debian-changelog
+End:

=== modified file 'debian/control'
--- debian/control	2012-10-23 09:22:39 +0000
+++ debian/control	2013-12-15 01:06:36 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jordi Mallach <[e-mail]>, Michael Biebl <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
@@ -19,16 +19,16 @@
                libldap2-dev,
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
-               yelp-tools,
                gtk-doc-tools (>= 1.9),
-               libsecret-1-dev (>= 0.5),
+               libgnome-keyring-dev (>= 3.0.0),
                libglib2.0-dev (>= 2.10.0),
                libgtk-3-dev (>= 3.4.0),
-               gnome-pkg-tools
-Build-Conflicts: gnupg2
+               libsecret-1-dev (>= 0.5),
+               gnome-pkg-tools,
+               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

=== modified file 'debian/control.in'
--- debian/control.in	2012-10-17 17:24:01 +0000
+++ debian/control.in	2013-12-15 01:06:36 +0000
@@ -15,16 +15,16 @@
                libldap2-dev,
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
-               yelp-tools,
                gtk-doc-tools (>= 1.9),
-               libsecret-1-dev (>= 0.5),
+               libgnome-keyring-dev (>= 3.0.0),
                libglib2.0-dev (>= 2.10.0),
                libgtk-3-dev (>= 3.4.0),
-               gnome-pkg-tools
-Build-Conflicts: gnupg2
+               libsecret-1-dev (>= 0.5),
+               gnome-pkg-tools,
+               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

=== modified file 'debian/patches/30_preferences_menu.patch'
--- debian/patches/30_preferences_menu.patch	2013-05-21 11:32:38 +0000
+++ debian/patches/30_preferences_menu.patch	2013-12-15 01:06:36 +0000
@@ -1,8 +1,8 @@
-Index: seahorse-3.8.2/src/seahorse.desktop.in.in
+Index: seahorse-2.30.1/src/seahorse.desktop.in.in
 ===================================================================
---- seahorse-3.8.2.orig/src/seahorse.desktop.in.in	2013-05-21 13:27:58.782407458 +0200
-+++ seahorse-3.8.2/src/seahorse.desktop.in.in	2013-05-21 13:27:58.778407458 +0200
-@@ -6,7 +6,7 @@
+--- seahorse-2.30.1.orig/src/seahorse.desktop.in.in	2010-05-07 22:08:15.740896545 +0200
++++ seahorse-2.30.1/src/seahorse.desktop.in.in	2010-05-07 22:11:12.016895716 +0200
+@@ -5,7 +5,7 @@ Exec=seahorse
  Terminal=false
  Type=Application
  Icon=seahorse

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-17 17:24:01 +0000
+++ debian/patches/series	2013-12-15 01:06:36 +0000
@@ -1,5 +1,3 @@
+30_preferences_menu.patch
 use-stable-libsecret.patch
-08_force_ssh.patch
-30_preferences_menu.patch
-99_ltmain_as-needed.patch
 use_valid_help_url.patch

=== modified file 'debian/rules'
--- debian/rules	2012-09-18 17:09:25 +0000
+++ debian/rules	2013-12-15 01:06:36 +0000
@@ -11,3 +11,5 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
                              --enable-pgp
+
+DEB_DH_AUTORECONF_ARGS = --as-needed