r43990 - in /desktop/unstable/seahorse/debian: changelog patches/ patches/01_ssh_ui.patch patches/02_ssh_ui.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Dec  2 20:00:48 2014
New Revision: 43990

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43990
Log:
01_ssh_ui.patch, 02_ssh_ui.patch: patches from upstream git. Fix the 
SSH key generation UI file. Closes: #770241.

Added:
    desktop/unstable/seahorse/debian/patches/
    desktop/unstable/seahorse/debian/patches/01_ssh_ui.patch
    desktop/unstable/seahorse/debian/patches/02_ssh_ui.patch
    desktop/unstable/seahorse/debian/patches/series
Modified:
    desktop/unstable/seahorse/debian/changelog

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=43990&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog	[utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog	[utf-8] Tue Dec  2 20:00:48 2014
@@ -1,3 +1,10 @@
+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 <joss at debian.org>  Tue, 02 Dec 2014 20:59:59 +0100
+
 seahorse (3.14.0-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/seahorse/debian/patches/01_ssh_ui.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/01_ssh_ui.patch?rev=43990&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/01_ssh_ui.patch	(added)
+++ desktop/unstable/seahorse/debian/patches/01_ssh_ui.patch	[utf-8] Tue Dec  2 20:00:48 2014
@@ -0,0 +1,25 @@
+From 20536a1282bb506bb4a3f11a83ddb6d46669e552 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+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: desktop/unstable/seahorse/debian/patches/02_ssh_ui.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/02_ssh_ui.patch?rev=43990&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/02_ssh_ui.patch	(added)
+++ desktop/unstable/seahorse/debian/patches/02_ssh_ui.patch	[utf-8] Tue Dec  2 20:00:48 2014
@@ -0,0 +1,23 @@
+From e9917a0a81fd58e1555c71a29c9f5fea80e327b2 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+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
+

Added: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=43990&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series	(added)
+++ desktop/unstable/seahorse/debian/patches/series	[utf-8] Tue Dec  2 20:00:48 2014
@@ -0,0 +1,2 @@
+01_ssh_ui.patch
+02_ssh_ui.patch