From 5fe0937aa688c2b529f5d5af51d2dd90b97ed3bd Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 15:55:19 -0700 Subject: [PATCH 1/8] Bump package versions for 0.9.2.1. These should have been bumped in 0.9.2 --- packages/appcache/package.js | 2 +- packages/fastclick/package.js | 2 +- packages/htmljs/package.js | 2 +- packages/logging/package.js | 2 +- packages/mobile-status-bar/package.js | 2 +- packages/routepolicy/package.js | 2 +- packages/webapp-hashing/package.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/appcache/package.js b/packages/appcache/package.js index 8c0dd8bcfc..da924c9bbc 100644 --- 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.0" }); Package.on_use(function (api) { diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js index ad0941c1e3..d9c0ffc62c 100644 --- 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) { diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js index a0b049bf3a..b52908fdb3 100644 --- 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.0' }); Package.on_use(function (api) { diff --git a/packages/logging/package.js b/packages/logging/package.js index 76b6a717fc..d8cc56bbc9 100644 --- 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.2' }); Npm.depends({ diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js index 46d73a7a93..3761f410b0 100644 --- 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) { diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js index 74fa170951..fd4504ce32 100644 --- 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.0' }); Package.on_use(function (api) { diff --git a/packages/webapp-hashing/package.js b/packages/webapp-hashing/package.js index 23f461029c..b4e5c469fa 100644 --- 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) { From d73bd2add41b95f06796e24f6b3b352eeda973a3 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 15:57:55 -0700 Subject: [PATCH 2/8] History item for 0.9.2.1 --- History.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/History.md b/History.md index 06e9edaccb..aa6e7da957 100644 --- 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 From e8a1287f2a990a4e6de90302d9cb0c4cde0a00ed Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 16:02:27 -0700 Subject: [PATCH 3/8] Banner for 0.9.2.1 --- scripts/admin/banners.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/admin/banners.json b/scripts/admin/banners.json index 6fb66f447b..acb5043900 100644 --- 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'." + } } ] } From 5b823875c56c985589fd467e0cdbb3fb1a354409 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 16:04:04 -0700 Subject: [PATCH 4/8] update meteor-release-official.json for 0.9.2.1 --- scripts/admin/meteor-release-official.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index 008d2ae746..9019e6c1cb 100644 --- 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" From dd61c40bbcabf245a8d763c50e1004d8a899ea30 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 16:07:26 -0700 Subject: [PATCH 5/8] bump more package numbers for 0.9.2.1 --- packages/appcache/package.js | 2 +- packages/htmljs/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/routepolicy/package.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/appcache/package.js b/packages/appcache/package.js index da924c9bbc..e9cf6fbb47 100644 --- 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" + version: "1.0.1" }); Package.on_use(function (api) { diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js index b52908fdb3..6991a88873 100644 --- 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' + version: '1.0.1' }); Package.on_use(function (api) { diff --git a/packages/logging/package.js b/packages/logging/package.js index d8cc56bbc9..6ee7a8b2bf 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.2' + version: '1.0.3' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index b4fd80cf80..ba2d051e8a 100644 --- 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(); diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js index fd4504ce32..fe29339c2b 100644 --- a/packages/routepolicy/package.js +++ b/packages/routepolicy/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "route policy declarations", - version: '1.0.0' + version: '1.0.1' }); Package.on_use(function (api) { From 113be020e21810b204ef5048f83a857d25929190 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 16:45:10 -0700 Subject: [PATCH 6/8] update manifest for 0.9.2.1 --- scripts/admin/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/admin/manifest.json b/scripts/admin/manifest.json index 4cd0690965..3d38f0513e 100644 --- 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 ', 'meteor publish', and 'meteor search '.\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" } } From a089d97048367454ddeddc8230311436d162a6fe Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 16:46:42 -0700 Subject: [PATCH 7/8] update docs --- docs/.meteor/release | 2 +- docs/.meteor/versions | 14 +++++++------- docs/client/docs.js | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/.meteor/release b/docs/.meteor/release index 8738ff2ef9..0d5c84e671 100644 --- a/docs/.meteor/release +++ b/docs/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2 +METEOR@0.9.2.1 diff --git a/docs/.meteor/versions b/docs/.meteor/versions index a5c4241964..811099bd65 100644 --- 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 diff --git a/docs/client/docs.js b/docs/client/docs.js index 5f32aff6ef..583ca7f33e 100644 --- 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 () { From 7299bac40f6c0aeadb148b019a5c4e0a0ba0d4ac Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Mon, 15 Sep 2014 16:49:00 -0700 Subject: [PATCH 8/8] update examples to 0.9.2.1 --- examples/clock/.meteor/release | 2 +- examples/clock/.meteor/versions | 12 ++++++------ examples/leaderboard/.meteor/release | 2 +- examples/leaderboard/.meteor/versions | 12 ++++++------ examples/parties/.meteor/release | 2 +- examples/parties/.meteor/versions | 12 ++++++------ examples/todos/.meteor/release | 2 +- examples/todos/.meteor/versions | 12 ++++++------ examples/wordplay/.meteor/release | 2 +- examples/wordplay/.meteor/versions | 12 ++++++------ 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/clock/.meteor/release b/examples/clock/.meteor/release index 8738ff2ef9..0d5c84e671 100644 --- a/examples/clock/.meteor/release +++ b/examples/clock/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2 +METEOR@0.9.2.1 diff --git a/examples/clock/.meteor/versions b/examples/clock/.meteor/versions index df1ed5ac53..c474510622 100644 --- 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 diff --git a/examples/leaderboard/.meteor/release b/examples/leaderboard/.meteor/release index 8738ff2ef9..0d5c84e671 100644 --- a/examples/leaderboard/.meteor/release +++ b/examples/leaderboard/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2 +METEOR@0.9.2.1 diff --git a/examples/leaderboard/.meteor/versions b/examples/leaderboard/.meteor/versions index df1ed5ac53..c474510622 100644 --- 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 diff --git a/examples/parties/.meteor/release b/examples/parties/.meteor/release index 8738ff2ef9..0d5c84e671 100644 --- a/examples/parties/.meteor/release +++ b/examples/parties/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2 +METEOR@0.9.2.1 diff --git a/examples/parties/.meteor/versions b/examples/parties/.meteor/versions index 2c27cd245f..712f4cb746 100644 --- 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 diff --git a/examples/todos/.meteor/release b/examples/todos/.meteor/release index 8738ff2ef9..0d5c84e671 100644 --- a/examples/todos/.meteor/release +++ b/examples/todos/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2 +METEOR@0.9.2.1 diff --git a/examples/todos/.meteor/versions b/examples/todos/.meteor/versions index 3915e1fea6..ef4139e47c 100644 --- 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 diff --git a/examples/wordplay/.meteor/release b/examples/wordplay/.meteor/release index 8738ff2ef9..0d5c84e671 100644 --- a/examples/wordplay/.meteor/release +++ b/examples/wordplay/.meteor/release @@ -1 +1 @@ -METEOR@0.9.2 +METEOR@0.9.2.1 diff --git a/examples/wordplay/.meteor/versions b/examples/wordplay/.meteor/versions index b31a4744ce..f5a65e2caf 100644 --- 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