Skip to content

[pull] master from atom:master #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 10 commits into from
May 21, 2021
Merged

[pull] master from atom:master #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a7bb929
update required libs
mfonville Mar 8, 2021
2905cdb
Update readme install libraries instructions for manual atom install …
mfonville May 18, 2021
6f6c14f
Add libgbm1
mfonville May 20, 2021
e90429a
:arrow_up: Bump atom-select-list@0.8.1
sadick254 May 21, 2021
8722495
Merge pull request #22015 from mfonville/fixdebiandeps
sadick254 May 21, 2021
fb338da
Enable default editor keymaps for editors located outside atom-workspace
Nov 16, 2017
f4c48f2
Merge pull request #22463 from atom/bump-atom-select-list@0.8.1
sadick254 May 21, 2021
b9dee19
Add libasound2 and libgbm1, remove python notice
mfonville May 21, 2021
ede1f91
Merge pull request #16206 from atom/as-enable-editor-keymaps-outside-…
sadick254 May 21, 2021
e940971
Merge pull request #22448 from mfonville/fixdependencies-readme
sadick254 May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ 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 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.)
1. Install dependencies (on Ubuntu): `sudo apt install git libasound2, libcurl4, libgbm1, libgcrypt20, libgtk-3-0, libnotify4, libnss3, libglib2.0-bin, xdg-utils, libx11-xcb1, libxcb-dri3-0, libxss1, libxtst6, libxkbfile1`
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.
Expand Down
2 changes: 1 addition & 1 deletion keymaps/linux.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
'alt-8': 'pane:show-item-8'
'alt-9': 'pane:show-item-9'

'atom-workspace atom-text-editor':
'atom-text-editor':
# Platform Bindings
'ctrl-left': 'editor:move-to-beginning-of-word'
'ctrl-right': 'editor:move-to-end-of-word'
Expand Down
2 changes: 1 addition & 1 deletion keymaps/win32.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
'alt-8': 'pane:show-item-8'
'alt-9': 'pane:show-item-9'

'atom-workspace atom-text-editor':
'atom-text-editor':
# Platform Bindings
'ctrl-left': 'editor:move-to-beginning-of-word'
'ctrl-right': 'editor:move-to-end-of-word'
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"atom-keymap": "8.2.14",
"atom-light-syntax": "file:packages/atom-light-syntax",
"atom-light-ui": "file:packages/atom-light-ui",
"atom-select-list": "0.8.0",
"atom-select-list": "^0.8.1",
"autocomplete-atom-api": "https://www.atom.io/api/packages/autocomplete-atom-api/versions/0.10.7/tarball",
"autocomplete-css": "https://www.atom.io/api/packages/autocomplete-css/versions/0.17.5/tarball",
"autocomplete-html": "https://www.atom.io/api/packages/autocomplete-html/versions/0.8.8/tarball",
Expand Down
4 changes: 2 additions & 2 deletions resources/linux/debian/control.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: <%= appFileName %>
Version: <%= version %>
Depends: git, libgtk-3-0 (>= 3.9.10), libgcrypt20, libnotify4, libxtst6, libnss3 (>= 2:3.22), libglib2.0-bin | kde-cli-tools | kde-runtime, xdg-utils, libx11-xcb1, libxss1, libxkbfile1, libcurl3 | libcurl4
Recommends: libasound2 (>= 1.0.16), policykit-1, libsecret-1-0, gnome-keyring
Depends: git, libgcrypt20, libgtk-3-0 (>= 3.9.10), libnotify4, libnss3 (>= 2:3.22), libglib2.0-bin | kde-cli-tools | kde-runtime, xdg-utils, libasound2 (>= 1.0.16), libgbm1, libx11-xcb1, libxcb-dri3-0, libxss1, libxtst6, libxkbfile1, libcurl3 | libcurl4
Recommends: policykit-1, libsecret-1-0, gnome-keyring
Suggests: lsb-release
Section: devel
Priority: optional
Expand Down