r36951 - in /desktop/experimental/vino/debian: changelog patches/02_server_sm-disable.patch patches/revert_hide_preferences.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Mar 13 13:54:48 2013
New Revision: 36951

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36951
Log:
* New upstream release.
* debian/patches/revert_hide_preferences.patch: added.
  - show vino-preferences for now since we don't yet have the
    new gnome-control-center with integrated settings panel.
    (This patch should be dropped once we do.)
* debian/patches/02_server_sm-disable.patch: refreshed to apply.

Added:
    desktop/experimental/vino/debian/patches/revert_hide_preferences.patch
Modified:
    desktop/experimental/vino/debian/changelog
    desktop/experimental/vino/debian/patches/02_server_sm-disable.patch
    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=36951&op=diff
==============================================================================
--- desktop/experimental/vino/debian/changelog [utf-8] (original)
+++ desktop/experimental/vino/debian/changelog [utf-8] Wed Mar 13 13:54:48 2013
@@ -1,3 +1,14 @@
+vino (3.7.91-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/revert_hide_preferences.patch: added.
+    - show vino-preferences for now since we don't yet have the
+      new gnome-control-center with integrated settings panel.
+      (This patch should be dropped once we do.)
+  * debian/patches/02_server_sm-disable.patch: refreshed to apply.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 13 Mar 2013 14:07:35 +0100
+
 vino (3.6.1-1) experimental; urgency=low
 
   [ Andreas Henriksson ]

Modified: desktop/experimental/vino/debian/patches/02_server_sm-disable.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/02_server_sm-disable.patch?rev=36951&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/02_server_sm-disable.patch [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/02_server_sm-disable.patch [utf-8] Wed Mar 13 13:54:48 2013
@@ -1,11 +1,11 @@
-Index: vino-3.2.0/server/vino-server.desktop.in.in
+Index: vino-3.7.91/server/vino-server.desktop.in.in
 ===================================================================
---- vino-3.2.0.orig/server/vino-server.desktop.in.in	2011-07-14 20:20:13.000000000 +0200
-+++ vino-3.2.0/server/vino-server.desktop.in.in	2011-09-28 16:08:38.995185112 +0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
+--- vino-3.7.91.orig/server/vino-server.desktop.in.in	2013-03-13 14:27:29.167193300 +0100
++++ vino-3.7.91/server/vino-server.desktop.in.in	2013-03-13 14:27:29.139193653 +0100
+@@ -2,7 +2,7 @@
  _Name=Desktop Sharing
  _Comment=GNOME Desktop Sharing Server
+ _Keywords=vnc;share;remote;
 -Exec=@LIBEXECDIR@/vino-server
 +Exec=@LIBEXECDIR@/vino-server --sm-disable
  Icon=preferences-desktop-remote-desktop

Added: desktop/experimental/vino/debian/patches/revert_hide_preferences.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/revert_hide_preferences.patch?rev=36951&op=file
==============================================================================
--- desktop/experimental/vino/debian/patches/revert_hide_preferences.patch (added)
+++ desktop/experimental/vino/debian/patches/revert_hide_preferences.patch [utf-8] Wed Mar 13 13:54:48 2013
@@ -1,0 +1,29 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: Revert hiding the vino preferences in GNOME
+
+This patch should be dropped once we have a new enough gnome-control-center.
+
+The original upstream commit reverted by this patch said:
+
+From 6b5793efd1e352fcd037db082800ccb673cc9f6f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 26 Jan 2013 21:04:33 +0000
+Subject: Don't show vino-preferences in GNOME
+
+The gnome-control-center has a sharing panel, which has
+screen sharing preferences, so the standalong vino-preferences
+are no longer necessary for GNOME.
+https://bugzilla.gnome.org/show_bug.cgi?id=692480
+---
+diff --git a/capplet/vino-preferences.desktop.in.in b/capplet/vino-preferences.desktop.in.in
+--- a/capplet/vino-preferences.desktop.in.in
++++ b/capplet/vino-preferences.desktop.in.in
+@@ -7,7 +7,7 @@ Terminal=false
+ Type=Application
+ StartupNotify=true
+ Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;RemoteAccess;Network;
+-OnlyShowIn=Unity;
++OnlyShowIn=GNOME;Unity;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=vino
+ X-GNOME-Bugzilla-Component=Preferences Dialog

Modified: desktop/experimental/vino/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/series?rev=36951&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/series [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/series [utf-8] Wed Mar 13 13:54:48 2013
@@ -1,3 +1,4 @@
 02_server_sm-disable.patch
 #05_use-system-miniupnpc.patch
 11_hurd_maxhostnamelen.patch
+revert_hide_preferences.patch