Bug#682244: unblock: golang/2:1.0.2-1.1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package golang
The only change in this upload (from 2:1.0.2-1 which is currently in
testing) is that a bug was fixed in our Debian-specific patch (#679692):
With the version currently in testing, using the online documentation
tool 'godoc' fails every time.
Since the change is very small and having documentation at hand is an
important feature, I would like you to unblock golang please.
Here is the debdiff:
--- golang-1.0.2/debian/changelog 2012-06-28 12:15:03.000000000 +0200
+++ golang-1.0.2/debian/changelog 2012-07-20 18:14:28.000000000 +0200
@@ -1,17 +1,24 @@
+golang (2:1.0.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload. (as discussed with Ondřej in #679692)
+ * Fix godoc-symlinks.diff (godoc didn’t find docs) (Closes: #679692)
+
+ -- Michael Stapelberg <stapelberg@debian.org> Fri, 20 Jul 2012 17:59:38 +0200
+
golang (2:1.0.2-1) unstable; urgency=low
[ Ondřej Surý ]
* Imported Upstream version 1.0.2
* Update Vcs fields to reflect new git repository location
- * Kill get-orig-source, since 1.0.0, the tarballs can be downloaded
- from webpage
+ * Kill get-orig-source, since 1.0.0, the tarballs can be downloaded from
+ webpage
[ Michael Stapelberg ]
* golang-mode: use debian-pkg-add-load-path-item (Closes: #664802)
- * Add manpages (Closes: #632964)
+ * add manpages (Closes: #632964)
* Use updated pt.po from Pedro Ribeiro (Closes: #674958)
- -- Ondřej Surý <ondrej@debian.org> Thu, 28 Jun 2012 12:14:15 +0200
+ -- Ondřej Surý <ondrej@sury.org> Thu, 28 Jun 2012 12:14:15 +0200
golang (2:1.0.1-1) unstable; urgency=low
diff -Nru golang-1.0.2/debian/patches/godoc-symlinks.diff golang-1.0.2/debian/patches/godoc-symlinks.diff
--- golang-1.0.2/debian/patches/godoc-symlinks.diff 2012-06-28 12:15:03.000000000 +0200
+++ golang-1.0.2/debian/patches/godoc-symlinks.diff 2012-07-16 22:44:59.000000000 +0200
@@ -1,19 +1,19 @@
--- a/src/cmd/godoc/filesystem.go
+++ b/src/cmd/godoc/filesystem.go
-@@ -121,7 +121,22 @@ func (root osFS) Stat(path string) (os.F
+@@ -121,7 +121,22 @@
}
func (root osFS) ReadDir(path string) ([]os.FileInfo, error) {
- return ioutil.ReadDir(root.resolve(path)) // is sorted
-+ fis, err := ioutil.ReadDir(path) // is sorted
++ dirName := root.resolve(path)
++ fis, err := ioutil.ReadDir(dirName) // 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 fi.Mode()&os.ModeSymlink != 0 {
++ fi, err = os.Stat(filepath.Join(dirName, fi.Name()))
+ if err != nil {
+ return nil, err
+ }
@@ -24,3 +24,4 @@
}
// hasPathPrefix returns true if x == y or x == y + "/" + more
PS: I just noticed I didn’t correctly replicate the changelog (which
Ondřej didn’t update in the git repository when uploading). I’d say it’s
no big deal, but if you want me to fix that with yet another upload,
just tell me :-).
unblock golang/2:1.0.2-1.1
Reply to: