From 32f6edc624dc9687b3b4e42567e9624b262dee74 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Thu, 25 Sep 2014 11:02:34 -0700
Subject: [PATCH 1/3] Deprecate amplify,backbone,bootstrap,d3

packages/deprecated/README:

```
These packages are no longer actively maintained by MDG.  Seek
community alternatives instead.

Note that these packages still exist in atmosphere, and you can still
build a package that depends on one of them by specifying an explicit
package version.
```

Nothing technically prevents us from publishing further versions of these packages (like the ones in packages/non-core).
---
 docs/client/docs.js                            |   4 ----
 docs/client/packages.html                      |   4 ----
 docs/client/packages/amplify.html              |  14 --------------
 docs/client/packages/backbone.html             |  11 -----------
 docs/client/packages/bootstrap.html            |  13 -------------
 docs/client/packages/d3.html                   |  17 -----------------
 packages/deprecated/README                     |   6 ++++++
 packages/{ => deprecated}/amplify/.gitignore   |   0
 packages/{ => deprecated}/amplify/amplify.js   |   0
 packages/{ => deprecated}/amplify/package.js   |   0
 packages/{ => deprecated}/backbone/.gitignore  |   0
 packages/{ => deprecated}/backbone/backbone.js |   0
 packages/{ => deprecated}/backbone/package.js  |   0
 packages/{ => deprecated}/bootstrap/.gitignore |   0
 .../bootstrap/css/bootstrap-override.css       |   0
 .../bootstrap/css/bootstrap-responsive.css     |   0
 .../bootstrap/css/bootstrap.css                |   0
 .../img/glyphicons-halflings-white.png         | Bin
 .../bootstrap/img/glyphicons-halflings.png     | Bin
 .../{ => deprecated}/bootstrap/js/bootstrap.js |   0
 packages/{ => deprecated}/bootstrap/package.js |   0
 packages/{ => deprecated}/d3/.gitignore        |   0
 packages/{ => deprecated}/d3/d3.v3.js          |   0
 packages/{ => deprecated}/d3/package.js        |   0
 24 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 docs/client/packages/amplify.html
 delete mode 100644 docs/client/packages/backbone.html
 delete mode 100644 docs/client/packages/bootstrap.html
 delete mode 100644 docs/client/packages/d3.html
 create mode 100644 packages/deprecated/README
 rename packages/{ => deprecated}/amplify/.gitignore (100%)
 rename packages/{ => deprecated}/amplify/amplify.js (100%)
 rename packages/{ => deprecated}/amplify/package.js (100%)
 rename packages/{ => deprecated}/backbone/.gitignore (100%)
 rename packages/{ => deprecated}/backbone/backbone.js (100%)
 rename packages/{ => deprecated}/backbone/package.js (100%)
 rename packages/{ => deprecated}/bootstrap/.gitignore (100%)
 rename packages/{ => deprecated}/bootstrap/css/bootstrap-override.css (100%)
 rename packages/{ => deprecated}/bootstrap/css/bootstrap-responsive.css (100%)
 rename packages/{ => deprecated}/bootstrap/css/bootstrap.css (100%)
 rename packages/{ => deprecated}/bootstrap/img/glyphicons-halflings-white.png (100%)
 rename packages/{ => deprecated}/bootstrap/img/glyphicons-halflings.png (100%)
 rename packages/{ => deprecated}/bootstrap/js/bootstrap.js (100%)
 rename packages/{ => deprecated}/bootstrap/package.js (100%)
 rename packages/{ => deprecated}/d3/.gitignore (100%)
 rename packages/{ => deprecated}/d3/d3.v3.js (100%)
 rename packages/{ => deprecated}/d3/package.js (100%)

diff --git a/docs/client/docs.js b/docs/client/docs.js
index 9f3008c3bd..7889cb8b48 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -391,14 +391,10 @@ var toc = [
 
   "Packages", [ [
     "accounts-ui",
-    "amplify",
     "appcache",
     "audit-argument-checks",
-    "backbone",
-    "bootstrap",
     "browser-policy",
     "coffeescript",
-    "d3",
     "fastclick",
     "force-ssl",
     "jquery",
diff --git a/docs/client/packages.html b/docs/client/packages.html
index 71ed5b363b..d79071ccf1 100644
--- a/docs/client/packages.html
+++ b/docs/client/packages.html
@@ -19,14 +19,10 @@ and removed with:
 Meteor Development Group maintains the following packages:
 
 {{> pkg_accounts_ui}}
-{{> pkg_amplify}}
 {{> pkg_appcache}}
 {{> pkg_audit_argument_checks}}
-{{> pkg_backbone}}
-{{> pkg_bootstrap}}
 {{> pkg_browser_policy}}
 {{> pkg_coffeescript}}
-{{> pkg_d3}}
 {{> pkg_fastclick}}
 {{> pkg_force_ssl}}
 {{> pkg_jquery}}
diff --git a/docs/client/packages/amplify.html b/docs/client/packages/amplify.html
deleted file mode 100644
index 9e6e414c7c..0000000000
--- a/docs/client/packages/amplify.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<template name="pkg_amplify">
-{{#markdown}}
-
-## `amplify`
-
-[Amplify](http://amplifyjs.com/) provides a simple cross-browser API for HTML5 local storage, an
-in-browser communication channel for loosely coupling application
-components, and several useful utility functions.
-
-Amplify defines a global namespace `amplify` on the client only. It does
-not run on the server.
-
-{{/markdown}}
-</template>
diff --git a/docs/client/packages/backbone.html b/docs/client/packages/backbone.html
deleted file mode 100644
index 52397a2808..0000000000
--- a/docs/client/packages/backbone.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<template name="pkg_backbone">
-{{#markdown}}
-## `backbone`
-
-[Backbone](http://documentcloud.github.com/backbone/) is a popular client-side MVC framework for managing complex
-data in the browser. In addition to the MVC and DOM-binding
-functionality, it also provides an API for HTML5 pushState and
-client-side URL routing.
-
-{{/markdown}}
-</template>
diff --git a/docs/client/packages/bootstrap.html b/docs/client/packages/bootstrap.html
deleted file mode 100644
index 1d813fdbdb..0000000000
--- a/docs/client/packages/bootstrap.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<template name="pkg_bootstrap">
-{{#markdown}}
-## `bootstrap`
-
-[Twitter's Bootstrap](http://twitter.github.com/bootstrap/) package is a front-end toolkit for faster, more
-beautiful web development.  Bootstrap provides simple and flexible HTML,
-CSS, and JavaScript for popular user interface components and
-interactions including typography, forms, buttons, tables, grids, and
-navigation.
-
-
-{{/markdown}}
-</template>
diff --git a/docs/client/packages/d3.html b/docs/client/packages/d3.html
deleted file mode 100644
index ca999a697d..0000000000
--- a/docs/client/packages/d3.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<template name="pkg_d3">
-{{#markdown}}
-
-## `d3`
-
-[D3.js](http://d3js.org/) is a JavaScript library for manipulating
-documents based on data. D3 helps you bring data to life using HTML, SVG
-and CSS. D3's emphasis on web standards gives you the full capabilities
-of modern browsers without tying yourself to a proprietary framework,
-combining powerful visualization components and a data-driven approach
-to DOM manipulation.
-
-The `d3` package adds the D3 library to the client JavaScript
-bundle. It has no effect on the server.
-
-{{/markdown}}
-</template>
diff --git a/packages/deprecated/README b/packages/deprecated/README
new file mode 100644
index 0000000000..92ec8f49b9
--- /dev/null
+++ b/packages/deprecated/README
@@ -0,0 +1,6 @@
+These packages are no longer actively maintained by MDG.  Seek
+community alternatives instead.
+
+Note that these packages still exist in atmosphere, and you can still
+build a package that depends on one of them by specifying an explicit
+package version.
diff --git a/packages/amplify/.gitignore b/packages/deprecated/amplify/.gitignore
similarity index 100%
rename from packages/amplify/.gitignore
rename to packages/deprecated/amplify/.gitignore
diff --git a/packages/amplify/amplify.js b/packages/deprecated/amplify/amplify.js
similarity index 100%
rename from packages/amplify/amplify.js
rename to packages/deprecated/amplify/amplify.js
diff --git a/packages/amplify/package.js b/packages/deprecated/amplify/package.js
similarity index 100%
rename from packages/amplify/package.js
rename to packages/deprecated/amplify/package.js
diff --git a/packages/backbone/.gitignore b/packages/deprecated/backbone/.gitignore
similarity index 100%
rename from packages/backbone/.gitignore
rename to packages/deprecated/backbone/.gitignore
diff --git a/packages/backbone/backbone.js b/packages/deprecated/backbone/backbone.js
similarity index 100%
rename from packages/backbone/backbone.js
rename to packages/deprecated/backbone/backbone.js
diff --git a/packages/backbone/package.js b/packages/deprecated/backbone/package.js
similarity index 100%
rename from packages/backbone/package.js
rename to packages/deprecated/backbone/package.js
diff --git a/packages/bootstrap/.gitignore b/packages/deprecated/bootstrap/.gitignore
similarity index 100%
rename from packages/bootstrap/.gitignore
rename to packages/deprecated/bootstrap/.gitignore
diff --git a/packages/bootstrap/css/bootstrap-override.css b/packages/deprecated/bootstrap/css/bootstrap-override.css
similarity index 100%
rename from packages/bootstrap/css/bootstrap-override.css
rename to packages/deprecated/bootstrap/css/bootstrap-override.css
diff --git a/packages/bootstrap/css/bootstrap-responsive.css b/packages/deprecated/bootstrap/css/bootstrap-responsive.css
similarity index 100%
rename from packages/bootstrap/css/bootstrap-responsive.css
rename to packages/deprecated/bootstrap/css/bootstrap-responsive.css
diff --git a/packages/bootstrap/css/bootstrap.css b/packages/deprecated/bootstrap/css/bootstrap.css
similarity index 100%
rename from packages/bootstrap/css/bootstrap.css
rename to packages/deprecated/bootstrap/css/bootstrap.css
diff --git a/packages/bootstrap/img/glyphicons-halflings-white.png b/packages/deprecated/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from packages/bootstrap/img/glyphicons-halflings-white.png
rename to packages/deprecated/bootstrap/img/glyphicons-halflings-white.png
diff --git a/packages/bootstrap/img/glyphicons-halflings.png b/packages/deprecated/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from packages/bootstrap/img/glyphicons-halflings.png
rename to packages/deprecated/bootstrap/img/glyphicons-halflings.png
diff --git a/packages/bootstrap/js/bootstrap.js b/packages/deprecated/bootstrap/js/bootstrap.js
similarity index 100%
rename from packages/bootstrap/js/bootstrap.js
rename to packages/deprecated/bootstrap/js/bootstrap.js
diff --git a/packages/bootstrap/package.js b/packages/deprecated/bootstrap/package.js
similarity index 100%
rename from packages/bootstrap/package.js
rename to packages/deprecated/bootstrap/package.js
diff --git a/packages/d3/.gitignore b/packages/deprecated/d3/.gitignore
similarity index 100%
rename from packages/d3/.gitignore
rename to packages/deprecated/d3/.gitignore
diff --git a/packages/d3/d3.v3.js b/packages/deprecated/d3/d3.v3.js
similarity index 100%
rename from packages/d3/d3.v3.js
rename to packages/deprecated/d3/d3.v3.js
diff --git a/packages/d3/package.js b/packages/deprecated/d3/package.js
similarity index 100%
rename from packages/d3/package.js
rename to packages/deprecated/d3/package.js

From 75c473b255bbb61fcd26720a37af516841ed1f05 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Thu, 25 Sep 2014 13:51:03 -0700
Subject: [PATCH 2/3] =?UTF-8?q?Rename=20=E2=80=9Cshowdown=E2=80=9D=20to=20?=
 =?UTF-8?q?=E2=80=9Cmarkdown=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we want to change markdown implementations in the future, we’ll bump the major version of the package.
---
 packages/markdown/.gitignore                  |  1 +
 packages/{showdown => markdown}/license.txt   |  0
 packages/markdown/package.js                  | 20 +++++++++++++++++++
 packages/{showdown => markdown}/showdown.js   |  0
 .../template-integration.js                   |  0
 packages/showdown/package.js                  | 18 +++--------------
 6 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 packages/markdown/.gitignore
 rename packages/{showdown => markdown}/license.txt (100%)
 create mode 100644 packages/markdown/package.js
 rename packages/{showdown => markdown}/showdown.js (100%)
 rename packages/{showdown => markdown}/template-integration.js (100%)

diff --git a/packages/markdown/.gitignore b/packages/markdown/.gitignore
new file mode 100644
index 0000000000..677a6fc263
--- /dev/null
+++ b/packages/markdown/.gitignore
@@ -0,0 +1 @@
+.build*
diff --git a/packages/showdown/license.txt b/packages/markdown/license.txt
similarity index 100%
rename from packages/showdown/license.txt
rename to packages/markdown/license.txt
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
new file mode 100644
index 0000000000..da96fed532
--- /dev/null
+++ b/packages/markdown/package.js
@@ -0,0 +1,20 @@
+// Source: https://github.com/coreyti/showdown
+
+// XXX rename to 'markdown' and credit showdown some other way?
+
+Package.describe({
+  summary: "Markdown-to-HTML processor",
+  version: "1.0.1"
+});
+
+Package.on_use(function (api) {
+  api.add_files("showdown.js");
+  api.export('Showdown');
+
+  api.use("templating", "client", {weak: true});
+  api.add_files('template-integration.js', 'client');
+});
+
+Package.on_test(function (api) {
+  api.use("blaze", "client");
+});
diff --git a/packages/showdown/showdown.js b/packages/markdown/showdown.js
similarity index 100%
rename from packages/showdown/showdown.js
rename to packages/markdown/showdown.js
diff --git a/packages/showdown/template-integration.js b/packages/markdown/template-integration.js
similarity index 100%
rename from packages/showdown/template-integration.js
rename to packages/markdown/template-integration.js
diff --git a/packages/showdown/package.js b/packages/showdown/package.js
index da96fed532..e89b0e2e80 100644
--- a/packages/showdown/package.js
+++ b/packages/showdown/package.js
@@ -1,20 +1,8 @@
-// Source: https://github.com/coreyti/showdown
-
-// XXX rename to 'markdown' and credit showdown some other way?
-
 Package.describe({
-  summary: "Markdown-to-HTML processor",
-  version: "1.0.1"
+  summary: "Moved to the 'markdown' package",
+  version: '1.0.1'
 });
 
 Package.on_use(function (api) {
-  api.add_files("showdown.js");
-  api.export('Showdown');
-
-  api.use("templating", "client", {weak: true});
-  api.add_files('template-integration.js', 'client');
-});
-
-Package.on_test(function (api) {
-  api.use("blaze", "client");
+  api.imply("markdown");
 });

From 8f707caad9e8a623d325632e7decb826e97eb2f1 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Thu, 25 Sep 2014 13:51:03 -0700
Subject: [PATCH 3/3] =?UTF-8?q?Rename=20=E2=80=9Cshowdown=E2=80=9D=20to=20?=
 =?UTF-8?q?=E2=80=9Cmarkdown=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we want to change markdown implementations in the future, we’ll bump the major version of the package.
---
 docs/.meteor/versions        | 1 +
 packages/markdown/package.js | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/.meteor/versions b/docs/.meteor/versions
index 811099bd65..86ce428ee5 100644
--- a/docs/.meteor/versions
+++ b/docs/.meteor/versions
@@ -28,6 +28,7 @@ json@1.0.0
 less@1.0.8
 livedata@1.0.9
 logging@1.0.3
+markdown@1.0.1
 meteor-platform@1.1.0
 meteor@1.1.0
 minifiers@1.1.0
diff --git a/packages/markdown/package.js b/packages/markdown/package.js
index da96fed532..037e5df0d7 100644
--- a/packages/markdown/package.js
+++ b/packages/markdown/package.js
@@ -1,7 +1,5 @@
 // Source: https://github.com/coreyti/showdown
 
-// XXX rename to 'markdown' and credit showdown some other way?
-
 Package.describe({
   summary: "Markdown-to-HTML processor",
   version: "1.0.1"