Move gnome3 ports into the place of the gnome2 locations.

Update to new port rules, remove conflicts, latest_link, enable stage support.

gnome-games was skipped because I got a update for that.
gnome-keyring 2 vs 3, needs to be looked at.
zenity 2 vs 3, and libgnomekbd 2 vs 3

Use new lib_depend syntax in bsd.gnome.mk.

Possible lots of broken links.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 312 insertions, 282 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index b687ad669..9982884d4 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,60 +1,68 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/net/vinagre/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#  $MCom: ports/trunk/net/vinagre3/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	vinagre
-PORTVERSION=	2.30.3
-PORTREVISION=	3
+PORTVERSION=	3.6.2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
-LIB_DEPENDS=	libgtk-vnc-1.0.so:${PORTSDIR}/net/gtk-vnc \
-		libavahi-core.so:${PORTSDIR}/net/avahi-app \
-		libavahi-ui.so:${PORTSDIR}/net/avahi-gtk \
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+LIB_DEPENDS=	libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc3 \
+    		libavahi-core.so:${PORTSDIR}/net/avahi-app \
+		libavahi-ui-gtk3.so:${PORTSDIR}/net/avahi-gtk3 \
 		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
-CONFLICTS=	vinagre-3.[0-9]*
-
-NO_STAGE=	yes
-USE_BZIP2=	yes
-USES=		desktop-file-utils gettext gmake pathfix shared-mime-info
-USE_GNOME=	gnomeprefix intlhack vte gconf2 gnomedocutils gnomepanel
+USE_XZ=		yes
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info
+USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 vte3
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--enable-avahi --enable-applet -enable-ssh
-CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--disable-spice --enable-ssh
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-GCONF_SCHEMAS=	vinagre.schemas
-
-MAN1=		vinagre.1
+GLIB_SCHEMAS=	org.gnome.Vinagre.gschema.xml
 
-OPTIONS_DEFINE=	TELEPATHY
-OPTIONS_DEFAULT=TELEPATHY
+OPTIONS_DEFINE=	TELEPATHY RDP
+OPTIONS_DEFAULT=TELEPATHY RDP
 TELEPATHY_DESC=	Telepathy integration
+RDP_DESC=	MS Windows remote desktop support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTELEPATHY}
-CONFIGURE_ARGS+=--enable-telepathy
-LIB_DEPENDS+=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib
+LIB_DEPENDS+=	libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 PLIST_SUB+=	TELEPATHY=""
 .else
-CONFIGURE_ARGS+=--disable-telepathy
+CONFIGURE_ARGS+=--without-telepathy
 PLIST_SUB+=	TELEPATHY="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MRDP}
+BUILD_DEPENDS+=	rdesktop:${PORTSDIR}/net/rdesktop
+RUN_DEPENDS+=	rdesktop:${PORTSDIR}/net/rdesktop
+CONFIGURE_ARGS+=--enable-rdp
+PLIST_SUB+=	RDP=""
+.else
+CONFIGURE_ARGS+=--disable-rdp
+PLIST_SUB+=	RDP="@comment "
+.endif
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in AUTHORS COPYING ChangeLog NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 9a870e3fd..29520bbc7 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/vinagre-2.30.3.tar.bz2) = 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4
-SIZE (gnome2/vinagre-2.30.3.tar.bz2) = 2447388
+SHA256 (gnome3/vinagre-3.6.2.tar.xz) = dec4b24de9c372cef3efc0d3e80514c85250e01ce01325d07a4e4e956b4a8f3c
+SIZE (gnome3/vinagre-3.6.2.tar.xz) = 2497324
diff --git a/net/vinagre/files/patch-Makefile.in b/net/vinagre/files/patch-Makefile.in
deleted file mode 100644
index d54e01e7f..000000000
--- a/net/vinagre/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-12-16 14:18:35.000000000 -0500
-+++ Makefile.in	2007-12-16 14:19:09.000000000 -0500
-@@ -667,7 +667,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-vinagredocDATA
-+install-data-am:
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c
deleted file mode 100644
index e855de33e..000000000
--- a/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/vnc/vinagre-vnc-listener-dialog.c.orig	2010-01-06 19:49:40.000000000 -0500
-+++ plugins/vnc/vinagre-vnc-listener-dialog.c	2010-01-06 19:49:55.000000000 -0500
-@@ -18,6 +18,8 @@
-  * along with this program. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
diff --git a/net/vinagre/files/patch-vinagre_vinagre-ssh.c b/net/vinagre/files/patch-vinagre_vinagre-ssh.c
new file mode 100644
index 000000000..7bc19e9ae
--- /dev/null
+++ b/net/vinagre/files/patch-vinagre_vinagre-ssh.c
@@ -0,0 +1,11 @@
+--- vinagre/vinagre-ssh.c.orig	2011-09-18 22:03:12.000000000 +0200
++++ vinagre/vinagre-ssh.c	2011-09-18 22:03:20.000000000 +0200
+@@ -44,7 +44,7 @@ static const int SSH_READ_TIMEOUT = 40; 
+ 
+ #ifdef HAVE_GRANTPT
+ /* We only use this on systems with unix98 ptys */
+-#define USE_PTY 1
++//#define USE_PTY 1
+ #endif
+ 
+ typedef enum {
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index a8b4705f3..79bdf34a3 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -1,193 +1,250 @@
 bin/vinagre
-libdata/bonobo/servers/GNOME_VinagreApplet.server
-libexec/vinagre-applet
-include/vinagre-1.0/vinagre/vinagre-app.h
-include/vinagre-1.0/vinagre/vinagre-bacon.h
-include/vinagre-1.0/vinagre/vinagre-bookmarks-entry.h
-include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h
-include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h
-include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h
-include/vinagre-1.0/vinagre/vinagre-bookmarks.h
-include/vinagre-1.0/vinagre/vinagre-cache-prefs.h
-include/vinagre-1.0/vinagre/vinagre-commands.h
-include/vinagre-1.0/vinagre/vinagre-connect.h
-include/vinagre-1.0/vinagre/vinagre-connection.h
-include/vinagre-1.0/vinagre/vinagre-debug.h
-include/vinagre-1.0/vinagre/vinagre-dirs.h
-include/vinagre-1.0/vinagre/vinagre-dnd.h
-include/vinagre-1.0/vinagre/vinagre-fav.h
-include/vinagre-1.0/vinagre/vinagre-notebook.h
-include/vinagre-1.0/vinagre/vinagre-plugin-loader.h
-include/vinagre-1.0/vinagre/vinagre-plugin.h
-include/vinagre-1.0/vinagre/vinagre-prefs.h
-include/vinagre-1.0/vinagre/vinagre-ssh.h
-include/vinagre-1.0/vinagre/vinagre-tab.h
-include/vinagre-1.0/vinagre/vinagre-ui.h
-include/vinagre-1.0/vinagre/vinagre-utils.h
-include/vinagre-1.0/vinagre/vinagre-window.h
-lib/vinagre-1/plugin-loaders/libcloader.la
-lib/vinagre-1/plugin-loaders/libcloader.so
-lib/vinagre-1/plugins/libssh.la
-lib/vinagre-1/plugins/libssh.so
-lib/vinagre-1/plugins/libvnc.la
-lib/vinagre-1/plugins/libvnc.so
-lib/vinagre-1/plugins/ssh.vinagre-plugin
-lib/vinagre-1/plugins/vnc.vinagre-plugin
-libdata/pkgconfig/vinagre-1.0.pc
+man/man1/vinagre.1.gz
+share/GConf/gsettings/org.gnome.Vinagre.convert
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
 %%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/C/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/C/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/C/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/C/legal.xml
-share/gnome/help/vinagre/C/vinagre.xml
-share/gnome/help/vinagre/ca/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/ca/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/ca/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/ca/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/ca/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/ca/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/ca/vinagre.xml
-share/gnome/help/vinagre/cs/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/cs/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/cs/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/cs/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/cs/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/cs/vinagre.xml
-share/gnome/help/vinagre/de/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/de/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/de/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/de/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/de/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/de/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/de/vinagre.xml
-share/gnome/help/vinagre/el/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/el/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/el/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/el/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/el/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/el/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/el/vinagre.xml
-share/gnome/help/vinagre/en_GB/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/en_GB/vinagre.xml
-share/gnome/help/vinagre/es/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/es/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/es/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/es/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/es/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/es/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/es/vinagre.xml
-share/gnome/help/vinagre/fr/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/fr/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/fr/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/fr/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/fr/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/fr/vinagre.xml
-share/gnome/help/vinagre/it/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/it/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/it/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/it/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/it/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/it/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/it/vinagre.xml
-share/gnome/help/vinagre/oc/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/oc/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/oc/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/oc/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/oc/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/oc/vinagre.xml
-share/gnome/help/vinagre/pl/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/pl/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/pl/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/pl/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/pl/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/pl/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/pl/vinagre.xml
-share/gnome/help/vinagre/pt/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/pt/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/pt/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/pt/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/pt/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/pt/vinagre.xml
-share/gnome/help/vinagre/pt_BR/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/pt_BR/vinagre.xml
-share/gnome/help/vinagre/sq/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/sq/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/sq/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/sq/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/sq/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/sq/vinagre.xml
-share/gnome/help/vinagre/sv/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/sv/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/sv/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/sv/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/sv/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/sv/vinagre.xml
-share/gnome/help/vinagre/th/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/th/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/th/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/th/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/th/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/th/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/th/vinagre.xml
-share/gnome/help/vinagre/zh_CN/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/zh_CN/vinagre.xml
-share/icons/hicolor/16x16/apps/vinagre.png
+share/help/C/vinagre/connect.page
+share/help/C/vinagre/connect-file.page
+share/help/C/vinagre/fullscreen.page
+share/help/C/vinagre/index.page
+share/help/C/vinagre/introduction.page
+share/help/C/vinagre/keyboard-shortcuts.page
+share/help/C/vinagre/reverse-connections.page
+share/help/C/vinagre/scaling.page
+share/help/C/vinagre/take-screenshot.page
+share/help/C/vinagre/view-only.page
+share/help/C/vinagre/figures/vinagre-auth-needed.png
+share/help/C/vinagre/figures/vinagre-connect-dialog.png
+share/help/C/vinagre/figures/vinagre-connected.png
+share/help/C/vinagre/figures/vinagre-connection-closed.png
+share/help/C/vinagre/figures/vinagre-fullscreen.png
+share/help/C/vinagre/figures/vinagre-no-scaling.png
+share/help/C/vinagre/figures/vinagre-reverse-connections.png
+share/help/C/vinagre/figures/vinagre-scaling.png
+share/help/de/vinagre/connect.page
+share/help/de/vinagre/connect-file.page
+share/help/de/vinagre/fullscreen.page
+share/help/de/vinagre/index.page
+share/help/de/vinagre/introduction.page
+share/help/de/vinagre/keyboard-shortcuts.page
+share/help/de/vinagre/reverse-connections.page
+share/help/de/vinagre/scaling.page
+share/help/de/vinagre/take-screenshot.page
+share/help/de/vinagre/view-only.page
+share/help/de/vinagre/figures/vinagre-auth-needed.png
+share/help/de/vinagre/figures/vinagre-connect-dialog.png
+share/help/de/vinagre/figures/vinagre-connected.png
+share/help/de/vinagre/figures/vinagre-connection-closed.png
+share/help/de/vinagre/figures/vinagre-fullscreen.png
+share/help/de/vinagre/figures/vinagre-no-scaling.png
+share/help/de/vinagre/figures/vinagre-reverse-connections.png
+share/help/de/vinagre/figures/vinagre-scaling.png
+share/help/el/vinagre/connect-file.page
+share/help/el/vinagre/connect.page
+share/help/el/vinagre/figures/vinagre-auth-needed.png
+share/help/el/vinagre/figures/vinagre-connect-dialog.png
+share/help/el/vinagre/figures/vinagre-connected.png
+share/help/el/vinagre/figures/vinagre-connection-closed.png
+share/help/el/vinagre/figures/vinagre-fullscreen.png
+share/help/el/vinagre/figures/vinagre-no-scaling.png
+share/help/el/vinagre/figures/vinagre-reverse-connections.png
+share/help/el/vinagre/figures/vinagre-scaling.png
+share/help/el/vinagre/fullscreen.page
+share/help/el/vinagre/index.page
+share/help/el/vinagre/introduction.page
+share/help/el/vinagre/keyboard-shortcuts.page
+share/help/el/vinagre/reverse-connections.page
+share/help/el/vinagre/scaling.page
+share/help/el/vinagre/take-screenshot.page
+share/help/el/vinagre/view-only.page
+share/help/es/vinagre/connect.page
+share/help/es/vinagre/connect-file.page
+share/help/es/vinagre/fullscreen.page
+share/help/es/vinagre/index.page
+share/help/es/vinagre/introduction.page
+share/help/es/vinagre/keyboard-shortcuts.page
+share/help/es/vinagre/reverse-connections.page
+share/help/es/vinagre/scaling.page
+share/help/es/vinagre/take-screenshot.page
+share/help/es/vinagre/view-only.page
+share/help/es/vinagre/figures/vinagre-auth-needed.png
+share/help/es/vinagre/figures/vinagre-connect-dialog.png
+share/help/es/vinagre/figures/vinagre-connected.png
+share/help/es/vinagre/figures/vinagre-connection-closed.png
+share/help/es/vinagre/figures/vinagre-fullscreen.png
+share/help/es/vinagre/figures/vinagre-no-scaling.png
+share/help/es/vinagre/figures/vinagre-reverse-connections.png
+share/help/es/vinagre/figures/vinagre-scaling.png
+share/help/eu/vinagre/connect.page
+share/help/eu/vinagre/connect-file.page
+share/help/eu/vinagre/fullscreen.page
+share/help/eu/vinagre/index.page
+share/help/eu/vinagre/introduction.page
+share/help/eu/vinagre/keyboard-shortcuts.page
+share/help/eu/vinagre/reverse-connections.page
+share/help/eu/vinagre/scaling.page
+share/help/eu/vinagre/take-screenshot.page
+share/help/eu/vinagre/view-only.page
+share/help/eu/vinagre/figures/vinagre-auth-needed.png
+share/help/eu/vinagre/figures/vinagre-connect-dialog.png
+share/help/eu/vinagre/figures/vinagre-connected.png
+share/help/eu/vinagre/figures/vinagre-connection-closed.png
+share/help/eu/vinagre/figures/vinagre-fullscreen.png
+share/help/eu/vinagre/figures/vinagre-no-scaling.png
+share/help/eu/vinagre/figures/vinagre-reverse-connections.png
+share/help/eu/vinagre/figures/vinagre-scaling.png
+share/help/fa/vinagre/connect-file.page
+share/help/fa/vinagre/connect.page
+share/help/fa/vinagre/figures/vinagre-auth-needed.png
+share/help/fa/vinagre/figures/vinagre-connect-dialog.png
+share/help/fa/vinagre/figures/vinagre-connected.png
+share/help/fa/vinagre/figures/vinagre-connection-closed.png
+share/help/fa/vinagre/figures/vinagre-fullscreen.png
+share/help/fa/vinagre/figures/vinagre-no-scaling.png
+share/help/fa/vinagre/figures/vinagre-reverse-connections.png
+share/help/fa/vinagre/figures/vinagre-scaling.png
+share/help/fa/vinagre/fullscreen.page
+share/help/fa/vinagre/index.page
+share/help/fa/vinagre/introduction.page
+share/help/fa/vinagre/keyboard-shortcuts.page
+share/help/fa/vinagre/reverse-connections.page
+share/help/fa/vinagre/scaling.page
+share/help/fa/vinagre/take-screenshot.page
+share/help/fa/vinagre/view-only.page
+share/help/fr/vinagre/connect.page
+share/help/fr/vinagre/connect-file.page
+share/help/fr/vinagre/fullscreen.page
+share/help/fr/vinagre/index.page
+share/help/fr/vinagre/introduction.page
+share/help/fr/vinagre/keyboard-shortcuts.page
+share/help/fr/vinagre/reverse-connections.page
+share/help/fr/vinagre/scaling.page
+share/help/fr/vinagre/take-screenshot.page
+share/help/fr/vinagre/view-only.page
+share/help/fr/vinagre/figures/vinagre-auth-needed.png
+share/help/fr/vinagre/figures/vinagre-connect-dialog.png
+share/help/fr/vinagre/figures/vinagre-connected.png
+share/help/fr/vinagre/figures/vinagre-connection-closed.png
+share/help/fr/vinagre/figures/vinagre-fullscreen.png
+share/help/fr/vinagre/figures/vinagre-no-scaling.png
+share/help/fr/vinagre/figures/vinagre-reverse-connections.png
+share/help/fr/vinagre/figures/vinagre-scaling.png
+share/help/gl/vinagre/connect.page
+share/help/gl/vinagre/connect-file.page
+share/help/gl/vinagre/fullscreen.page
+share/help/gl/vinagre/index.page
+share/help/gl/vinagre/introduction.page
+share/help/gl/vinagre/keyboard-shortcuts.page
+share/help/gl/vinagre/reverse-connections.page
+share/help/gl/vinagre/scaling.page
+share/help/gl/vinagre/take-screenshot.page
+share/help/gl/vinagre/view-only.page
+share/help/gl/vinagre/figures/vinagre-auth-needed.png
+share/help/gl/vinagre/figures/vinagre-connect-dialog.png
+share/help/gl/vinagre/figures/vinagre-connected.png
+share/help/gl/vinagre/figures/vinagre-connection-closed.png
+share/help/gl/vinagre/figures/vinagre-fullscreen.png
+share/help/gl/vinagre/figures/vinagre-no-scaling.png
+share/help/gl/vinagre/figures/vinagre-reverse-connections.png
+share/help/gl/vinagre/figures/vinagre-scaling.png
+share/help/hu/vinagre/connect.page
+share/help/hu/vinagre/connect-file.page
+share/help/hu/vinagre/fullscreen.page
+share/help/hu/vinagre/index.page
+share/help/hu/vinagre/introduction.page
+share/help/hu/vinagre/keyboard-shortcuts.page
+share/help/hu/vinagre/reverse-connections.page
+share/help/hu/vinagre/scaling.page
+share/help/hu/vinagre/take-screenshot.page
+share/help/hu/vinagre/view-only.page
+share/help/hu/vinagre/figures/vinagre-auth-needed.png
+share/help/hu/vinagre/figures/vinagre-connect-dialog.png
+share/help/hu/vinagre/figures/vinagre-connected.png
+share/help/hu/vinagre/figures/vinagre-connection-closed.png
+share/help/hu/vinagre/figures/vinagre-fullscreen.png
+share/help/hu/vinagre/figures/vinagre-no-scaling.png
+share/help/hu/vinagre/figures/vinagre-reverse-connections.png
+share/help/hu/vinagre/figures/vinagre-scaling.png
+share/help/lv/vinagre/connect.page
+share/help/lv/vinagre/connect-file.page
+share/help/lv/vinagre/fullscreen.page
+share/help/lv/vinagre/index.page
+share/help/lv/vinagre/introduction.page
+share/help/lv/vinagre/keyboard-shortcuts.page
+share/help/lv/vinagre/reverse-connections.page
+share/help/lv/vinagre/scaling.page
+share/help/lv/vinagre/take-screenshot.page
+share/help/lv/vinagre/view-only.page
+share/help/lv/vinagre/figures/vinagre-auth-needed.png
+share/help/lv/vinagre/figures/vinagre-connect-dialog.png
+share/help/lv/vinagre/figures/vinagre-connected.png
+share/help/lv/vinagre/figures/vinagre-connection-closed.png
+share/help/lv/vinagre/figures/vinagre-fullscreen.png
+share/help/lv/vinagre/figures/vinagre-no-scaling.png
+share/help/lv/vinagre/figures/vinagre-reverse-connections.png
+share/help/lv/vinagre/figures/vinagre-scaling.png
+share/help/ru/vinagre/connect.page
+share/help/ru/vinagre/connect-file.page
+share/help/ru/vinagre/fullscreen.page
+share/help/ru/vinagre/index.page
+share/help/ru/vinagre/introduction.page
+share/help/ru/vinagre/keyboard-shortcuts.page
+share/help/ru/vinagre/reverse-connections.page
+share/help/ru/vinagre/scaling.page
+share/help/ru/vinagre/take-screenshot.page
+share/help/ru/vinagre/view-only.page
+share/help/ru/vinagre/figures/vinagre-auth-needed.png
+share/help/ru/vinagre/figures/vinagre-connect-dialog.png
+share/help/ru/vinagre/figures/vinagre-connected.png
+share/help/ru/vinagre/figures/vinagre-connection-closed.png
+share/help/ru/vinagre/figures/vinagre-fullscreen.png
+share/help/ru/vinagre/figures/vinagre-no-scaling.png
+share/help/ru/vinagre/figures/vinagre-reverse-connections.png
+share/help/ru/vinagre/figures/vinagre-scaling.png
+share/help/sl/vinagre/connect.page
+share/help/sl/vinagre/connect-file.page
+share/help/sl/vinagre/fullscreen.page
+share/help/sl/vinagre/index.page
+share/help/sl/vinagre/introduction.page
+share/help/sl/vinagre/keyboard-shortcuts.page
+share/help/sl/vinagre/reverse-connections.page
+share/help/sl/vinagre/scaling.page
+share/help/sl/vinagre/take-screenshot.page
+share/help/sl/vinagre/view-only.page
+share/help/sl/vinagre/figures/vinagre-auth-needed.png
+share/help/sl/vinagre/figures/vinagre-connect-dialog.png
+share/help/sl/vinagre/figures/vinagre-connected.png
+share/help/sl/vinagre/figures/vinagre-connection-closed.png
+share/help/sl/vinagre/figures/vinagre-fullscreen.png
+share/help/sl/vinagre/figures/vinagre-no-scaling.png
+share/help/sl/vinagre/figures/vinagre-reverse-connections.png
+share/help/sl/vinagre/figures/vinagre-scaling.png
 share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png
 share/icons/hicolor/16x16/mimetypes/application-x-vnc.png
 share/icons/hicolor/16x16/status/view-minimize.png
-share/icons/hicolor/22x22/apps/vinagre.png
 share/icons/hicolor/22x22/mimetypes/application-x-remote-connection.png
 share/icons/hicolor/22x22/mimetypes/application-x-vnc.png
 share/icons/hicolor/22x22/status/view-minimize.png
-share/icons/hicolor/24x24/apps/vinagre.png
 share/icons/hicolor/24x24/mimetypes/application-x-remote-connection.png
 share/icons/hicolor/24x24/mimetypes/application-x-vnc.png
-share/icons/hicolor/32x32/apps/vinagre.png
 share/icons/hicolor/32x32/mimetypes/application-x-remote-connection.png
 share/icons/hicolor/32x32/mimetypes/application-x-vnc.png
 share/icons/hicolor/32x32/status/view-minimize.png
-share/icons/hicolor/48x48/apps/vinagre.png
 share/icons/hicolor/48x48/mimetypes/application-x-remote-connection.png
 share/icons/hicolor/48x48/mimetypes/application-x-vnc.png
 share/icons/hicolor/48x48/status/view-minimize.png
-share/icons/hicolor/scalable/apps/vinagre.svg
 share/icons/hicolor/scalable/mimetypes/application-x-remote-connection.svg
 share/icons/hicolor/scalable/mimetypes/application-x-vnc.svg
 share/locale/ar/LC_MESSAGES/vinagre.mo
 share/locale/as/LC_MESSAGES/vinagre.mo
 share/locale/ast/LC_MESSAGES/vinagre.mo
+share/locale/be/LC_MESSAGES/vinagre.mo
 share/locale/be@latin/LC_MESSAGES/vinagre.mo
 share/locale/bg/LC_MESSAGES/vinagre.mo
 share/locale/bn/LC_MESSAGES/vinagre.mo
@@ -200,9 +257,11 @@ share/locale/de/LC_MESSAGES/vinagre.mo
 share/locale/el/LC_MESSAGES/vinagre.mo
 share/locale/en@shaw/LC_MESSAGES/vinagre.mo
 share/locale/en_GB/LC_MESSAGES/vinagre.mo
+share/locale/eo/LC_MESSAGES/vinagre.mo
 share/locale/es/LC_MESSAGES/vinagre.mo
 share/locale/et/LC_MESSAGES/vinagre.mo
 share/locale/eu/LC_MESSAGES/vinagre.mo
+share/locale/fa/LC_MESSAGES/vinagre.mo
 share/locale/fi/LC_MESSAGES/vinagre.mo
 share/locale/fr/LC_MESSAGES/vinagre.mo
 share/locale/ga/LC_MESSAGES/vinagre.mo
@@ -247,88 +306,23 @@ share/locale/ta/LC_MESSAGES/vinagre.mo
 share/locale/te/LC_MESSAGES/vinagre.mo
 share/locale/th/LC_MESSAGES/vinagre.mo
 share/locale/tr/LC_MESSAGES/vinagre.mo
-share/locale/vi/LC_MESSAGES/vinagre.mo
+share/locale/ug/LC_MESSAGES/vinagre.mo
 share/locale/uk/LC_MESSAGES/vinagre.mo
+share/locale/vi/LC_MESSAGES/vinagre.mo
 share/locale/zh_CN/LC_MESSAGES/vinagre.mo
 share/locale/zh_HK/LC_MESSAGES/vinagre.mo
 share/locale/zh_TW/LC_MESSAGES/vinagre.mo
-share/mime/application/x-remote-connection.xml
-share/mime/application/x-vnc.xml
 share/mime/packages/vinagre-mime.xml
-share/omf/vinagre/vinagre-C.omf
-share/omf/vinagre/vinagre-ca.omf
-share/omf/vinagre/vinagre-cs.omf
-share/omf/vinagre/vinagre-de.omf
-share/omf/vinagre/vinagre-el.omf
-share/omf/vinagre/vinagre-en_GB.omf
-share/omf/vinagre/vinagre-es.omf
-share/omf/vinagre/vinagre-fr.omf
-share/omf/vinagre/vinagre-it.omf
-share/omf/vinagre/vinagre-oc.omf
-share/omf/vinagre/vinagre-pl.omf
-share/omf/vinagre/vinagre-pt.omf
-share/omf/vinagre/vinagre-pt_BR.omf
-share/omf/vinagre/vinagre-sq.omf
-share/omf/vinagre/vinagre-sv.omf
-share/omf/vinagre/vinagre-th.omf
-share/omf/vinagre/vinagre-zh_CN.omf
 %%TELEPATHY%%share/telepathy/clients/Vinagre.client
-share/vinagre-1/plugins/vnc/vnc.ui
-%%DATADIR%%/vinagre-fav-ui.xml
-%%DATADIR%%/GNOME_VinagreApplet.xml
 %%DATADIR%%/vinagre-ui.xml
 %%DATADIR%%/vinagre.ui
 @dirrm %%DATADIR%%
-@dirrm share/vinagre-1/plugins/vnc
-@dirrm share/vinagre-1/plugins
-@dirrm share/vinagre-1
 %%TELEPATHY%%@dirrmtry share/telepathy/clients
 %%TELEPATHY%%@dirrmtry share/telepathy
-@dirrm share/omf/vinagre
-@dirrm share/gnome/help/vinagre/zh_CN/figures
-@dirrm share/gnome/help/vinagre/zh_CN
-@dirrm share/gnome/help/vinagre/th/figures
-@dirrm share/gnome/help/vinagre/th
-@dirrm share/gnome/help/vinagre/sv/figures
-@dirrm share/gnome/help/vinagre/sv
-@dirrm share/gnome/help/vinagre/sq/figures
-@dirrm share/gnome/help/vinagre/sq
-@dirrm share/gnome/help/vinagre/pt_BR/figures
-@dirrm share/gnome/help/vinagre/pt_BR
-@dirrm share/gnome/help/vinagre/pt/figures
-@dirrm share/gnome/help/vinagre/pt
-@dirrm share/gnome/help/vinagre/pl/figures
-@dirrm share/gnome/help/vinagre/pl
-@dirrm share/gnome/help/vinagre/oc/figures
-@dirrm share/gnome/help/vinagre/oc
-@dirrm share/gnome/help/vinagre/it/figures
-@dirrm share/gnome/help/vinagre/it
-@dirrm share/gnome/help/vinagre/fr/figures
-@dirrm share/gnome/help/vinagre/fr
-@dirrm share/gnome/help/vinagre/es/figures
-@dirrm share/gnome/help/vinagre/es
-@dirrm share/gnome/help/vinagre/en_GB/figures
-@dirrm share/gnome/help/vinagre/en_GB
-@dirrm share/gnome/help/vinagre/el/figures
-@dirrm share/gnome/help/vinagre/el
-@dirrm share/gnome/help/vinagre/de/figures
-@dirrm share/gnome/help/vinagre/de
-@dirrm share/gnome/help/vinagre/cs/figures
-@dirrm share/gnome/help/vinagre/cs
-@dirrm share/gnome/help/vinagre/ca/figures
-@dirrm share/gnome/help/vinagre/ca
-@dirrm share/gnome/help/vinagre/C/figures
-@dirrm share/gnome/help/vinagre/C
-@dirrm share/gnome/help/vinagre
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
-@dirrm lib/vinagre-1/plugins
-@dirrm lib/vinagre-1/plugin-loaders
-@dirrm lib/vinagre-1
-@dirrm include/vinagre-1.0/vinagre
-@dirrm include/vinagre-1.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -357,3 +351,42 @@ share/vinagre-1/plugins/vnc/vnc.ui
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm share/help/sl/vinagre/figures
+@dirrm share/help/sl/vinagre
+@dirrmtry share/help/sl
+@dirrm share/help/ru/vinagre/figures
+@dirrm share/help/ru/vinagre
+@dirrmtry share/help/ru
+@dirrm share/help/lv/vinagre/figures
+@dirrm share/help/lv/vinagre
+@dirrmtry share/help/lv
+@dirrm share/help/hu/vinagre/figures
+@dirrm share/help/hu/vinagre
+@dirrmtry share/help/hu
+@dirrm share/help/gl/vinagre/figures
+@dirrm share/help/gl/vinagre
+@dirrmtry share/help/gl
+@dirrm share/help/fr/vinagre/figures
+@dirrm share/help/fr/vinagre
+@dirrmtry share/help/fr
+@dirrm share/help/fa/vinagre/figures
+@dirrm share/help/fa/vinagre
+@dirrmtry share/help/fa
+@dirrm share/help/eu/vinagre/figures
+@dirrm share/help/eu/vinagre
+@dirrmtry share/help/eu
+@dirrm share/help/es/vinagre/figures
+@dirrm share/help/es/vinagre
+@dirrmtry share/help/es
+@dirrm share/help/el/vinagre/figures
+@dirrm share/help/el/vinagre
+@dirrmtry share/help/el
+@dirrm share/help/de/vinagre/figures
+@dirrm share/help/de/vinagre
+@dirrmtry share/help/de
+@dirrm share/help/C/vinagre/figures
+@dirrm share/help/C/vinagre
+@dirrmtry share/help/C
+@dirrmtry share/help
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications