r27659 - in /desktop/experimental/vino/debian: changelog control control.in patches/01_ipv6-fix.patch patches/02_server_sm-disable.patch patches/11_hurd_maxhostnamelen.patch patches/series rules source/ source/format
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Sun Apr 17 18:23:07 UTC 2011
Author: jordi
Date: Sun Apr 17 18:23:01 2011
New Revision: 27659
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27659
Log:
* New upstream stable release.
* Adjust Build-Depends for the GTK+3 port.
* Update ipv6 patch to use new config.h names.
* Switch to source format 3.0 (quilt). Drop usage of simple-patchsys and
adapt patch headers to add an extra patch prefix.
* Drop obsolete Suggests on gnome2-user-guide.
* Add a Homepage field.
* Bump Standards-Version to 3.9.2.
Added:
desktop/experimental/vino/debian/patches/series
desktop/experimental/vino/debian/source/
desktop/experimental/vino/debian/source/format
Modified:
desktop/experimental/vino/debian/changelog
desktop/experimental/vino/debian/control
desktop/experimental/vino/debian/control.in
desktop/experimental/vino/debian/patches/01_ipv6-fix.patch
desktop/experimental/vino/debian/patches/02_server_sm-disable.patch
desktop/experimental/vino/debian/patches/11_hurd_maxhostnamelen.patch
desktop/experimental/vino/debian/rules
Modified: desktop/experimental/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/changelog?rev=27659&op=diff
==============================================================================
--- desktop/experimental/vino/debian/changelog [utf-8] (original)
+++ desktop/experimental/vino/debian/changelog [utf-8] Sun Apr 17 18:23:01 2011
@@ -1,3 +1,16 @@
+vino (3.0.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * Adjust Build-Depends for the GTK+3 port.
+ * Update ipv6 patch to use new config.h names.
+ * Switch to source format 3.0 (quilt). Drop usage of simple-patchsys and
+ adapt patch headers to add an extra patch prefix.
+ * Drop obsolete Suggests on gnome2-user-guide.
+ * Add a Homepage field.
+ * Bump Standards-Version to 3.9.2.
+
+ -- Jordi Mallach <jordi at debian.org> Sun, 17 Apr 2011 19:33:57 +0200
+
vino (2.28.2-2) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/vino/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/control?rev=27659&op=diff
==============================================================================
--- desktop/experimental/vino/debian/control [utf-8] (original)
+++ desktop/experimental/vino/debian/control [utf-8] Sun Apr 17 18:23:01 2011
@@ -7,40 +7,35 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at 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>
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
- intltool (>= 0.35.0),
- libgtk2.0-dev (>= 2.16.0),
- libglib2.0-dev (>= 2.17.0),
- libdbus-glib-1-dev,
- libdbus-1-dev (>= 1.2.3),
+ intltool (>= 0.40.0),
+ libavahi-client-dev (>= 0.6),
+ libavahi-glib-dev (>= 0.6),
+ libglib2.0-dev (>= 2.26.0),
+ libgnome-keyring-dev,
+ libgcrypt11-dev (>= 1.1.90),
+ libgnutls-dev (>= 1.0.0),
+ libgtk-3-dev (>= 3.0.0),
+ libjpeg-dev,
+ libnotify-dev (>= 0.7.0),
libsoup2.4-dev (>= 2.24.0),
- libgnomeui-dev (>= 2.6.1.1-4),
- libgconf2-dev,
- libnotify-dev (>= 0.4.4),
- libnotify-dev-gtk2.10,
- network-manager-dev (>= 0.7) [linux-any],
- libgnome-keyring-dev,
- libpango1.0-dev,
+ libtelepathy-glib-dev (>= 0.11.6),
libxt-dev,
libx11-dev,
- libgnutls-dev (>= 1.0.0),
- libgcrypt11-dev (>= 1.1.90),
libxdamage-dev,
+ libxext-dev,
libxfixes-dev,
- libxext-dev,
libxtst-dev,
- libavahi-client-dev (>= 0.6),
- libavahi-glib-dev (>= 0.6),
- libjpeg-dev,
- zlib1g-dev,
- libunique-dev (>= 1.0.0),
- libtelepathy-glib-dev (>= 0.7.31)
-Standards-Version: 3.9.0
+ network-manager-dev (>= 0.7) [linux-any],
+ pkg-config (>= 0.16),
+ zlib1g-dev
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/vino
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/vino
+Homepage: http://live.gnome.org/Vino
Package: vino
Architecture: any
@@ -48,7 +43,7 @@
${misc:Depends}
Recommends: gvfs
Suggests: vinagre,
- gnome-user-guide | gnome2-user-guide (>= 2.8.1)
+ gnome-user-guide
Description: VNC server for GNOME
VNC is a protocol that allows remote display of a user's desktop. This
package provides a VNC server that integrates with GNOME, allowing you
Modified: desktop/experimental/vino/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/control.in?rev=27659&op=diff
==============================================================================
--- desktop/experimental/vino/debian/control.in [utf-8] (original)
+++ desktop/experimental/vino/debian/control.in [utf-8] Sun Apr 17 18:23:01 2011
@@ -6,36 +6,31 @@
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
gnome-pkg-tools (>= 0.10),
- intltool (>= 0.35.0),
- libgtk2.0-dev (>= 2.16.0),
- libglib2.0-dev (>= 2.17.0),
- libdbus-glib-1-dev,
- libdbus-1-dev (>= 1.2.3),
+ intltool (>= 0.40.0),
+ libavahi-client-dev (>= 0.6),
+ libavahi-glib-dev (>= 0.6),
+ libglib2.0-dev (>= 2.26.0),
+ libgnome-keyring-dev,
+ libgcrypt11-dev (>= 1.1.90),
+ libgnutls-dev (>= 1.0.0),
+ libgtk-3-dev (>= 3.0.0),
+ libjpeg-dev,
+ libnotify-dev (>= 0.7.0),
libsoup2.4-dev (>= 2.24.0),
- libgnomeui-dev (>= 2.6.1.1-4),
- libgconf2-dev,
- libnotify-dev (>= 0.4.4),
- libnotify-dev-gtk2.10,
- network-manager-dev (>= 0.7) [linux-any],
- libgnome-keyring-dev,
- libpango1.0-dev,
+ libtelepathy-glib-dev (>= 0.11.6),
libxt-dev,
libx11-dev,
- libgnutls-dev (>= 1.0.0),
- libgcrypt11-dev (>= 1.1.90),
libxdamage-dev,
+ libxext-dev,
libxfixes-dev,
- libxext-dev,
libxtst-dev,
- libavahi-client-dev (>= 0.6),
- libavahi-glib-dev (>= 0.6),
- libjpeg-dev,
- zlib1g-dev,
- libunique-dev (>= 1.0.0),
- libtelepathy-glib-dev (>= 0.7.31)
-Standards-Version: 3.9.0
+ network-manager-dev (>= 0.7) [linux-any],
+ pkg-config (>= 0.16),
+ zlib1g-dev
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/vino
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/vino
+Homepage: http://live.gnome.org/Vino
Package: vino
Architecture: any
@@ -43,7 +38,7 @@
${misc:Depends}
Recommends: gvfs
Suggests: vinagre,
- gnome-user-guide | gnome2-user-guide (>= 2.8.1)
+ gnome-user-guide
Description: VNC server for GNOME
VNC is a protocol that allows remote display of a user's desktop. This
package provides a VNC server that integrates with GNOME, allowing you
Modified: desktop/experimental/vino/debian/patches/01_ipv6-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/01_ipv6-fix.patch?rev=27659&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/01_ipv6-fix.patch [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/01_ipv6-fix.patch [utf-8] Sun Apr 17 18:23:01 2011
@@ -1,14 +1,16 @@
---- server/libvncserver/sockets.c.orig 2009-05-12 11:39:33.000000000 +0000
-+++ server/libvncserver/sockets.c 2010-01-23 13:00:12.000000000 +0000
-@@ -578,6 +578,7 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre
+Index: vino-3.0.0/server/libvncserver/sockets.c
+===================================================================
+--- vino-3.0.0.orig/server/libvncserver/sockets.c 2011-04-17 20:03:42.912684864 +0200
++++ vino-3.0.0/server/libvncserver/sockets.c 2011-04-17 20:04:33.220684887 +0200
+@@ -583,6 +583,7 @@
if(netIface == NULL || strlen(netIface) == 0)
{
- #ifdef ENABLE_IPV6
+ #ifdef VINO_ENABLE_IPV6
+ int sock6 = -1;
struct sockaddr_in6 s6;
memset(&s6, 0, sizeof(s6));
-@@ -585,10 +586,10 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre
+@@ -590,10 +591,10 @@
s6.sin6_port = htons(port);
s6.sin6_addr = in6addr_any;
@@ -22,13 +24,13 @@
struct sockaddr_in s4;
memset(&s4, 0, sizeof(s4));
-@@ -598,15 +599,23 @@ ListenOnTCPPort(rfbScreenInfoPtr rfbScre
+@@ -603,15 +604,23 @@
sock = NewSocketListenTCP ((struct sockaddr*)&s4, sizeof(s4));
rfbLog("Listening IPv4://0.0.0.0:%d\n", port);
- }
-+#ifdef ENABLE_IPV6
++#ifdef VINO_ENABLE_IPV6
+ if(sock6 > 0) {
+ psock[*ptot] = sock6;
+ *ptot += 1;
@@ -51,11 +53,11 @@
return FALSE;
}
-@@ -676,6 +685,15 @@ NewSocketListenTCP(struct sockaddr *addr
+@@ -681,6 +690,15 @@
return -1;
}
-+#ifdef ENABLE_IPV6
++#ifdef VINO_ENABLE_IPV6
+ if (addr->sa_family == AF_INET6) {
+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
+ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&one, sizeof(one));
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=27659&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] Sun Apr 17 18:23:01 2011
@@ -1,5 +1,5 @@
---- server/vino-server.desktop.in.in.orig 2009-03-23 22:17:35.647373307 +0100
-+++ server/vino-server.desktop.in.in 2009-03-23 22:17:53.079875343 +0100
+--- a/server/vino-server.desktop.in.in.orig 2009-03-23 22:17:35.647373307 +0100
++++ b/server/vino-server.desktop.in.in 2009-03-23 22:17:53.079875343 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Remote Desktop
Modified: desktop/experimental/vino/debian/patches/11_hurd_maxhostnamelen.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/11_hurd_maxhostnamelen.patch?rev=27659&op=diff
==============================================================================
--- desktop/experimental/vino/debian/patches/11_hurd_maxhostnamelen.patch [utf-8] (original)
+++ desktop/experimental/vino/debian/patches/11_hurd_maxhostnamelen.patch [utf-8] Sun Apr 17 18:23:01 2011
@@ -1,4 +1,3 @@
-diff -pruN vino-2.28.1.orig/server/miniupnp/miniupnpc.c vino-2.28.1/server/miniupnp/miniupnpc.c
--- vino-2.28.1.orig/server/miniupnp/miniupnpc.c 2009-04-18 15:22:24.000000000 +0200
+++ vino-2.28.1/server/miniupnp/miniupnpc.c 2010-11-06 22:53:47.045834645 +0100
@@ -13,7 +13,6 @@
@@ -49,7 +48,6 @@
if(n<=0) {
#ifdef DEBUG
printf("Error sending SOAP request\n");
-diff -pruN vino-2.28.1.orig/server/miniupnp/miniwget.c vino-2.28.1/server/miniupnp/miniwget.c
--- vino-2.28.1.orig/server/miniupnp/miniwget.c 2009-04-18 15:22:24.000000000 +0200
+++ vino-2.28.1/server/miniupnp/miniwget.c 2010-11-06 22:58:12.869836079 +0100
@@ -12,7 +12,6 @@
@@ -136,7 +134,6 @@
+ return ret;
}
-diff -pruN vino-2.28.1.orig/server/miniupnp/miniwget.h vino-2.28.1/server/miniupnp/miniwget.h
--- vino-2.28.1.orig/server/miniupnp/miniwget.h 2009-04-18 15:22:24.000000000 +0200
+++ vino-2.28.1/server/miniupnp/miniwget.h 2010-11-06 22:54:21.026344248 +0100
@@ -18,7 +18,7 @@ LIBSPEC void * miniwget(const char *, in
Added: desktop/experimental/vino/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/patches/series?rev=27659&op=file
==============================================================================
--- desktop/experimental/vino/debian/patches/series (added)
+++ desktop/experimental/vino/debian/patches/series [utf-8] Sun Apr 17 18:23:01 2011
@@ -1,0 +1,3 @@
+01_ipv6-fix.patch
+02_server_sm-disable.patch
+11_hurd_maxhostnamelen.patch
Modified: desktop/experimental/vino/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/rules?rev=27659&op=diff
==============================================================================
--- desktop/experimental/vino/debian/rules [utf-8] (original)
+++ desktop/experimental/vino/debian/rules [utf-8] Sun Apr 17 18:23:01 2011
@@ -1,9 +1,9 @@
#! /usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += \
Added: desktop/experimental/vino/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/vino/debian/source/format?rev=27659&op=file
==============================================================================
--- desktop/experimental/vino/debian/source/format (added)
+++ desktop/experimental/vino/debian/source/format [utf-8] Sun Apr 17 18:23:01 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list