r39942 - in /desktop/unstable/vino/debian: changelog patches/11_hurd_maxhostnamelen.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Thu Oct 17 09:37:05 2013
New Revision: 39942

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39942
Log:
* New upstream release.
* Refresh debian/patches/11_hurd_maxhostnamelen.patch to apply cleanly.

Modified:
    desktop/unstable/vino/debian/changelog
    desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch

Modified: desktop/unstable/vino/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/changelog?rev=39942&op=diff
==============================================================================
--- desktop/unstable/vino/debian/changelog	[utf-8] (original)
+++ desktop/unstable/vino/debian/changelog	[utf-8] Thu Oct 17 09:37:05 2013
@@ -1,8 +1,13 @@
-vino (3.8.1-2) UNRELEASED; urgency=low
-
+vino (3.10.1-1) unstable; urgency=low
+
+  [ Jeremy Bicha ]
   * Update homepage
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Fri, 28 Jun 2013 18:38:26 -0400
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Refresh debian/patches/11_hurd_maxhostnamelen.patch to apply cleanly.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 17 Oct 2013 11:26:01 +0200
 
 vino (3.8.1-1) unstable; urgency=low
 

Modified: desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch?rev=39942&op=diff
==============================================================================
--- desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch	[utf-8] (original)
+++ desktop/unstable/vino/debian/patches/11_hurd_maxhostnamelen.patch	[utf-8] Thu Oct 17 09:37:05 2013
@@ -1,5 +1,5 @@
---- 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
+--- a/server/miniupnp/miniupnpc.c
++++ b/server/miniupnp/miniupnpc.c
 @@ -13,7 +13,6 @@
  #include <io.h>
  #define snprintf _snprintf
@@ -8,7 +8,7 @@
  #else
  #include <unistd.h>
  #include <sys/socket.h>
-@@ -132,7 +131,7 @@ int simpleUPnPcommand(int s, const char
+@@ -132,7 +131,7 @@
                        char * buffer, int * bufsize)
  {
  	struct sockaddr_in dest;
@@ -17,7 +17,7 @@
  	unsigned short port = 0;
  	char * path;
  	char soapact[128];
-@@ -206,7 +205,7 @@ int simpleUPnPcommand(int s, const char
+@@ -206,7 +205,7 @@
  		strncpy(p, "></" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>\r\n",
  		        soapbody + sizeof(soapbody) - p);
  	}
@@ -26,7 +26,7 @@
  	if(s<0)
  	{
  		s = socket(PF_INET, SOCK_STREAM, 0);
-@@ -214,6 +213,7 @@ int simpleUPnPcommand(int s, const char
+@@ -214,6 +213,7 @@
  		{
  			PRINT_SOCKET_ERROR("socket");
  			*bufsize = 0;
@@ -34,7 +34,7 @@
  			return -1;
  		}
  		dest.sin_family = AF_INET;
-@@ -224,11 +224,13 @@ int simpleUPnPcommand(int s, const char
+@@ -224,11 +224,13 @@
  			PRINT_SOCKET_ERROR("connect");
  			closesocket(s);
  			*bufsize = 0;
@@ -48,9 +48,9 @@
  	if(n<=0) {
  #ifdef DEBUG
  		printf("Error sending SOAP request\n");
---- 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 @@
+--- a/server/miniupnp/miniwget.c
++++ b/server/miniupnp/miniwget.c
+@@ -15,7 +15,6 @@
  #ifdef WIN32
  #include <winsock2.h>
  #include <io.h>
@@ -58,7 +58,7 @@
  #define MIN(x,y) (((x)<(y))?(x):(y))
  #define snprintf _snprintf
  #define herror
-@@ -148,14 +147,14 @@ miniwget2(const char * url, const char *
+@@ -151,14 +150,14 @@
  /* parseURL()
   * arguments :
   *   url :		source string not modified
@@ -75,7 +75,7 @@
  {
  	char * p1, *p2, *p3;
  	p1 = strstr(url, "://");
-@@ -169,15 +168,18 @@ int parseURL(const char * url, char * ho
+@@ -172,15 +171,18 @@
  	p3 = strchr(p1, '/');
  	if(!p3)
  		return 0;
@@ -97,7 +97,7 @@
  		*port = 0;
  		p2++;
  		while( (*p2 >= '0') && (*p2 <= '9'))
-@@ -196,11 +198,14 @@ void * miniwget(const char * url, int *
+@@ -199,11 +201,14 @@
  	unsigned short port;
  	char * path;
  	/* protocol://host:port/chemin */
@@ -115,7 +115,7 @@
  }
  
  void * miniwget_getaddr(const char * url, int * size, char * addr, int addrlen)
-@@ -208,12 +213,15 @@ void * miniwget_getaddr(const char * url
+@@ -211,12 +216,15 @@
  	unsigned short port;
  	char * path;
  	/* protocol://host:port/chemin */
@@ -134,9 +134,9 @@
 +	return ret;
  }
  
---- 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
+--- a/server/miniupnp/miniwget.h
++++ b/server/miniupnp/miniwget.h
+@@ -18,7 +18,7 @@
  
  LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int);