[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.06.09-2-39-g9b0c6d6

[Ondřej Surý]

The following commit has been merged in the weekly-debian-sid branch:
commit e5fd66c5bda4125270011a7ade57aeaac66573e8
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Sep 13 12:04:02 2011 +0200

    Refresh patches for new weekly release

diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index 9399516..c12bba5 100644
--- a/debian/patches/006-fix_kfreebsd_build.patch
+++ b/debian/patches/006-fix_kfreebsd_build.patch
@@ -78,7 +78,7 @@
  #include <sys/types.h>
  #include <sys/event.h>
  #include <sys/socket.h>
-@@ -111,7 +109,7 @@ done
+@@ -133,7 +131,7 @@ done
  
  # Write godefs input.
  (
diff --git a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
index fec8c59..db3d596 100644
--- a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
+++ b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
@@ -6,9 +6,9 @@
  char linuxdynld[] = "/lib/ld-linux.so.2";
 -char freebsddynld[] = "/usr/libexec/ld-elf.so.1";
 +char freebsddynld[] = "/lib/ld.so.1";
+ char openbsddynld[] = "/usr/libexec/ld.so";
  
  int32
- entryvalue(void)
 --- a/src/cmd/6l/asm.c
 +++ b/src/cmd/6l/asm.c
 @@ -42,7 +42,7 @@
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
index b2d3502..37e649e 100644
--- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch
+++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
@@ -1,6 +1,6 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -80,6 +80,10 @@ func main() {
+@@ -87,6 +87,10 @@ func main() {
  	}
  	readPackageList()
  
diff --git a/debian/patches/010-goinstall_check_conf.patch b/debian/patches/010-goinstall_check_conf.patch
index 604446a..d7e22e9 100644
--- a/debian/patches/010-goinstall_check_conf.patch
+++ b/debian/patches/010-goinstall_check_conf.patch
@@ -1,5 +1,3 @@
-diff --git a/src/cmd/goinstall/main.go b/src/cmd/goinstall/main.go
-index 910ab70..db1e3c9 100644
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
 @@ -38,7 +38,7 @@ var (
diff --git a/debian/patches/series b/debian/patches/series
index af60555..0b8103d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 003-set_correct_runpath.patch
 006-fix_kfreebsd_build.patch
 007-use_native_dynamic_linker_on_kfreebsd.patch
-008-emacs-mode-key-literal-indent.patch
 009-goinstall_can_install_to_GOPATH.patch
 010-goinstall_check_conf.patch

-- 
Packaging for Google Go