Version 1.12.1
Cherry-pick ef2581a87829cfe79aafa4f15c79fdecede857d9 to stable
Cherry-pick fe5550e934591380f7bb7c926f6f8dc7dc16f199 to stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 353abcc..126946a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.12.1
+
+### Tool changes
+
+* Pub
+
+ * Pub will now respect `.gitignore` when validating a package before it's
+ published. For example, if a `LICENSE` file exists but is ignored, that is
+ now an error.
+
+ * If the package is in a subdirectory of a Git repository and the entire
+ subdirectory is ignored with `.gitignore`, pub will act as though nothing
+ was ignored instead of uploading an empty package.
+
+ * The heuristics for determining when `pub get` needs to be run before various
+ commands have been improved. There should no longer be false positives when
+ non-dependency sections of the pubspec have been modified.
+
## 1.12.0 - 2015-08-31
### Language changes
diff --git a/DEPS b/DEPS
index bb1cb58..e13d6ab 100644
--- a/DEPS
+++ b/DEPS
@@ -84,7 +84,7 @@
"ply_rev": "@604b32590ffad5cbb82e4afef1d305512d06ae93",
"plugin_tag": "@0.1.0",
"pool_rev": "@e454b4b54d2987e8d2f0fbd3ac519641ada9bd0f",
- "pub_rev": "@d90268693d1a9dbe5ea11cd9c80b842e3bf1581c",
+ "pub_rev": "@5b06b469abafcf6ab7ef0b6dccf4d50e971ae258",
"pub_cache_tag": "@v0.1.0",
"pub_semver_tag": "@1.2.1",
"quiver_tag": "@0.21.4",
diff --git a/sdk/bin/dartdoc.bat b/sdk/bin/dartdoc.bat
index 58c2017..c313e7f 100644
--- a/sdk/bin/dartdoc.bat
+++ b/sdk/bin/dartdoc.bat
@@ -14,7 +14,7 @@
set DART=%BIN_DIR%\dart
set SNAPSHOT=%BIN_DIR%\snapshots\dartdoc.dart.snapshot
-"%DART%" --packages="$BIN_DIR/snapshots/resources/dartdoc/.packages" "%SNAPSHOT%" %*
+"%DART%" --packages="%BIN_DIR%/snapshots/resources/dartdoc/.packages" "%SNAPSHOT%" %*
endlocal
diff --git a/tools/VERSION b/tools/VERSION
index efd0bae..b2ec447 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
CHANNEL stable
MAJOR 1
MINOR 12
-PATCH 0
+PATCH 1
PRERELEASE 0
PRERELEASE_PATCH 0
