Cache templates

.github/pull.yml

@@ -0,0 +1,7 @@
+version: "1"
+rules:                      # Array of rules
+  - base: upstream_master   # Required. Target branch
+    upstream: atom:master   # Required. Must be in the same fork network.
+    mergeMethod: hardreset  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: false    # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+label: ":arrow_heading_down: pull upstream"  # Optional

.gitignore

@@ -7,6 +7,7 @@ Thumbs.db
 .svn
 .nvm-version
 .vscode
+.python-version
 node_modules
 npm-debug.log
 debug.log

README.md

@@ -59,7 +59,8 @@ An archive is available for people who don't want to install `atom` as root.
 This version enables you to install multiple Atom versions in parallel. It has been built on Ubuntu 64-bit,
 but should be compatible with other Linux distributions.
 
-1. Install dependencies (on Ubuntu): `sudo apt install git gconf2 gconf-service libgtk2.0-0 libudev1 libgcrypt20 libnotify4 libxtst6 libnss3 python gvfs-bin xdg-utils libcap2`
+1. Install dependencies (on Ubuntu): `sudo apt install git gconf2 gconf-service libgtk2.0-0 libudev1 libgcrypt20 libnotify4 libxtst6 libnss3 python3 gvfs-bin xdg-utils libcap2`
+   1. (If the `python3` package isn't available, or is too old (Python 3 should be >= 3.5), either `python2` or `python` (2.6 or 2.7) will work in its place.)
 2. Download `atom-amd64.tar.gz` from the [Atom releases page](https://github.com/atom/atom/releases/latest).
 3. Run `tar xf atom-amd64.tar.gz` in the directory where you want to extract the Atom folder.
 4. Launch Atom using the installed `atom` command from the newly extracted directory.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.50.0-dev",
+  "version": "1.51.0-dev",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/main-process/main.js",
   "repository": {
@@ -137,15 +137,15 @@
     "pathwatcher": "8.1.0",
     "postcss": "5.2.4",
     "postcss-selector-parser": "2.2.1",
-    "prebuild-install": "^5.3.3",
+    "prebuild-install": "5.3.5",
     "property-accessors": "^1.1.3",
     "random-words": "0.0.1",
     "resolve": "1.17.0",
     "scandal": "^3.2.0",
     "scoped-property-store": "^0.17.0",
     "scrollbar-style": "^3.2",
     "season": "^6.0.2",
-    "semver": "^4.3.3",
+    "semver": "7.3.2",
     "service-hub": "^0.7.4",
     "settings-view": "https://www.atom.io/api/packages/settings-view/versions/0.261.4/tarball",
     "sinon": "1.17.4",

script/lib/create-debian-package.js

@@ -54,11 +54,6 @@ module.exports = function(packagedAppPath) {
     debianPackageShareDirPath,
     'pixmaps'
   );
-  const debianPackageLintianOverridesDirPath = path.join(
-    debianPackageShareDirPath,
-    'lintian',
-    'overrides'
-  );
   const debianPackageDocsDirPath = path.join(
     debianPackageShareDirPath,
     'doc',
@@ -93,7 +88,6 @@ module.exports = function(packagedAppPath) {
   fs.mkdirpSync(debianPackageShareDirPath);
   fs.mkdirpSync(debianPackageApplicationsDirPath);
   fs.mkdirpSync(debianPackageIconsDirPath);
-  fs.mkdirpSync(debianPackageLintianOverridesDirPath);
   fs.mkdirpSync(debianPackageDocsDirPath);
   fs.mkdirpSync(debianPackageBinDirPath);
 
@@ -192,20 +186,6 @@ module.exports = function(packagedAppPath) {
     path.join(debianPackageDocsDirPath, 'copyright')
   );
 
-  console.log(
-    `Copying lintian overrides into "${debianPackageLintianOverridesDirPath}"`
-  );
-  fs.copySync(
-    path.join(
-      CONFIG.repositoryRootPath,
-      'resources',
-      'linux',
-      'debian',
-      'lintian-overrides'
-    ),
-    path.join(debianPackageLintianOverridesDirPath, atomExecutableName)
-  );
-
   console.log(
     `Copying polkit configuration into "${debianPackageShareDirPath}"`
   );