[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1-3-16-g9537d6d

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit fb12c54088114bf5b8632175db4d111bae114f08
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Apr 19 14:35:51 2012 +0200

    Apply godoc patch to display package list correctly (Closes: #669354)

diff --git a/debian/patches/godoc-symlinks.diff b/debian/patches/godoc-symlinks.diff
new file mode 100644
index 0000000..d8a1150
--- /dev/null
+++ b/debian/patches/godoc-symlinks.diff
@@ -0,0 +1,26 @@
+--- a/src/cmd/godoc/filesystem.go
++++ b/src/cmd/godoc/filesystem.go
+@@ -121,7 +121,22 @@ func (root osFS) Stat(path string) (os.F
+ }
+ 
+ func (root osFS) ReadDir(path string) ([]os.FileInfo, error) {
+-	return ioutil.ReadDir(root.resolve(path)) // is sorted
++	fis, err := ioutil.ReadDir(path) // is sorted
++	if err != nil {
++		return nil, err
++	}
++	// Replace symlinks with what they are pointing to
++	dirPrefix := path + "/"
++	for i, fi := range fis {
++		if fi.Mode() & os.ModeSymlink != 0 {
++			fi, err = os.Stat(dirPrefix + fi.Name())
++			if err != nil {
++				return nil, err
++			}
++		}
++		fis[i] = fi
++	}
++	return fis, nil
+ }
+ 
+ // hasPathPrefix returns true if x == y or x == y + "/" + more
diff --git a/debian/patches/series b/debian/patches/series
index 3fabf73..dc082f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 #012-sigfillset_kFreeBSD.patch
 #013-kFreeBSD-AI_MASK.patch
 014-dont_fail_test_with_missing_homedir.patch
+godoc-symlinks.diff

-- 
Packaging for Google Go