[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.09.07-1-48-ge4a4b27

Ondřej Surý ondrej at sury.org
Fri Mar 9 08:43:10 UTC 2012


The following commit has been merged in the weekly-debian-sid branch:
commit 8d19b9be88cb3a3177c4d412c094c3ee8744528f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Oct 6 09:38:04 2011 +0200

    Refresh patches to the new release

diff --git a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
index b4dcc27..8800835 100644
--- a/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
+++ b/debian/patches/001-allow_IPv4_on_IPv6_sockets.patch
@@ -7,7 +7,7 @@ Allow IPv4 on IPv6 sockets
 
 --- a/src/pkg/net/sock.go
 +++ b/src/pkg/net/sock.go
-@@ -35,6 +35,16 @@ func socket(net string, f, p, t int, la,
+@@ -37,6 +37,16 @@ func socket(net string, f, p, t int, la,
  
  	setKernelSpecificSockopt(s, f)
  
diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index c12bba5..8513efe 100644
--- a/debian/patches/006-fix_kfreebsd_build.patch
+++ b/debian/patches/006-fix_kfreebsd_build.patch
@@ -60,7 +60,7 @@
  #define _LARGEFILE_SOURCE
  #define _LARGEFILE64_SOURCE
  #define _FILE_OFFSET_BITS 64
-@@ -43,7 +41,7 @@ includes_Linux='
+@@ -44,7 +42,7 @@ includes_Linux='
  #include <netpacket/packet.h>
  '
  
@@ -69,7 +69,7 @@
  #define _DARWIN_C_SOURCE
  #define KERNEL
  #define _DARWIN_USE_64_BIT_INODE
-@@ -65,7 +63,7 @@ includes_Darwin='
+@@ -66,7 +64,7 @@ includes_Darwin='
  #include <termios.h>
  '
  
@@ -78,7 +78,7 @@
  #include <sys/types.h>
  #include <sys/event.h>
  #include <sys/socket.h>
-@@ -133,7 +131,7 @@ done
+@@ -134,7 +132,7 @@ done
  
  # Write godefs input.
  (

-- 
Packaging for Google Go



More information about the Pkg-google-commits mailing list