Merge lp:~noskcaj/seahorse/3.14.0-2 into lp:~ubuntu-desktop/seahorse/ubuntu

[Jackson Doak]

Merge a ssh fix from debian

[Robert Ancell (robert-ancell)]

Thanks Jackson!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-11 10:20:06 +0000
+++ debian/changelog	2014-12-17 02:22:18 +0000
@@ -1,3 +1,22 @@
+seahorse (3.14.0-2ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - 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.
+
+ -- Jackson Doak <[e-mail]>  Wed, 17 Dec 2014 12:51:40 +1100
+
+seahorse (3.14.0-2) unstable; urgency=medium
+
+  * 01_ssh_ui.patch, 02_ssh_ui.patch: patches from upstream git. Fix the 
+    SSH key generation UI file. Closes: #770241.
+
+ -- Josselin Mouette <[e-mail]>  Tue, 02 Dec 2014 20:59:59 +0100
+
 seahorse (3.14.0-1ubuntu1) vivid; urgency=low
 
   * Merge from Debian unstable. (LP: #1388425) Remaining changes:

=== modified file 'debian/control'
--- debian/control	2014-11-11 10:20:06 +0000
+++ debian/control	2014-12-17 02:22:18 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Jordi Mallach <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,

=== added file 'debian/patches/01_ssh_ui.patch'
--- debian/patches/01_ssh_ui.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_ssh_ui.patch	2014-12-17 02:22:18 +0000
@@ -0,0 +1,25 @@
+From 20536a1282bb506bb4a3f11a83ddb6d46669e552 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[e-mail]>
+Date: Fri, 14 Nov 2014 04:38:00 -0500
+Subject: ssh generation: Fix invalid ui file
+
+GtkGrid does not have :n-rows or :n-columns properties.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740138
+
+diff --git a/ssh/seahorse-ssh-generate.xml b/ssh/seahorse-ssh-generate.xml
+index 03defd9..9cb9e04 100644
+--- a/ssh/seahorse-ssh-generate.xml
++++ b/ssh/seahorse-ssh-generate.xml
+@@ -196,8 +196,6 @@
+                             <property name="can_focus">False</property>
+                             <property name="row_spacing">6</property>
+                             <property name="column_spacing">12</property>
+-                            <property name="n_rows">2</property>
+-                            <property name="n_columns">2</property>
+                             <child>
+                               <object class="GtkLabel" id="label46">
+                                 <property name="visible">True</property>
+-- 
+cgit v0.10.1
+

=== added file 'debian/patches/02_ssh_ui.patch'
--- debian/patches/02_ssh_ui.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_ssh_ui.patch	2014-12-17 02:22:18 +0000
@@ -0,0 +1,23 @@
+From e9917a0a81fd58e1555c71a29c9f5fea80e327b2 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[e-mail]>
+Date: Sat, 15 Nov 2014 12:05:14 -0500
+Subject: Remove more invalid properties
+
+This was overlooked in the previous commit.
+
+diff --git a/ssh/seahorse-ssh-generate.xml b/ssh/seahorse-ssh-generate.xml
+index 9cb9e04..d918617 100644
+--- a/ssh/seahorse-ssh-generate.xml
++++ b/ssh/seahorse-ssh-generate.xml
+@@ -279,8 +279,6 @@
+                         <property name="margin_left">20</property>
+                         <property name="row_spacing">6</property>
+                         <property name="column_spacing">12</property>
+-                        <property name="n_rows">2</property>
+-                        <property name="n_columns">2</property>
+                         <child>
+                           <object class="GtkLabel" id="label49">
+                             <property name="visible">True</property>
+-- 
+cgit v0.10.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-11 10:20:06 +0000
+++ debian/patches/series	2014-12-17 02:22:18 +0000
@@ -1,2 +1,4 @@
+01_ssh_ui.patch
+02_ssh_ui.patch
 use-stable-libsecret.patch
 use_valid_help_url.patch