diff --git a/CHANGELOG.md b/CHANGELOG.md index e2fda8a0..77c7dcbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ The sections should follow the order `Packaging`, `Added`, `Changed`, `Fixed` an The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## 0.6.0-dev +## 0.7.0-dev + +## 0.6.0 ### Packaging diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dcaaface..3a2ecae8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -123,6 +123,7 @@ The exact steps for an exemplary `0.2.0` release might look like this: 1. Initially, the version on the latest master is `0.2.0-dev` 2. A new `v0.2.0` branch is created for the release 3. On master, the version is bumped to `0.3.0-dev` + and the `-dev` suffix is removed from the `0.2.0-dev` changelog 4. In the branch, the version is bumped to `0.2.0-rc1` 5. The new commit in the branch is tagged as `v0.2.0-rc1` 6. A GitHub release is created for the `v0.2.0-rc1` tag @@ -135,7 +136,6 @@ The exact steps for an exemplary `0.2.0` release might look like this: 12. A GitHub release is created for the `v0.2.0` tag 13. The changelog since the last stable release (**not** RC) is added to the GitHub release description - 14. The `-dev` is stripped from the `0.2.0-dev` changelog entries on master On master and with new planned releases, only the minor version is bumped. This makes it possible to create bug fix releases by incrementing the patch version of a previous minor release, without diff --git a/Cargo.lock b/Cargo.lock index 47514c24..74820442 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ [[package]] name = "alacritty" -version = "0.6.0-dev" +version = "0.7.0-dev" dependencies = [ "alacritty_terminal", "clap", @@ -54,7 +54,7 @@ dependencies = [ [[package]] name = "alacritty_terminal" -version = "0.11.0-dev" +version = "0.11.1-dev" dependencies = [ "base64", "bitflags", diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index 7a56f90c..f8049fed 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty" -version = "0.6.0-dev" +version = "0.7.0-dev" authors = ["Christian Duerr ", "Joe Wilm "] license = "Apache-2.0" description = "GPU-accelerated terminal emulator" @@ -10,7 +10,7 @@ edition = "2018" [dependencies.alacritty_terminal] path = "../alacritty_terminal" -version = "0.11.0-dev" +version = "0.11.1-dev" default-features = false [dependencies] diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml index ab0a5b68..330df913 100644 --- a/alacritty_terminal/Cargo.toml +++ b/alacritty_terminal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alacritty_terminal" -version = "0.11.0-dev" +version = "0.11.1-dev" authors = ["Christian Duerr ", "Joe Wilm "] license = "Apache-2.0" description = "Library for writing terminal emulators" diff --git a/extra/alacritty.man b/extra/alacritty.man index 535c161c..9d31dcf6 100644 --- a/extra/alacritty.man +++ b/extra/alacritty.man @@ -1,4 +1,4 @@ -.TH ALACRITTY "1" "August 2018" "alacritty 0.6.0-dev" "User Commands" +.TH ALACRITTY "1" "August 2018" "alacritty 0.7.0-dev" "User Commands" .SH NAME alacritty \- a cross-platform, gpu-accelerated terminal emulator .SH "SYNOPSIS" diff --git a/extra/linux/io.alacritty.Alacritty.appdata.xml b/extra/linux/io.alacritty.Alacritty.appdata.xml index 97feca8f..4588eb67 100644 --- a/extra/linux/io.alacritty.Alacritty.appdata.xml +++ b/extra/linux/io.alacritty.Alacritty.appdata.xml @@ -28,7 +28,7 @@ However, it does allow configuration of many aspects of the terminal.

https://github.com/alacritty/alacritty https://github.com/alacritty/alacritty/issues - + https://github.com/alacritty/alacritty/blob/master/CONTRIBUTING.md#contact Joe Wilm diff --git a/extra/linux/redhat/alacritty.spec b/extra/linux/redhat/alacritty.spec index 4b907620..b3cdaf97 100644 --- a/extra/linux/redhat/alacritty.spec +++ b/extra/linux/redhat/alacritty.spec @@ -1,5 +1,5 @@ Name: alacritty -Version: 0.6.0-dev +Version: 0.7.0-dev Release: 1%{?dist} Summary: A cross-platform, GPU enhanced terminal emulator License: ASL 2.0 @@ -12,9 +12,9 @@ BuildRequires: cargo BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: python3 -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: libxcb-devel +BuildRequires: freetype-devel +BuildRequires: fontconfig-devel +BuildRequires: libxcb-devel BuildRequires: desktop-file-utils BuildRequires: ncurses diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist index 50626dcc..19432c58 100644 --- a/extra/osx/Alacritty.app/Contents/Info.plist +++ b/extra/osx/Alacritty.app/Contents/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.0-dev + 0.7.0-dev CFBundleSupportedPlatforms MacOSX diff --git a/extra/windows/wix/alacritty.wxs b/extra/windows/wix/alacritty.wxs index ad90179a..342e82b1 100644 --- a/extra/windows/wix/alacritty.wxs +++ b/extra/windows/wix/alacritty.wxs @@ -1,6 +1,6 @@ - +