Merge branch 'deprecate-packages' into devel

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

docs/client/docs.js

@@ -394,14 +394,10 @@ var toc = [
 
   "Packages", [ [
     "accounts-ui",
-    "amplify",
     "appcache",
     "audit-argument-checks",
-    "backbone",
-    "bootstrap",
     "browser-policy",
     "coffeescript",
-    "d3",
     "fastclick",
     "force-ssl",
     "jquery",

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}}

docs/client/packages/amplify.html

@@ -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>

docs/client/packages/backbone.html

@@ -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>

docs/client/packages/bootstrap.html

@@ -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>

docs/client/packages/d3.html

@@ -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>

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.

packages/markdown/.gitignore

@@ -0,0 +1 @@
+.build*

packages/markdown/package.js

@@ -0,0 +1,18 @@
+// Source: https://github.com/coreyti/showdown
+
+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");
+});

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");
 });