[Pkg-golang-commits] [SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1.0.1-1-23-g05418e9

Michael Stapelberg michael at stapelberg.de
Sun Mar 3 22:31:25 UTC 2013


The following commit has been merged in the debian-sid branch:
commit 49e6687c720892f2444e109f0314afec8ade2ad9
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Thu Feb 28 00:02:18 2013 +0100

    drop (applied upstream) 014-dont_fail_test_with_missing_homedir.patch

diff --git a/debian/patches/014-dont_fail_test_with_missing_homedir.patch b/debian/patches/014-dont_fail_test_with_missing_homedir.patch
deleted file mode 100644
index ac81dd1..0000000
--- a/debian/patches/014-dont_fail_test_with_missing_homedir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/pkg/os/user/user_test.go
-+++ b/src/pkg/os/user/user_test.go
-@@ -5,7 +5,6 @@
- package user
- 
- import (
--	"os"
- 	"runtime"
- 	"testing"
- )
-@@ -34,12 +33,11 @@ func TestCurrent(t *testing.T) {
- 	if err != nil {
- 		t.Fatalf("Current: %v", err)
- 	}
--	fi, err := os.Stat(u.HomeDir)
--	if err != nil || !fi.IsDir() {
--		t.Errorf("expected a valid HomeDir; stat(%q): err=%v", u.HomeDir, err)
-+	if u.HomeDir == "" {
-+		t.Errorf("didn't get a HomeDir")
- 	}
- 	if u.Username == "" {
--		t.Fatalf("didn't get a username")
-+		t.Errorf("didn't get a username")
- 	}
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index cbd8b2e..16f4a76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
-001-allow_IPv4_on_IPv6_sockets.patch
+# commented out because i don’t precisely know what it’s for:
+#001-allow_IPv4_on_IPv6_sockets.patch
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574371#46
 #003-set_correct_runpath.patch
 #006-fix_kfreebsd_build.patch
 #007-use_native_dynamic_linker_on_kfreebsd.patch
@@ -7,7 +9,6 @@
 #011-__FreeBSD_kernel__.patch
 #012-sigfillset_kFreeBSD.patch
 #013-kFreeBSD-AI_MASK.patch
-014-dont_fail_test_with_missing_homedir.patch
 godoc-symlinks.diff
 15-net-http-connection-close.patch
 version.patch

-- 
Packaging for Google Go



More information about the pkg-golang-commits mailing list