html,log,math: renamings

This is Go 1 package renaming CL #2.
This one merely moves the source; the import strings will be
changed after the next weekly release.

exp/template/html -> html/template
big -> math/big
cmath -> math/cmplx
rand -> math/rand
syslog -> log/syslog

The only edits are in Makefiles and deps.bash.

Note that this CL moves exp/template/html out of exp. I decided
to do that so all the renamings can be done together, even though
the API (and that of template, for that matter) is still fluid.

R=r, rsc
CC=golang-dev
https://golang.org/cl/5332053

64 files changed, 30 insertions, 20 deletions

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 105f3c4cfa..036e9cae8b 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -16,10 +16,8 @@ all: install
 DIRS=\
 	archive/tar\
 	archive/zip\
-	big\
 	bufio\
 	bytes\
-	cmath\
 	compress/bzip2\
 	compress/flate\
 	compress/gzip\
@@ -89,7 +87,6 @@ DIRS=\
 	exp/spdy\
 	exp/sql\
 	exp/sql/driver\
-	exp/template/html\
 	exp/types\
 	expvar\
 	flag\
@@ -107,6 +104,7 @@ DIRS=\
 	hash/crc64\
 	hash/fnv\
 	html\
+	html/template\
 	http\
 	http/cgi\
 	http/fcgi\
@@ -125,8 +123,12 @@ DIRS=\
 	io\
 	io/ioutil\
 	log\
+	log/syslog\
 	mail\
 	math\
+	math/big\
+	math/cmplx\
+	math/rand\
 	mime\
 	mime/multipart\
 	net\
@@ -141,7 +143,6 @@ DIRS=\
 	patch\
 	path\
 	path/filepath\
-	rand\
 	reflect\
 	regexp\
 	regexp/syntax\
@@ -159,7 +160,6 @@ DIRS=\
 	sync\
 	sync/atomic\
 	syscall\
-	syslog\
 	tabwriter\
 	template\
 	template/parse\
diff --git a/src/pkg/deps.bash b/src/pkg/deps.bash
index 598c167661..3f2a3abc66 100755
--- a/src/pkg/deps.bash
+++ b/src/pkg/deps.bash
@@ -26,9 +26,14 @@ dirpat=$(echo $dirs C | awk '{
 # Append old names of renamed packages. TODO: clean up after renaming.
 dirpat="$dirpat
 /^(asn1)$/
+/^(big)$/
+/^(cmath)$/
 /^(csv)$/
+/^(exp\/template\/html)$/
 /^(gob)$/
 /^(json)$/
+/^(rand)$/
+/^(syslog)$/
 /^(xml)$/
 "
 
@@ -49,11 +54,16 @@ for dir in $dirs; do (
 		grep -v "^$dir\$" |
 		sed 's/$/.install/' |
 		# TODO: rename the dependencies for renamed directories.  TODO: clean up after renaming.
-		sed 's;^asn1.install$;encoding/asn1.install;' |
-		sed 's;^csv.install$;encoding/csv.install;' |
-		sed 's;^gob.install$;encoding/gob.install;' |
-		sed 's;^json.install$;encoding/json.install;' |
-		sed 's;^xml.install$;encoding/xml.install;' |
+		sed 's;^asn1.install$;encoding/asn1.install;
+		s;^big.install$;math/big.install;
+		s;^cmath.install$;math/cmplx.install;
+		s;^csv.install$;encoding/csv.install;
+		s;^exp/template/html.install$;html/template.install;
+		s;^gob.install$;encoding/gob.install;
+		s;^json.install$;encoding/json.install;
+		s;^syslog.install$;log/syslog.install;
+		s;^rand.install$;math/rand.install;
+		s;^xml.install$;encoding/xml.install;' |
 		# TODO: end of renamings.
 		sed 's;^C\.install;runtime/cgo.install;' |
 		sort -u
diff --git a/src/pkg/exp/template/html/Makefile b/src/pkg/html/template/Makefile
index 2ccbdd3e85..3b216ba611 100644
--- a/src/pkg/exp/template/html/Makefile
+++ b/src/pkg/html/template/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../../Make.inc
+include ../../../Make.inc
 
 TARG=exp/template/html
 GOFILES=\
@@ -19,4 +19,4 @@ GOFILES=\
 	transition.go\
 	url.go\
 
-include ../../../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/exp/template/html/attr.go b/src/pkg/html/template/attr.go
index 6a36c7b718..6a36c7b718 100644
--- a/src/pkg/exp/template/html/attr.go
+++ b/src/pkg/html/template/attr.go
diff --git a/src/pkg/exp/template/html/clone.go b/src/pkg/html/template/clone.go
index 803a64de12..803a64de12 100644
--- a/src/pkg/exp/template/html/clone.go
+++ b/src/pkg/html/template/clone.go
diff --git a/src/pkg/exp/template/html/clone_test.go b/src/pkg/html/template/clone_test.go
index d91542529b..d91542529b 100644
--- a/src/pkg/exp/template/html/clone_test.go
+++ b/src/pkg/html/template/clone_test.go
diff --git a/src/pkg/exp/template/html/content.go b/src/pkg/html/template/content.go
index dcaff8c15c..dcaff8c15c 100644
--- a/src/pkg/exp/template/html/content.go
+++ b/src/pkg/html/template/content.go
diff --git a/src/pkg/exp/template/html/content_test.go b/src/pkg/html/template/content_test.go
index 033dee1747..033dee1747 100644
--- a/src/pkg/exp/template/html/content_test.go
+++ b/src/pkg/html/template/content_test.go
diff --git a/src/pkg/exp/template/html/context.go b/src/pkg/html/template/context.go
index c44df4debc..c44df4debc 100644
--- a/src/pkg/exp/template/html/context.go
+++ b/src/pkg/html/template/context.go
diff --git a/src/pkg/exp/template/html/css.go b/src/pkg/html/template/css.go
index c26ae78d17..c26ae78d17 100644
--- a/src/pkg/exp/template/html/css.go
+++ b/src/pkg/html/template/css.go
diff --git a/src/pkg/exp/template/html/css_test.go b/src/pkg/html/template/css_test.go
index b3b83e855d..b3b83e855d 100644
--- a/src/pkg/exp/template/html/css_test.go
+++ b/src/pkg/html/template/css_test.go
diff --git a/src/pkg/exp/template/html/doc.go b/src/pkg/html/template/doc.go
index a9b78ca515..a9b78ca515 100644
--- a/src/pkg/exp/template/html/doc.go
+++ b/src/pkg/html/template/doc.go
diff --git a/src/pkg/exp/template/html/error.go b/src/pkg/html/template/error.go
index 22fca9e060..22fca9e060 100644
--- a/src/pkg/exp/template/html/error.go
+++ b/src/pkg/html/template/error.go
diff --git a/src/pkg/exp/template/html/escape.go b/src/pkg/html/template/escape.go
index 28615a9318..28615a9318 100644
--- a/src/pkg/exp/template/html/escape.go
+++ b/src/pkg/html/template/escape.go
diff --git a/src/pkg/exp/template/html/escape_test.go b/src/pkg/html/template/escape_test.go
index 20599bce15..20599bce15 100644
--- a/src/pkg/exp/template/html/escape_test.go
+++ b/src/pkg/html/template/escape_test.go
diff --git a/src/pkg/exp/template/html/html.go b/src/pkg/html/template/html.go
index 92d8f41994..92d8f41994 100644
--- a/src/pkg/exp/template/html/html.go
+++ b/src/pkg/html/template/html.go
diff --git a/src/pkg/exp/template/html/html_test.go b/src/pkg/html/template/html_test.go
index e178d0f27e..e178d0f27e 100644
--- a/src/pkg/exp/template/html/html_test.go
+++ b/src/pkg/html/template/html_test.go
diff --git a/src/pkg/exp/template/html/js.go b/src/pkg/html/template/js.go
index 22be4183d7..22be4183d7 100644
--- a/src/pkg/exp/template/html/js.go
+++ b/src/pkg/html/template/js.go
diff --git a/src/pkg/exp/template/html/js_test.go b/src/pkg/html/template/js_test.go
index e7764054a3..e7764054a3 100644
--- a/src/pkg/exp/template/html/js_test.go
+++ b/src/pkg/html/template/js_test.go
diff --git a/src/pkg/exp/template/html/transition.go b/src/pkg/html/template/transition.go
index 49a1451174..49a1451174 100644
--- a/src/pkg/exp/template/html/transition.go
+++ b/src/pkg/html/template/transition.go
diff --git a/src/pkg/exp/template/html/url.go b/src/pkg/html/template/url.go
index 5b19df0840..5b19df0840 100644
--- a/src/pkg/exp/template/html/url.go
+++ b/src/pkg/html/template/url.go
diff --git a/src/pkg/exp/template/html/url_test.go b/src/pkg/html/template/url_test.go
index b84623151c..b84623151c 100644
--- a/src/pkg/exp/template/html/url_test.go
+++ b/src/pkg/html/template/url_test.go
diff --git a/src/pkg/syslog/Makefile b/src/pkg/log/syslog/Makefile
index 82baf7253a..27cdedb6f0 100644
--- a/src/pkg/syslog/Makefile
+++ b/src/pkg/log/syslog/Makefile
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=syslog
 GOFILES=\
 	syslog.go\
 	syslog_unix.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/syslog/syslog.go b/src/pkg/log/syslog/syslog.go
index 26a2f736b1..26a2f736b1 100644
--- a/src/pkg/syslog/syslog.go
+++ b/src/pkg/log/syslog/syslog.go
diff --git a/src/pkg/syslog/syslog_test.go b/src/pkg/log/syslog/syslog_test.go
index 5c0b3e0c4e..5c0b3e0c4e 100644
--- a/src/pkg/syslog/syslog_test.go
+++ b/src/pkg/log/syslog/syslog_test.go
diff --git a/src/pkg/syslog/syslog_unix.go b/src/pkg/log/syslog/syslog_unix.go
index b1c929ad2f..b1c929ad2f 100644
--- a/src/pkg/syslog/syslog_unix.go
+++ b/src/pkg/log/syslog/syslog_unix.go
diff --git a/src/pkg/big/Makefile b/src/pkg/math/big/Makefile
index 3d4b56d789..8e9f956dac 100644
--- a/src/pkg/big/Makefile
+++ b/src/pkg/math/big/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=big
 GOFILES=\
@@ -15,4 +15,4 @@ GOFILES=\
 OFILES=\
 	arith_$(GOARCH).$O\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/big/arith.go b/src/pkg/math/big/arith.go
index 0a02a4ef59..0a02a4ef59 100644
--- a/src/pkg/big/arith.go
+++ b/src/pkg/math/big/arith.go
diff --git a/src/pkg/big/arith_386.s b/src/pkg/math/big/arith_386.s
index 07c07b02cc..07c07b02cc 100644
--- a/src/pkg/big/arith_386.s
+++ b/src/pkg/math/big/arith_386.s
diff --git a/src/pkg/big/arith_amd64.s b/src/pkg/math/big/arith_amd64.s
index 89b65f38a1..89b65f38a1 100644
--- a/src/pkg/big/arith_amd64.s
+++ b/src/pkg/math/big/arith_amd64.s
diff --git a/src/pkg/big/arith_arm.s b/src/pkg/math/big/arith_arm.s
index 60abe6eaa9..60abe6eaa9 100644
--- a/src/pkg/big/arith_arm.s
+++ b/src/pkg/math/big/arith_arm.s
diff --git a/src/pkg/big/arith_decl.go b/src/pkg/math/big/arith_decl.go
index 95fcd8b94b..95fcd8b94b 100644
--- a/src/pkg/big/arith_decl.go
+++ b/src/pkg/math/big/arith_decl.go
diff --git a/src/pkg/big/arith_test.go b/src/pkg/math/big/arith_test.go
index b6c56c39ef..b6c56c39ef 100644
--- a/src/pkg/big/arith_test.go
+++ b/src/pkg/math/big/arith_test.go
diff --git a/src/pkg/big/calibrate_test.go b/src/pkg/math/big/calibrate_test.go
index 1cd93b1052..1cd93b1052 100644
--- a/src/pkg/big/calibrate_test.go
+++ b/src/pkg/math/big/calibrate_test.go
diff --git a/src/pkg/big/hilbert_test.go b/src/pkg/math/big/hilbert_test.go
index 1a84341b3c..1a84341b3c 100644
--- a/src/pkg/big/hilbert_test.go
+++ b/src/pkg/math/big/hilbert_test.go
diff --git a/src/pkg/big/int.go b/src/pkg/math/big/int.go
index c6affbbdae..c6affbbdae 100644
--- a/src/pkg/big/int.go
+++ b/src/pkg/math/big/int.go
diff --git a/src/pkg/big/int_test.go b/src/pkg/math/big/int_test.go
index d66bb5fa05..d66bb5fa05 100644
--- a/src/pkg/big/int_test.go
+++ b/src/pkg/math/big/int_test.go
diff --git a/src/pkg/big/nat.go b/src/pkg/math/big/nat.go
index a46f782ac2..a46f782ac2 100644
--- a/src/pkg/big/nat.go
+++ b/src/pkg/math/big/nat.go
diff --git a/src/pkg/big/nat_test.go b/src/pkg/math/big/nat_test.go
index 041a6c4a25..041a6c4a25 100644
--- a/src/pkg/big/nat_test.go
+++ b/src/pkg/math/big/nat_test.go
diff --git a/src/pkg/big/rat.go b/src/pkg/math/big/rat.go
index 3a0add3236..3a0add3236 100644
--- a/src/pkg/big/rat.go
+++ b/src/pkg/math/big/rat.go
diff --git a/src/pkg/big/rat_test.go b/src/pkg/math/big/rat_test.go
index 2443450411..2443450411 100644
--- a/src/pkg/big/rat_test.go
+++ b/src/pkg/math/big/rat_test.go
diff --git a/src/pkg/cmath/Makefile b/src/pkg/math/cmplx/Makefile
index 486caace46..c95b856826 100644
--- a/src/pkg/cmath/Makefile
+++ b/src/pkg/math/cmplx/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=cmath
 
@@ -22,4 +22,4 @@ GOFILES=\
 	sqrt.go\
 	tan.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/cmath/abs.go b/src/pkg/math/cmplx/abs.go
index f3199cad56..f3199cad56 100644
--- a/src/pkg/cmath/abs.go
+++ b/src/pkg/math/cmplx/abs.go
diff --git a/src/pkg/cmath/asin.go b/src/pkg/math/cmplx/asin.go
index 01ce80a194..01ce80a194 100644
--- a/src/pkg/cmath/asin.go
+++ b/src/pkg/math/cmplx/asin.go
diff --git a/src/pkg/cmath/cmath_test.go b/src/pkg/math/cmplx/cmath_test.go
index 6a595b0a60..6a595b0a60 100644
--- a/src/pkg/cmath/cmath_test.go
+++ b/src/pkg/math/cmplx/cmath_test.go
diff --git a/src/pkg/cmath/conj.go b/src/pkg/math/cmplx/conj.go
index 776b57da7b..776b57da7b 100644
--- a/src/pkg/cmath/conj.go
+++ b/src/pkg/math/cmplx/conj.go
diff --git a/src/pkg/cmath/exp.go b/src/pkg/math/cmplx/exp.go
index 64c1ef4093..64c1ef4093 100644
--- a/src/pkg/cmath/exp.go
+++ b/src/pkg/math/cmplx/exp.go
diff --git a/src/pkg/cmath/isinf.go b/src/pkg/math/cmplx/isinf.go
index f23d2dea78..f23d2dea78 100644
--- a/src/pkg/cmath/isinf.go
+++ b/src/pkg/math/cmplx/isinf.go
diff --git a/src/pkg/cmath/isnan.go b/src/pkg/math/cmplx/isnan.go
index 2063bb8356..2063bb8356 100644
--- a/src/pkg/cmath/isnan.go
+++ b/src/pkg/math/cmplx/isnan.go
diff --git a/src/pkg/cmath/log.go b/src/pkg/math/cmplx/log.go
index 8e6964fee8..8e6964fee8 100644
--- a/src/pkg/cmath/log.go
+++ b/src/pkg/math/cmplx/log.go
diff --git a/src/pkg/cmath/phase.go b/src/pkg/math/cmplx/phase.go
index 2d67aa34c7..2d67aa34c7 100644
--- a/src/pkg/cmath/phase.go
+++ b/src/pkg/math/cmplx/phase.go
diff --git a/src/pkg/cmath/polar.go b/src/pkg/math/cmplx/polar.go
index 033676acc5..033676acc5 100644
--- a/src/pkg/cmath/polar.go
+++ b/src/pkg/math/cmplx/polar.go
diff --git a/src/pkg/cmath/pow.go b/src/pkg/math/cmplx/pow.go
index 68e1207c67..68e1207c67 100644
--- a/src/pkg/cmath/pow.go
+++ b/src/pkg/math/cmplx/pow.go
diff --git a/src/pkg/cmath/rect.go b/src/pkg/math/cmplx/rect.go
index b955f0bf7d..b955f0bf7d 100644
--- a/src/pkg/cmath/rect.go
+++ b/src/pkg/math/cmplx/rect.go
diff --git a/src/pkg/cmath/sin.go b/src/pkg/math/cmplx/sin.go
index 486b717877..486b717877 100644
--- a/src/pkg/cmath/sin.go
+++ b/src/pkg/math/cmplx/sin.go
diff --git a/src/pkg/cmath/sqrt.go b/src/pkg/math/cmplx/sqrt.go
index 4e7e8050f9..4e7e8050f9 100644
--- a/src/pkg/cmath/sqrt.go
+++ b/src/pkg/math/cmplx/sqrt.go
diff --git a/src/pkg/cmath/tan.go b/src/pkg/math/cmplx/tan.go
index 67dc22ad0f..67dc22ad0f 100644
--- a/src/pkg/cmath/tan.go
+++ b/src/pkg/math/cmplx/tan.go
diff --git a/src/pkg/rand/Makefile b/src/pkg/math/rand/Makefile
index ec3b34180e..81c2d88c2b 100644
--- a/src/pkg/rand/Makefile
+++ b/src/pkg/math/rand/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=rand
 GOFILES=\
@@ -12,4 +12,4 @@ GOFILES=\
 	rng.go\
 	zipf.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/rand/exp.go b/src/pkg/math/rand/exp.go
index 85da495219..85da495219 100644
--- a/src/pkg/rand/exp.go
+++ b/src/pkg/math/rand/exp.go
diff --git a/src/pkg/rand/normal.go b/src/pkg/math/rand/normal.go
index 9ab46db9f5..9ab46db9f5 100644
--- a/src/pkg/rand/normal.go
+++ b/src/pkg/math/rand/normal.go
diff --git a/src/pkg/rand/rand.go b/src/pkg/math/rand/rand.go
index 459aed1db4..459aed1db4 100644
--- a/src/pkg/rand/rand.go
+++ b/src/pkg/math/rand/rand.go
diff --git a/src/pkg/rand/rand_test.go b/src/pkg/math/rand/rand_test.go
index 76215a978a..76215a978a 100644
--- a/src/pkg/rand/rand_test.go
+++ b/src/pkg/math/rand/rand_test.go
diff --git a/src/pkg/rand/rng.go b/src/pkg/math/rand/rng.go
index 947c49f0f2..947c49f0f2 100644
--- a/src/pkg/rand/rng.go
+++ b/src/pkg/math/rand/rng.go
diff --git a/src/pkg/rand/zipf.go b/src/pkg/math/rand/zipf.go
index 38e8ec5162..38e8ec5162 100644
--- a/src/pkg/rand/zipf.go
+++ b/src/pkg/math/rand/zipf.go