merge with upstream

.gitignore

 .DS_Store
-.hg
 *.pyc

.hgignore

-syntax:glob
-.git/

fix_it.py

-#!/usr/bin/env python3
-
-"""Tests for the validity of the channel file
-
-Run this file when tests are failing. Does not handle invalid JSON.
-"""
-
-import json
-import re
-import math
-from collections import OrderedDict
-
-repo_file = "repositories.json"
-
-
-def reorder_repositories(j):
-    repos = j['repositories']
-    # Disregard "https://github.com/SublimeText" at the top because it is
-    # purposely not in order
-    first_elmt = repos.pop(0)
-    j['repositories'] = [first_elmt] + sorted(repos, key=str.lower)
-
-
-def reorder_package_names(j):
-    map_package_names = list(j['package_name_map'].keys())
-    j['package_name_map'] = OrderedDict([(k, j['package_name_map'][k])
-                                         for k in sorted(map_package_names, key=str.lower)])
-
-
-def reorder_renamed_packages(j):
-    ren_package_names = list(j['renamed_packages'].keys())
-    j['renamed_packages'] = OrderedDict([(k, j['renamed_packages'][k])
-                                         for k in sorted(ren_package_names, key=str.lower)])
-
-
-def remove_redundant_name_maps(j):
-    for k, v in j['package_name_map'].items():
-        if k == v:
-            del j['package_name_map'][k]
-
-
-def remove_redundant_rename_maps(j):
-    for k, v in j['renamed_packages'].items():
-        if k == v:
-            del j['renamed_packages'][k]
-
-
-def main():
-    # Read from file
-    with open(repo_file) as f:
-        j = json.load(f, object_pairs_hook=OrderedDict)
-
-    # Validate the data
-    reorder_repositories(j)
-    reorder_package_names(j)
-    reorder_renamed_packages(j)
-    remove_redundant_name_maps(j)
-    remove_redundant_rename_maps(j)
-
-    # Pretty print
-    res = json.dumps(j, ensure_ascii=False, indent="\t", separators=(',', ': '))
-    # Convert to tab indents
-    # res = re.sub(r"(?m)^( {4,})", lambda r: "\t" * math.floor(len(r.group(1)) / 4), res)
-
-    # Write to file
-    with open(repo_file, 'w') as f:
-        f.write(res)
-
-
-if __name__ == '__main__':
-    main()

readme.creole

-= Sublime Package Control Default Channel
-
-The {{{repositories.json}}} file contains a list of Package Control
-repositories for use with the Package Control package manager for Sublime
-Text 2. It is published at https://sublime.wbond.net/repositories.json and is
-included with Package Control as the default channel.
-
-Please be sure to follow the instructions at
-http://wbond.net/sublime_packages/package_control/package_developers to help
-the process of adding your package go smoothly.
\ No newline at end of file

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.

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"
+				}
+			]
+		}
+	]
+}

repository/i.json

+{
+	"schema_version": "2.0",
+	"packages": [
+		{
+			"name": "IcedCoffeeScript",
+			"details": "https://github.com/dhoelzgen/iced-coffee-script-tmbundle",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/dhoelzgen/iced-coffee-script-tmbundle/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/chrisborrowdale/Idiomatic-CSS-Comments-Snippets",
+			"labels": ["snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/chrisborrowdale/Idiomatic-CSS-Comments-Snippets/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Idoc",
+			"details": "https://github.com/tstirrat/Idoc-sublime",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/tstirrat/Idoc-sublime/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/palaniraja/iForce",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/palaniraja/iForce/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Image2Base64",
+			"details": "https://github.com/tm-minty/sublime-text-2-image2base64",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/tm-minty/sublime-text-2-image2base64/tree/master"
+				}
+			]
+		},
+		{
+			"name": "ImageMagick",
+			"details": "https://github.com/Kentzo/SublimeMagick",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/Kentzo/SublimeMagick/tree/master"
+				}
+			]
+		},
+		{
+			"name": "ImpactJS",
+			"details": "https://github.com/drhayes/sublime-impactjs",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/drhayes/sublime-impactjs/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/SublimeText/InactivePanes",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/SublimeText/InactivePanes/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Inc-Dec-Value",
+			"details": "https://github.com/rmaksim/Sublime-Text-2-Inc-Dec-Value",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/rmaksim/Sublime-Text-2-Inc-Dec-Value/tree/master"
+				}
+			],
+			"previous_names": [
+				"IncDecValue"
+			]
+		},
+		{
+			"name": "Increment Selection",
+			"details": "https://github.com/yulanggong/IncrementSelection",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/yulanggong/IncrementSelection/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/eBookArchitects/Incrementor",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/eBookArchitects/Incrementor/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Indent XML",
+			"details": "https://github.com/alek-sys/sublimetext_indentxml",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/alek-sys/sublimetext_indentxml/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/SublimeText/IndentGuides",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/SublimeText/IndentGuides/tree/master"
+				}
+			]
+		},
+		{
+			"name": "INI",
+			"details": "https://github.com/clintberry/sublime-text-2-ini",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/clintberry/sublime-text-2-ini/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Inline Calculator",
+			"details": "https://github.com/sahibalejandro/inline-calculator",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/sahibalejandro/inline-calculator/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Insert Sequences",
+			"details": "https://github.com/jbrooksuk/InsertNums",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/jbrooksuk/InsertNums/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://bitbucket.org/markstahler/insert-nums",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://bitbucket.org/markstahler/insert-nums/src/default"
+				}
+			]
+		},
+		{
+      			"name": "IPS Syntax",
+      			"details": "https://github.com/Skullmonkey/IPS-Syntax/tree/master/IPS",
+      			"author": "Matt C",
+      			"labels": ["language syntax"],
+			"releases": [
+              			{
+                  			"sublime_text": "*",
+                  			"details": "https://github.com/Skullmonkey/IPS-Syntax/tree/master"
+              			}
+      			]
+    		},
+		{
+			"details": "https://github.com/SublimeText/Issues",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/SublimeText/Issues/tree/master"
+				}
+			]
+		},
+		{
+			"name": "iTodo",
+			"details": "https://github.com/chagel/itodo",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/chagel/itodo/tree/master"
+				}
+			]
+		}
+	]
+}

repository/k.json

+{
+	"schema_version": "2.0",
+	"packages": [
+		{
+			"name": "Keep Open On Last Tab Close",
+			"details": "https://github.com/vprimachenko/Sublime2KeepOpen",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/vprimachenko/Sublime2KeepOpen/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/welefen/KeymapManager",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/welefen/KeymapManager/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Kimbie Color Scheme",
+			"details": "https://github.com/idleberg/Kimbie.tmTheme",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/idleberg/Kimbie.tmTheme/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/aziz/knockdown",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/aziz/knockdown/tree/master"
+				}
+			]
+		},
+		{
+			"details": "https://github.com/SublimeText/KnowledgeBase",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/SublimeText/KnowledgeBase/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Kohana",
+			"details": "https://github.com/Zeelot/sublime-kohana",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/Zeelot/sublime-kohana/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Kohana 2.x Snippets",
+			"details": "https://github.com/golf3gtiii/Kohana234-sublimeText2-plugin",
+			"labels": ["snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/golf3gtiii/Kohana234-sublimeText2-plugin/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Koken",
+			"details": "https://github.com/koken/koken-sublime",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/koken/koken-sublime/tree/master"
+				}
+			]
+		},
+		{
+			"name": "Kotlin",
+			"details": "https://github.com/vkostyukov/kotlin-sublime-package",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/vkostyukov/kotlin-sublime-package/tree/master"
+				}
+			]
+		},
+		{
+			"name": "KWrite Color Scheme",
+			"details": "https://github.com/daris/sublime-kwrite-color-scheme",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/daris/sublime-kwrite-color-scheme/tree/master"
+				}
+			]
+		}
+	]
+}