r24118 - in /desktop/unstable/vinagre/debian: changelog patches/ patches/01_missing_symbol.patch patches/series source/ source/format

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr 29 22:01:42 2010
New Revision: 24118

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24118
Log:
* Switch to dpkg-source v3.
* 01_missing_symbol.patch: stolen upstream. Fix a crash in the SSH 
  plugin. Closes: #579693.

Added:
    desktop/unstable/vinagre/debian/patches/
    desktop/unstable/vinagre/debian/patches/01_missing_symbol.patch
    desktop/unstable/vinagre/debian/patches/series
    desktop/unstable/vinagre/debian/source/
    desktop/unstable/vinagre/debian/source/format
Modified:
    desktop/unstable/vinagre/debian/changelog

Modified: desktop/unstable/vinagre/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/changelog?rev=24118&op=diff
==============================================================================
--- desktop/unstable/vinagre/debian/changelog [utf-8] (original)
+++ desktop/unstable/vinagre/debian/changelog [utf-8] Thu Apr 29 22:01:42 2010
@@ -1,3 +1,11 @@
+vinagre (2.30.0-2) UNRELEASED; urgency=low
+
+  * Switch to dpkg-source v3.
+  * 01_missing_symbol.patch: stolen upstream. Fix a crash in the SSH 
+    plugin. Closes: #579693.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 30 Apr 2010 00:00:58 +0200
+
 vinagre (2.30.0-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Added: desktop/unstable/vinagre/debian/patches/01_missing_symbol.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/patches/01_missing_symbol.patch?rev=24118&op=file
==============================================================================
--- desktop/unstable/vinagre/debian/patches/01_missing_symbol.patch (added)
+++ desktop/unstable/vinagre/debian/patches/01_missing_symbol.patch [utf-8] Thu Apr 29 22:01:42 2010
@@ -1,0 +1,65 @@
+From 6b1c01f15e5a698fc5f7e8f62e230adab94618bb Mon Sep 17 00:00:00 2001
+From: Jonh Wendell <jwendell at gnome.org>
+Date: Wed, 14 Apr 2010 13:17:42 +0000
+Subject: Make ssh_vinagre_connect() symbol visible in .so.
+
+This fixes a crash when using SSH tunnel in VNC plugin.
+
+Closes Ubuntu #516847.
+---
+diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
+index 4f6f3bf..b2d224b 100644
+--- a/vinagre/vinagre-main.c
++++ b/vinagre/vinagre-main.c
+@@ -40,6 +40,7 @@
+ #include "vinagre-plugin-info.h"
+ #include "vinagre-plugin-info-priv.h"
+ #include "vinagre-debug.h"
++#include "vinagre-ssh.h"
+ 
+ #ifdef HAVE_TELEPATHY
+ #include "vinagre-tubes-manager.h"
+@@ -223,6 +224,9 @@ int main (int argc, char **argv) {
+    vinagre_tubes_manager = vinagre_tubes_manager_new (window);
+ #endif
+ 
++  /* fake call, just to ensure this symbol will be present at vinagre.so */
++  vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL);
++
+   gtk_main ();
+ 
+ #ifdef HAVE_TELEPATHY
+diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
+index e26c63f..0d59ed9 100644
+--- a/vinagre/vinagre-ssh.c
++++ b/vinagre/vinagre-ssh.c
+@@ -664,7 +664,8 @@ vinagre_ssh_connect (GtkWindow *parent,
+   GInputStream *is;
+   GDataInputStream *error_stream;
+ 
+-  g_return_val_if_fail (hostname != NULL, FALSE);
++  if (!hostname)
++    return FALSE;
+ 
+   if (vendor == SSH_VENDOR_INVALID)
+     vendor = get_ssh_client_vendor ();
+diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-utils.c
+index 03181f1..0b00045 100644
+--- a/vinagre/vinagre-utils.c
++++ b/vinagre/vinagre-utils.c
+@@ -607,13 +607,6 @@ vinagre_utils_ask_question (GtkWindow  *parent,
+   return TRUE;
+ }
+ 
+-#include "vinagre-ssh.h"
+-static void
+-shit (void)
+-{
+-  vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL);
+-}
+-
+ typedef struct {
+   GtkWidget *uname, *pw, *button;
+ } ControlOKButton;
+--
+cgit v0.8.3.1

Added: desktop/unstable/vinagre/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/patches/series?rev=24118&op=file
==============================================================================
--- desktop/unstable/vinagre/debian/patches/series (added)
+++ desktop/unstable/vinagre/debian/patches/series [utf-8] Thu Apr 29 22:01:42 2010
@@ -1,0 +1,1 @@
+01_missing_symbol.patch

Added: desktop/unstable/vinagre/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vinagre/debian/source/format?rev=24118&op=file
==============================================================================
--- desktop/unstable/vinagre/debian/source/format (added)
+++ desktop/unstable/vinagre/debian/source/format [utf-8] Thu Apr 29 22:01:42 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)