fix merge

.gitattributes

+text eol=lf

.gitignore

-.hg
+.DS_Store
+*.pyc

.hgignore

-syntax:glob
-.git/

.travis.yml

+language: python
+python:
+  - "3.3"
+
+#command to run tests
+script: python -m unittest

readme.creole

-= Sublime Package Control Default Channel
-
-The {{{repositories.json}}} file contains a list of Package Control
-repositories for use with the Package Control plugin manager for Sublime
-Text 2. It is published at http://sublime.wbond.net/repositories.json,
-which is the default channel provided with the Package Control.
-
-If you have a GitHub or BitBucket repository that contains a Sublime Text
-2 plugin, and wish to allow for users to easily discover, install and
-upgrade your plugin, please do the following:
-
-# Fork this repository (GitHub or BitBucket)
-# Add your repository and commit
-# Send me a pull request
-
-You can also email me your repository URLs via will@wbond.net

readme.md

+# Sublime Package Control Default Channel
+
+The `channel.json`, `repository.json` and `repository/*.json` files contain a
+list of repositories and packages for use with
+[Package Control](https://sublime.wbond.net).
+
+The `channel.json` file is published at https://sublime.wbond.net/channel.json
+and is included with Package Control as the default channel.
+
+Please be sure to follow the instructions at
+https://sublime.wbond.net/docs/developers to help the process of adding your
+package or repository go smoothly.

repositories.json

-{
-	"schema_version": "1.0",
-	"repositories": [
-		"http://sublime.wbond.net/packages.json",
-		"https://github.com/buymeasoda/soda-theme",
-		"https://github.com/SublimeText",
-		"https://raw.github.com/jeffturcotte/sublime_packages/master/packages.json",
-		"https://github.com/lunixbochs/sublimelint",
-		"https://github.com/Kronuz/SublimeCodeIntel",
-		"https://github.com/Kronuz/SublimeLinter",
-		"https://github.com/mrmartineau/Placeholders",
-		"https://github.com/mrmartineau/HTML5",
-		"https://github.com/pyparadigm/SublimeTagmatcher",
-		"https://github.com/jbrooksuk/SublimeWebColors",
-		"https://github.com/brianriley/sublime-dpaste",
-		"https://github.com/aparajita/Cappuccino-Sublime",
-		"https://github.com/pyparadigm/SublimeBrackets",
-		"https://github.com/kizza/CSS-Less-ish",
-		"https://github.com/alexstaubo/sublime_text_alternative_autocompletion",
-		"https://github.com/bgreenlee/sublime-github",
-		"https://github.com/Etsur/EE-ST2",
-		"https://github.com/Paaskehare/pastebin-sublime-plugin",
-		"https://github.com/sentience/HyperlinkHelper",
-		"https://github.com/ehamiter/ST2-GitHubinator",
-		"https://bitbucket.org/scottbessler/sublimetextcaseconversion",
-		"https://github.com/squ1b3r/Djaneiro",
-		"https://github.com/maltize/sublime-text-2-ruby-tests",
-		"https://github.com/witsch/SublimePythonTidy",
-		"https://github.com/spadgos/sublime-AsAbove",
-		"https://github.com/spadgos/sublime-jsdocs",
-		"https://github.com/spadgos/sublime-OpenRecentFiles",
-		"https://github.com/spadgos/sublime-DefaultFileType",
-		"https://github.com/spadgos/sublime-ToggleQuotes",
-		"https://github.com/kemayo/sublime-text-2-git",
-		"https://github.com/kemayo/sublime-text-2-goto-documentation",
-		"https://github.com/kemayo/sublime-text-2-clipboard-history",
-		"https://github.com/allixsenos/SublimeMRU",
-		"https://github.com/titoBouzout/SideBarEnhancements",
-		"https://bitbucket.org/nwjlyons/copy-file-name",
-		"https://github.com/robcowie/SublimePaster",
-		"https://github.com/facelessuser/BracketHighlighter",
-		"https://github.com/facelessuser/HexViewer",
-		"https://github.com/aaronpowell/sublime-jquery-snippets",
-		"https://github.com/dz0ny/LiveReload-sublimetext2",
-		"https://github.com/rozboris/Sublime-Tweet",
-		"https://github.com/condemil/Gist",
-		"https://github.com/DisposaBoy/GoSublime",
-		"https://github.com/mitsuhiko/jinja2-tmbundle",
-		"https://github.com/jashkenas/coffee-script-tmbundle",
-		"https://github.com/alek-sys/sublimetext_indentxml",
-		"https://github.com/minism/SublimeLove",
-		"https://github.com/minism/SublimeBufmod",
-		"https://github.com/tanepiper/SublimeText-Nodejs",
-		"https://github.com/rmaksim/Sublime-Text-2-Inc-Dec-Value"
-		"https://github.com/rmaksim/Sublime-Text-2-Goto-CSS-Declaration"
-	],
-	"package_name_map": {
-		"soda-theme": "Theme - Soda",
-		"Cappuccino-Sublime": "Cappuccino",
-		"sublime_text_alternative_autocompletion": "alternative_autocompletion",
-		"EE-ST2": "ExpressionEngine",
-		"ST2-GitHubinator": "GitHubinator",
-		"sublimetextcaseconversion": "Case Conversion",
-		"sublime-text-2-ruby-tests": "RubyTest",
-		"SublimePythonTidy": "PythonTidy",
-		"sublime-AsAbove": "AsAbove",
-		"sublime-jsdocs": "JSDocs",
-		"sublime-OpenRecentFiles" : "Open Recent Files",
-		"sublime-DefaultFileType": "Default File Type",
-		"sublime-ToggleQuotes": "ToggleQuotes",
-		"sublime-text-2-git": "Git",
-		"sublime-text-2-goto-documentation": "Goto Documentation",
-		"sublime-text-2-clipboard-history": "Clipboard History",
-		"CSS-Less-ish": "CSS Less(ish)",
-		"sublime-jquery-snippets": "jQuery Snippets pack",
-		"LiveReload-sublimetext2": "LiveReload",
-		"Sublime-Tweet": "Sublime Tweet",
-		"jinja2-tmbundle": "Jinja2",
-		"coffee-script-tmbundle": "CoffeeScript",
-		"sublimetext_indentxml": "Indent XML",
-		"SublimeText-Nodejs": "Nodejs",
-		"Sublime-Text-2-Inc-Dec-Value": "Inc-Dec-Value",
-		"Sublime-Text-2-Goto-CSS-Declaration": "Goto-CSS-Declaration"
-	}
-}

repository.json

+{
+	"schema_version": "2.0",
+	"packages": [],
+	"includes": [
+		"./repository/0-9.json",
+		"./repository/a.json",
+		"./repository/b.json",
+		"./repository/c.json",
+		"./repository/d.json",
+		"./repository/e.json",
+		"./repository/f.json",
+		"./repository/g.json",
+		"./repository/h.json",
+		"./repository/i.json",
+		"./repository/j.json",
+		"./repository/k.json",
+		"./repository/l.json",
+		"./repository/m.json",
+		"./repository/n.json",
+		"./repository/o.json",
+		"./repository/p.json",
+		"./repository/q.json",
+		"./repository/r.json",
+		"./repository/s.json",
+		"./repository/t.json",
+		"./repository/u.json",
+		"./repository/v.json",
+		"./repository/w.json",
+		"./repository/x.json",
+		"./repository/y.json",
+		"./repository/z.json"
+	]
+}

repository/0-9.json

+{
+	"schema_version": "2.0",
+	"packages": [
+		{
+			"name": "2pdf",
+			"details": "https://github.com/fraoustin/Sublime2pdf",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/fraoustin/Sublime2pdf/tree/master"
+				}
+			]
+		},
+		{
+			"name": "3024 Color Scheme",
+			"details": "https://github.com/idleberg/3024.tmTheme",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/idleberg/3024.tmTheme/tree/master"
+				}
+			]
+		},
+		{
+			"name": "4GL",
+			"details": "https://github.com/skarcha/SublimeText2-4GL",
+			"labels": ["language syntax"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/skarcha/SublimeText2-4GL/tree/master"
+				}
+			]
+		}
+	]
+}