Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hi,
please unblock package seahorse for a simple bugfix.
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.
unblock seahorse/3.14.0-2
Thanks,
--
.''`. Josselin Mouette
: :' :
`. `'
`-
Index: debian/changelog
===================================================================
--- debian/changelog (révision 43080)
+++ debian/changelog (copie de travail)
@@ -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 <j...@debian.org> Tue, 02 Dec 2014 20:59:59 +0100
+
seahorse (3.14.0-1) unstable; urgency=medium
* New upstream release.
Index: debian/patches/01_ssh_ui.patch
===================================================================
--- debian/patches/01_ssh_ui.patch (révision 0)
+++ debian/patches/01_ssh_ui.patch (révision 43990)
@@ -0,0 +1,25 @@
+From 20536a1282bb506bb4a3f11a83ddb6d46669e552 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mcla...@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
+
Index: debian/patches/02_ssh_ui.patch
===================================================================
--- debian/patches/02_ssh_ui.patch (révision 0)
+++ debian/patches/02_ssh_ui.patch (révision 43990)
@@ -0,0 +1,23 @@
+From e9917a0a81fd58e1555c71a29c9f5fea80e327b2 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mcla...@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
+
Index: debian/patches/series
===================================================================
--- debian/patches/series (révision 0)
+++ debian/patches/series (révision 43990)
@@ -0,0 +1,2 @@
+01_ssh_ui.patch
+02_ssh_ui.patch
