Merge remote-tracking branch 'upstream/master'

channel.json

@@ -18,7 +18,6 @@
 		"https://raw.github.com/akalongman/sublimetext-stringutilities/master/packages.json",
 		"https://raw.github.com/amazedkoumei/SublimeKnifeSolo/master/packages.json",
 		"https://raw.github.com/Andr3as/Sublime-SurroundWith/master/packages.json",
-		"https://raw.github.com/angular-ui/AngularJS-sublime-package/master/packages.json",
 		"https://raw.github.com/aparajita/active4d-sublime/master/package_control.json",
 		"https://raw.github.com/apophys/sublime-packages/master/packages.json",
 		"https://raw.github.com/bits/ExpandSelectionToWhitespace-SublimeText/master/packages.json",

repository/a.json

@@ -115,7 +115,7 @@
 			"details": "https://github.com/randy3k/AlignTab",
 			"releases": [
 				{
-					"sublime_text": "<3000",
+					"sublime_text": "*",
 					"details": "https://github.com/randy3k/AlignTab/tree/master"
 				}
 			]
@@ -262,6 +262,17 @@
 				}
 			]
 		},
+		{
+			"name": "AngularJS",
+			"details": "https://github.com/angular-ui/AngularJS-sublime-package",
+			"labels": ["auto-complete", "code navigation", "snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/angular-ui/AngularJS-sublime-package/tags"
+				}
+			]
+		},
 		{
 			"name": "AngularJS (CoffeeScript)",
 			"details": "https://github.com/Iristyle/Sublime-AngularJS-Coffee-Completions",
@@ -659,7 +670,7 @@
 			"details": "https://github.com/randy3k/AutoWrap",
 			"releases": [
 				{
-					"sublime_text": "<3000",
+					"sublime_text": "*",
 					"details": "https://github.com/randy3k/AutoWrap/tree/master"
 				}
 			]

repository/c.json

@@ -167,7 +167,7 @@
 			"details": "https://github.com/randy3k/ChangeList",
 			"releases": [
 				{
-					"sublime_text": "<3000",
+					"sublime_text": "*",
 					"details": "https://github.com/randy3k/ChangeList/tree/master"
 				}
 			],

repository/e.json

@@ -219,7 +219,7 @@
 			"details": "https://github.com/randy3k/Enhanced-R",
 			"releases": [
 				{
-					"sublime_text": "<3000",
+					"sublime_text": "*",
 					"details": "https://github.com/randy3k/Enhanced-R/tree/master"
 				}
 			],

repository/t.json

@@ -195,6 +195,17 @@
 				"Theme - Soda Refined"
 			]
 		},
+		{
+			"name": "Theme - Brackets",
+			"details": "https://github.com/leszekr/Theme-Brackets",
+			"labels": ["theme"],
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"details": "https://github.com/leszekr/Theme-Brackets/tree/master"
+				}
+			]
+		},
 		{
 			"name": "Theme - Centurion",
 			"details": "https://github.com/allanhortle/Centurion",

utils/migrator.py

@@ -732,6 +732,10 @@ with open(old_repositories_json_path, encoding='utf-8') as of:
             repositories.append(repository)
 
 
+def dump(data, f):
+    json.dump(data, f, indent="\t", separators=(',', ': '))
+
+
 includes = []
 
 if not os.path.exists(new_repository_subfolder_path):
@@ -750,17 +754,17 @@ for letter in names:
             ('packages', [])
         ])
         data['packages'] = sorted_packages
-        json.dump(data, f, indent="\t")
+        dump(data, f)
 
 with open(new_channel_path, 'w', encoding='utf-8') as f:
     data = OrderedDict()
     data['schema_version'] = '2.0'
     data['repositories'] = repositories
-    json.dump(data, f, indent="\t")
+    dump(data, f)
 
 with open(new_repository_path, 'w', encoding='utf-8') as f:
     data = OrderedDict()
     data['schema_version'] = '2.0'
     data['packages'] = []
     data['includes'] = sorted(includes)
-    json.dump(data, f, indent="\t")
+    dump(data, f)