Merge branch 'release-0.9.2.1'

2026-05-02 03:01:46 -04:00 · 2014-09-15 16:49:29 -07:00
parent 6c22fa7547 7299bac40f
commit e1691e013e
25 changed files with 68 additions and 54 deletions
--- a/History.md
+++ b/History.md
@@ -1,5 +1,13 @@
 ## v.NEXT

+
+## v0.9.2.1
+
+* Fix versions of packages that were published with `-cordova` versions
+  in 0.9.2 (appcache, fastclick, htmljs, logging, mobile-status-bar,
+  routepolicy, webapp-hashing).
+
+
 ## v0.9.2

 This release contains our first support for building mobile apps in
--- a/docs/.meteor/release
+++ b/docs/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.2
+METEOR@0.9.2.1
--- a/docs/.meteor/versions
+++ b/docs/.meteor/versions
@@ -1,4 +1,4 @@
-appcache@1.0.0-cordova1
+appcache@1.0.1
 application-configuration@1.0.2
 autoupdate@1.1.0
 base64@1.0.0
@@ -15,11 +15,11 @@ ctl@1.0.1
 ddp@1.0.8
 deps@1.0.3
 ejson@1.0.2
-fastclick@1.0.0-cordova1
+fastclick@1.0.0
 follower-livedata@1.0.1
 geojson-utils@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0-cordova1
+htmljs@1.0.1
 http@1.0.5
 id-map@1.0.0
 jquery-waypoints@1.0.0
@@ -27,12 +27,12 @@ jquery@1.0.0
 json@1.0.0
 less@1.0.8
 livedata@1.0.9
-logging@1.0.2-cordova2
+logging@1.0.3
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
 minimongo@1.0.3
-mobile-status-bar@1.0.0-cordova3
+mobile-status-bar@1.0.0
 mongo@1.0.5
 observe-sequence@1.0.2
 ordered-dict@1.0.0
@@ -42,7 +42,7 @@ reactive-var@1.0.1
 reload-safetybelt@1.0.0
 reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0-cordova1
+routepolicy@1.0.1
 session@1.0.1
 showdown@1.0.1
 spacebars-compiler@1.0.2
@@ -54,5 +54,5 @@ tracker@1.0.2
 ui@1.0.2
 underscore@1.0.0
 url@1.0.0
-webapp-hashing@1.0.0-cordova1
+webapp-hashing@1.0.0
 webapp@1.1.1
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,5 +1,5 @@
 Template.headline.release = function () {
-  return Meteor.release ? "0.9.2" : "(checkout)";
+  return Meteor.release ? "0.9.2.1" : "(checkout)";
 };

 Meteor.startup(function () {
--- a/examples/clock/.meteor/release
+++ b/examples/clock/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.2
+METEOR@0.9.2.1
--- a/examples/clock/.meteor/versions
+++ b/examples/clock/.meteor/versions
@@ -13,23 +13,23 @@ ctl@1.0.1
 ddp@1.0.8
 deps@1.0.3
 ejson@1.0.2
-fastclick@1.0.0-cordova1
+fastclick@1.0.0
 follower-livedata@1.0.1
 geojson-utils@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0-cordova1
+htmljs@1.0.1
 http@1.0.5
 id-map@1.0.0
 insecure@1.0.0
 jquery@1.0.0
 json@1.0.0
 livedata@1.0.9
-logging@1.0.2-cordova2
+logging@1.0.3
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
 minimongo@1.0.3
-mobile-status-bar@1.0.0-cordova3
+mobile-status-bar@1.0.0
 mongo@1.0.5
 observe-sequence@1.0.2
 ordered-dict@1.0.0
@@ -38,7 +38,7 @@ reactive-dict@1.0.2
 reactive-var@1.0.1
 reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0-cordova1
+routepolicy@1.0.1
 session@1.0.1
 spacebars-compiler@1.0.2
 spacebars@1.0.1
@@ -48,5 +48,5 @@ tracker@1.0.2
 ui@1.0.2
 underscore@1.0.0
 url@1.0.0
-webapp-hashing@1.0.0-cordova1
+webapp-hashing@1.0.0
 webapp@1.1.1
--- a/examples/leaderboard/.meteor/release
+++ b/examples/leaderboard/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.2
+METEOR@0.9.2.1
--- a/examples/leaderboard/.meteor/versions
+++ b/examples/leaderboard/.meteor/versions
@@ -13,23 +13,23 @@ ctl@1.0.1
 ddp@1.0.8
 deps@1.0.3
 ejson@1.0.2
-fastclick@1.0.0-cordova1
+fastclick@1.0.0
 follower-livedata@1.0.1
 geojson-utils@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0-cordova1
+htmljs@1.0.1
 http@1.0.5
 id-map@1.0.0
 insecure@1.0.0
 jquery@1.0.0
 json@1.0.0
 livedata@1.0.9
-logging@1.0.2-cordova2
+logging@1.0.3
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
 minimongo@1.0.3
-mobile-status-bar@1.0.0-cordova3
+mobile-status-bar@1.0.0
 mongo@1.0.5
 observe-sequence@1.0.2
 ordered-dict@1.0.0
@@ -38,7 +38,7 @@ reactive-dict@1.0.2
 reactive-var@1.0.1
 reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0-cordova1
+routepolicy@1.0.1
 session@1.0.1
 spacebars-compiler@1.0.2
 spacebars@1.0.1
@@ -48,5 +48,5 @@ tracker@1.0.2
 ui@1.0.2
 underscore@1.0.0
 url@1.0.0
-webapp-hashing@1.0.0-cordova1
+webapp-hashing@1.0.0
 webapp@1.1.1
--- a/examples/parties/.meteor/release
+++ b/examples/parties/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.2
+METEOR@0.9.2.1
--- a/examples/parties/.meteor/versions
+++ b/examples/parties/.meteor/versions
@@ -24,11 +24,11 @@ deps@1.0.3
 ejson@1.0.2
 email@1.0.2
 facebook@1.1.0
-fastclick@1.0.0-cordova1
+fastclick@1.0.0
 follower-livedata@1.0.1
 geojson-utils@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0-cordova1
+htmljs@1.0.1
 http@1.0.5
 id-map@1.0.0
 jquery@1.0.0
@@ -36,12 +36,12 @@ json@1.0.0
 less@1.0.8
 livedata@1.0.9
 localstorage@1.0.0
-logging@1.0.2-cordova2
+logging@1.0.3
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
 minimongo@1.0.3
-mobile-status-bar@1.0.0-cordova3
+mobile-status-bar@1.0.0
 mongo@1.0.5
 npm-bcrypt@0.7.7
 oauth1@1.1.0
@@ -54,7 +54,7 @@ reactive-dict@1.0.2
 reactive-var@1.0.1
 reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0-cordova1
+routepolicy@1.0.1
 service-configuration@1.0.1
 session@1.0.1
 sha@1.0.0
@@ -68,5 +68,5 @@ twitter@1.1.0
 ui@1.0.2
 underscore@1.0.0
 url@1.0.0
-webapp-hashing@1.0.0-cordova1
+webapp-hashing@1.0.0
 webapp@1.1.1
--- a/examples/todos/.meteor/release
+++ b/examples/todos/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.2
+METEOR@0.9.2.1
--- a/examples/todos/.meteor/versions
+++ b/examples/todos/.meteor/versions
@@ -13,23 +13,23 @@ ctl@1.0.1
 ddp@1.0.8
 deps@1.0.3
 ejson@1.0.2
-fastclick@1.0.0-cordova1
+fastclick@1.0.0
 follower-livedata@1.0.1
 geojson-utils@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0-cordova1
+htmljs@1.0.1
 http@1.0.5
 id-map@1.0.0
 insecure@1.0.0
 jquery@1.0.0
 json@1.0.0
 livedata@1.0.9
-logging@1.0.2-cordova2
+logging@1.0.3
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
 minimongo@1.0.3
-mobile-status-bar@1.0.0-cordova3
+mobile-status-bar@1.0.0
 mongo@1.0.5
 observe-sequence@1.0.2
 ordered-dict@1.0.0
@@ -38,7 +38,7 @@ reactive-dict@1.0.2
 reactive-var@1.0.1
 reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0-cordova1
+routepolicy@1.0.1
 session@1.0.1
 spacebars-compiler@1.0.2
 spacebars@1.0.1
@@ -49,5 +49,5 @@ tracker@1.0.2
 ui@1.0.2
 underscore@1.0.0
 url@1.0.0
-webapp-hashing@1.0.0-cordova1
+webapp-hashing@1.0.0
 webapp@1.1.1
--- a/examples/wordplay/.meteor/release
+++ b/examples/wordplay/.meteor/release
@@ -1 +1 @@
-METEOR@0.9.2
+METEOR@0.9.2.1
--- a/examples/wordplay/.meteor/versions
+++ b/examples/wordplay/.meteor/versions
@@ -12,23 +12,23 @@ ctl@1.0.1
 ddp@1.0.8
 deps@1.0.3
 ejson@1.0.2
-fastclick@1.0.0-cordova1
+fastclick@1.0.0
 follower-livedata@1.0.1
 geojson-utils@1.0.0
 html-tools@1.0.0
-htmljs@1.0.0-cordova1
+htmljs@1.0.1
 http@1.0.5
 id-map@1.0.0
 insecure@1.0.0
 jquery@1.0.0
 json@1.0.0
 livedata@1.0.9
-logging@1.0.2-cordova2
+logging@1.0.3
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
 minimongo@1.0.3
-mobile-status-bar@1.0.0-cordova3
+mobile-status-bar@1.0.0
 mongo@1.0.5
 observe-sequence@1.0.2
 ordered-dict@1.0.0
@@ -37,7 +37,7 @@ reactive-dict@1.0.2
 reactive-var@1.0.1
 reload@1.1.0
 retry@1.0.0
-routepolicy@1.0.0-cordova1
+routepolicy@1.0.1
 session@1.0.1
 spacebars-compiler@1.0.2
 spacebars@1.0.1
@@ -47,5 +47,5 @@ tracker@1.0.2
 ui@1.0.2
 underscore@1.0.0
 url@1.0.0
-webapp-hashing@1.0.0-cordova1
+webapp-hashing@1.0.0
 webapp@1.1.1
--- a/packages/appcache/package.js
+++ b/packages/appcache/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "Enable the application cache in the browser",
-  version: "1.0.0-cordova1"
+  version: "1.0.1"
 });

 Package.on_use(function (api) {
--- a/packages/fastclick/package.js
+++ b/packages/fastclick/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "Faster touch events on mobile",
-  version: '1.0.0-cordova1'
+  version: '1.0.0'
 });

 Package.on_use(function (api) {
--- a/packages/htmljs/package.js
+++ b/packages/htmljs/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "Small library for expressing HTML trees",
-  version: '1.0.0-cordova1'
+  version: '1.0.1'
 });

 Package.on_use(function (api) {
--- a/packages/logging/package.js
+++ b/packages/logging/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "Logging facility.",
-  version: '1.0.2-cordova2'
+  version: '1.0.3'
 });

 Npm.depends({
--- a/packages/meteor-tool/package.js
+++ b/packages/meteor-tool/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "The Meteor command-line tool",
-  version: '1.0.29'
+  version: '1.0.30'
 });

 Package.includeTool();
--- a/packages/mobile-status-bar/package.js
+++ b/packages/mobile-status-bar/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "Good defaults for the mobile status bar",
-  version: "1.0.0-cordova3"
+  version: "1.0.0"
 });

 Package.onUse(function(api) {
--- a/packages/routepolicy/package.js
+++ b/packages/routepolicy/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "route policy declarations",
-  version: '1.0.0-cordova1'
+  version: '1.0.1'
 });

 Package.on_use(function (api) {
--- a/packages/webapp-hashing/package.js
+++ b/packages/webapp-hashing/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  summary: "Used internally by WebApp. Knows how to hash programs from manifests.",
-  version: "1.0.0-cordova1"
+  version: "1.0.0"
 });

 Package.onUse(function(api) {
--- a/scripts/admin/banners.json
+++ b/scripts/admin/banners.json
@@ -5,6 +5,12 @@
      "banner": {
        "text": "=> Meteor 0.9.2 is out, with our first support for building mobile apps\n   in Meteor. This support comes via an integration with Apache's\n   Cordova/PhoneGap project.\n\n   Meteor 0.9.2 is being downloaded in the background. You can update to\n   it by running 'meteor update'."
       }
+    },
+    {
+      "versions": ["0.9.2"],
+      "banner": {
+        "text": "=> Meteor 0.9.2.1 fixes the version numbers of several packages, making\n   them compatible with other non-core packages.\n\n   Meteor 0.9.2.1 is being downloaded in the background. You can update\n   to it by running 'meteor update'."
+      }
    }
  ]
 }
--- a/scripts/admin/manifest.json
+++ b/scripts/admin/manifest.json
@@ -1,7 +1,7 @@
 {
    "releases": {
        "stable": {
-            "version": "0.9.2",
+            "version": "0.9.2.1",
            "banner": "=> Meteor 0.9.0: Introducing the official Meteor package system,\n   including Isobuild and the Meteor Package Server!\n\n   Starting in 0.9.0, you can publish your own packages and use any of\n   the over 1800 community packages in your app, without needing an\n   external tool such as Meteorite. Just use commands like 'meteor add\n   <packagename>', 'meteor publish', and 'meteor search <query>'.\n\n   This release is being downloaded in the background. It's a big\n   change! Once it's done downloading, then the next time you run\n   'meteor', your Meteor install will be automatically upgraded to the\n   new system. The upgrade will take a few minutes and as part of it\n   old versions of Meteor will be removed from your machine. These old\n   versions will be automatically redownloaded using the new system if\n   you work on apps that use them.\n"
        }
    }
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
    "track": "METEOR",
-    "version": "0.9.2",
+    "version": "0.9.2.1",
    "recommended": false,
    "official": true,
    "description": "The official Meteor Distribution"