r28322 - in /desktop/experimental/vino/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Mon Jun 6 00:42:22 UTC 2011 

Author: sjoerd
Date: Mon Jun  6 00:42:21 2011
New Revision: 28322

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28322
Log:
* New upstream release
* Removed patches which have been comitted upstream
  + debian/patches/01_ipv6-fix.patch
  + debian/patches/05_avoid_out-of-bounds_memory_accesses.patch
  + debian/patches/03_config_h_defines.patch
* debian/patches/25_fix_property_usage.patch
  + Added: Don't use non-existing properties in the Telepathy backend
* debian/patches/20_fix_ifdefs.patch
  + Added: fix typos in the telepathy ifdefs

Added:
    desktop/experimental/vino/debian/patches/20_fix_ifdefs.patch
    desktop/experimental/vino/debian/patches/25_fix_property_usage.patch
Removed:
    desktop/experimental/vino/debian/patches/01_ipv6-fix.patch
    desktop/experimental/vino/debian/patches/03_config_h_defines.patch
    desktop/experimental/vino/debian/patches/05_avoid_out-of-bounds_memory_accesses.patch
Modified:
    desktop/experimental/vino/debian/changelog
    desktop/experimental/vino/debian/control
    desktop/experimental/vino/debian/patches/series

Modified: desktop/experimental/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/changelog?rev=28322&op=diff
==============================================================================
--- desktop/experimental/vino/debian/changelog [utf-8] (original)
+++ desktop/experimental/vino/debian/changelog [utf-8] Mon Jun  6 00:42:21 2011
@@ -1,3 +1,17 @@
+vino (3.0.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Removed patches which have been comitted upstream
+    + debian/patches/01_ipv6-fix.patch
+    + debian/patches/05_avoid_out-of-bounds_memory_accesses.patch
+    + debian/patches/03_config_h_defines.patch
+  * debian/patches/25_fix_property_usage.patch
+    + Added: Don't use non-existing properties in the Telepathy backend
+  * debian/patches/20_fix_ifdefs.patch
+    + Added: fix typos in the telepathy ifdefs
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 05 Jun 2011 17:40:38 -0700
+
 vino (3.0.0-3) experimental; urgency=high
 
   * 05_avoid_out-of-bounds_memory_accesses.patch:

Modified: desktop/experimental/vino/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/control?rev=28322&op=diff
==============================================================================
--- desktop/experimental/vino/debian/control [utf-8] (original)
+++ desktop/experimental/vino/debian/control [utf-8] Mon Jun  6 00:42:21 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),

Added: desktop/experimental/vino/debian/patches/20_fix_ifdefs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/20_fix_ifdefs.patch?rev=28322&op=file
==============================================================================
--- desktop/experimental/vino/debian/patches/20_fix_ifdefs.patch (added)
+++ desktop/experimental/vino/debian/patches/20_fix_ifdefs.patch [utf-8] Mon Jun  6 00:42:21 2011
@@ -1,0 +1,52 @@
+From aa8b33bd42b68b0c05705013e321a5e48d59bbd1 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 5 Jun 2011 16:20:37 -0700
+Subject: [PATCH 1/2] Fix _TELEPATHY_GLIB mistyped as _TELEPATHY_GLUB
+
+---
+ server/vino-dbus-listener.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
+index 624bfe1..4611055 100644
+--- a/server/vino-dbus-listener.c
++++ b/server/vino-dbus-listener.c
+@@ -24,7 +24,7 @@
+ #include "vino-dbus-listener.h"
+ #include "vino-dbus.h"
+ 
+-#ifdef VINO_HAVE_TELEPATHY_GLUB
++#ifdef VINO_HAVE_TELEPATHY_GLIB
+ #include "vino-tube-servers-manager.h"
+ #endif
+ 
+@@ -45,7 +45,7 @@ struct _VinoDBusListener
+ 
+   VinoServer      *server;
+ 
+-#ifdef VINO_HAVE_TELEPATHY_GLUB
++#ifdef VINO_HAVE_TELEPATHY_GLIB
+   VinoTubeServersManager *manager;
+ #endif
+ };
+@@ -67,7 +67,7 @@ vino_dbus_listener_finalize (GObject *object)
+     g_object_unref (listener->server);
+ 
+ 
+-#ifdef VINO_HAVE_TELEPATHY_GLUB
++#ifdef VINO_HAVE_TELEPATHY_GLIB
+   if (listener->manager != NULL)
+     {
+       g_object_unref (listener->manager);
+@@ -82,7 +82,7 @@ vino_dbus_listener_finalize (GObject *object)
+ static void
+ vino_dbus_listener_init (VinoDBusListener *listener)
+ {
+-#ifdef VINO_HAVE_TELEPATHY_GLUB
++#ifdef VINO_HAVE_TELEPATHY_GLIB
+   listener->manager = vino_tube_servers_manager_new ();
+ #endif
+ }
+-- 
+1.7.5.3
+

Added: desktop/experimental/vino/debian/patches/25_fix_property_usage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/25_fix_property_usage.patch?rev=28322&op=file
==============================================================================
--- desktop/experimental/vino/debian/patches/25_fix_property_usage.patch (added)
+++ desktop/experimental/vino/debian/patches/25_fix_property_usage.patch [utf-8] Mon Jun  6 00:42:21 2011
@@ -1,0 +1,26 @@
+From e86139158e31d50be00c576017939eb161224bcc Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 5 Jun 2011 16:21:14 -0700
+Subject: [PATCH 2/2] don't set non-existing use-dbus-listener property
+
+use-dbus-listener property has been removed from VinoServer, so don't
+try to set it when creating a VinoDBusServer.
+---
+ server/vino-tube-servers-manager.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/server/vino-tube-servers-manager.c b/server/vino-tube-servers-manager.c
+index 43e60b5..1d7ff9c 100644
+--- a/server/vino-tube-servers-manager.c
++++ b/server/vino-tube-servers-manager.c
+@@ -196,7 +196,6 @@ handle_channels_cb (TpSimpleHandler *handler,
+ 
+   server = g_object_new (VINO_TYPE_TUBE_SERVER,
+       "display-status-icon",  0,
+-      "use-dbus-listener",    0,
+       "prompt-enabled",       0,
+       "view-only",            0,
+       "network-interface",    network_interface,
+-- 
+1.7.5.3
+

Modified: desktop/experimental/vino/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/series?rev=28322&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/series [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/series [utf-8] Mon Jun  6 00:42:21 2011
@@ -1,5 +1,4 @@
-01_ipv6-fix.patch
 02_server_sm-disable.patch
-03_config_h_defines.patch
-05_avoid_out-of-bounds_memory_accesses.patch
 11_hurd_maxhostnamelen.patch
+20_fix_ifdefs.patch
+25_fix_property_usage.patch

More information about the pkg-gnome-commits mailing list