Release 2.1.2

- Adjust release procedure - Fix Issue 60 in Bugs.md (Thanks to Tom Greig) - Fix Issue 61 in Bugs.md
project-repo · Apr 24, 2023 · 9a4c07d · 9a4c07d
1 parent bea18c7
commit 9a4c07d
Show file tree

Hide file tree

Showing 29 changed files with 74 additions and 56 deletions.
diff --git a/Bugs.md b/Bugs.md
@@ -1170,3 +1170,20 @@ leading to a termination of cagebreak.
   * Fixed: 2.1.0
 
 Prior to release 2.1.0 `meson install` did not work perfectly.
+
+## Issue 60
+
+  * github issue number: N/A
+  * Fixed: 2.1.2
+
+In the `merge_output_configs` function, when copying the properties of
+one config to another, the `angles` element of an input structure was
+being copied to the `status` element of the resultant structure.
+
+## Issue 61
+
+  * github issue number: N/A
+  * Fixed: 2.1.2
+
+The script introduced with 2.1.1 `scripts/install-development-environment` had some
+missing dependencies. This has been resolved and tested with bare arch containers.
diff --git a/Hashes.md b/Hashes.md
@@ -1,5 +1,25 @@
 # Hashes
 
+2.1.2 cagebreak
+
+  * sha 256: 7d07864a837ee577a52b2727bfbfe8834fe599712144f0685f458d508717e451
+  * sha 512: 9429bace89affdd9f7e83f48168c1e119d1531a5eb9a320299924e469c0e43052e93580aee6ba5f4c2b878e5b85ec5fc4cf172940cb4c1d950329c175898b647
+
+2.1.2 cagebreak.1
+
+  * sha 256: aec69b06cc8dd4328027a04a12847c91b6a176537cce7a6c2d68a4f004cdd47c
+  * sha 512: 1d6e882a1fa8bec84df189cd32a1ac8953fb61d0241b04296ecb8caadfc55733947037b3810ba28b73e2a32bc30dfd68794dd173220e1f8af8ba9d3d02abe19e
+
+2.1.2 cagebreak-config.5
+
+  * sha 256: 36e11b9d4437485a9671e72b3f6cc5669fb6a5b67b60198ee310efd6f3f3b093
+  * sha 512: 8378924d81c2c35ddfeace15debafb0407fbbe76513f7a488815a1421ff1c49d7aa7f21812573043004a8fd4e481242fd6970be270fac8007771623ed8d92208
+
+2.1.2 cagebreak-socket.7
+
+  * sha 256: 346f8e203210a1542ca31980628095dbfb267764e3c2228457dc5b0b43850fda
+  * sha 512: 84e40072c71a38449ec6a5409445458405009010ee47d3e26ba13f6fd13f0291e1c3b38f5e84ba5521b14955bd97ab6d1c636b72a093b6322d0879f98218ab7f
+
 2.1.1 cagebreak
 
   * sha 256: 8632e7e49637e5a3e7ab425a05fbd63d71cf6025143c89d196f309dbf4efdd57

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Cagebreak: A Wayland Tiling Compositor
 
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6532/badge)](https://bestpractices.coreinfrastructure.org/projects/6532) [![Packaging status](https://repology.org/badge/tiny-repos/cagebreak.svg)](https://repology.org/project/cagebreak/versions) [![AUR package](https://repology.org/badge/version-for-repo/aur/cagebreak.svg?minversion=2.1.1)](https://repology.org/project/cagebreak/versions)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6532/badge)](https://bestpractices.coreinfrastructure.org/projects/6532) [![Packaging status](https://repology.org/badge/tiny-repos/cagebreak.svg)](https://repology.org/project/cagebreak/versions) [![AUR package](https://repology.org/badge/version-for-repo/aur/cagebreak.svg?minversion=2.1.2)](https://repology.org/project/cagebreak/versions)
 
 ## Quick Introduction
 
@@ -633,14 +633,17 @@ The release procedure outlines the process for a release to occur.
       * [ ] Synchronize any socket changes to cagebreak-socket man page
     * [ ] Document fixed bugs in Bugs.md
       * [ ] Include issue discussion from github, where applicable
+  * [ ] `meson compile adjust-epoch -C build`
   * [ ] Commit changes
   * [ ] `git push origin development`
   * [ ] Testing
     * [ ] Manual testing
     * [ ] `meson compile fuzz -C build` for at least one hour
+  * [ ] Adjust Hashes.md - Use `meson compile output-hashes -C build` to add Hashes or aid in repro check
+  * [ ] Commit changes
+  * [ ] `git push origin development`
   * [ ] Complete release-non-auto-checks
-    * [ ] Use `meson compile output-hashes -C build` to add Hashes or aid in repro check
-  * [ ] `meson compile create-signatures -C build`
+  * [ ] `meson compile create-sigs -C build`
   * [ ] Commit and push signatures, hashes and non-auto-check files
   * [ ] `meson test -C build` passes everything except some release tests
   * [ ] `git add` relevant files
@@ -660,6 +663,7 @@ The release procedure outlines the process for a release to occur.
   * [ ] `git merge master`
   * [ ] `git push --tags origin hotfix`
   * [ ] Upload archives and signatures as release assets
+  * [ ] Delete feature branches if appropriate
   * [ ] Manage package release
 
 ## Roadmap
@@ -743,6 +747,8 @@ see [SECURITY.md](SECURITY.md).
   * Oliver Friedmann
     * [Add output scaling](https://github.com/project-repo/cagebreak/pull/34), released
       in 2.0.0 with slight modifications
+  * Tom Greig
+    * Fix bug in merge_output_configs in 2.1.2
 
 ## License
 

diff --git a/example_scripts/focus_follows_cursor.sh b/example_scripts/focus_follows_cursor.sh
diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md
@@ -1,4 +1,4 @@
-cagebreak-config(5) "VERSION 2.1.1" "Cagebreak Manual"
+cagebreak-config(5) "Version 2.1.2" "Cagebreak Manual"
 
 # NAME
 

diff --git a/man/cagebreak-socket.7.md b/man/cagebreak-socket.7.md
@@ -1,4 +1,4 @@
-cagebreak-socket(7) "VERSION 2.1.1" "Cagebreak Manual"
+cagebreak-socket(7) "Version 2.1.2" "Cagebreak Manual"
 
 # NAME
 

diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md
@@ -1,4 +1,4 @@
-cagebreak(1) "VERSION 2.1.1" "Cagebreak Manual"
+cagebreak(1) "Version 2.1.2" "Cagebreak Manual"
 
 # NAME
 

diff --git a/meson.build b/meson.build
@@ -3,7 +3,7 @@
 project(
   'cagebreak',
   'c',
-version : '2.1.1',
+version : '2.1.2',
 license : 'MIT',
 default_options : ['c_std=c11', 'warning_level=3']
 )
@@ -260,7 +260,7 @@ install_data('LICENSE', install_dir : '/usr/share/licenses/' + meson.project_nam
 
 if get_option('man-pages')
   scdoc = find_program('scdoc')
-  secssinceepoch = 1681758922
+  secssinceepoch = 1682363199
   shcommand = 'export SOURCE_DATE_EPOCH=' + secssinceepoch.to_string() + ' ; @0@ < @INPUT@'.format(scdoc.path())
   sh = find_program('sh')
   mandir1 = join_paths(get_option('mandir'), 'man1')

diff --git a/output.c b/output.c
@@ -399,7 +399,7 @@ merge_output_configs(struct cg_output_config *cfg1,
 		out_cfg->scale = cfg1->scale;
 	}
 	if(cfg1->angle == out_cfg->angle) {
-		out_cfg->status = cfg2->angle;
+		out_cfg->angle = cfg2->angle;
 	} else {
 		out_cfg->angle = cfg1->angle;
 	}

diff --git a/release-non-auto-checks/Bugs.md b/release-non-auto-checks/Bugs.md
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/FAQ.md b/release-non-auto-checks/FAQ.md
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/SECURITY.md b/release-non-auto-checks/SECURITY.md
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/WLR_XDG_VERSION b/release-non-auto-checks/WLR_XDG_VERSION
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/changelog-major-minor b/release-non-auto-checks/changelog-major-minor
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/internal-wiki b/release-non-auto-checks/internal-wiki
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/meson-epoch b/release-non-auto-checks/meson-epoch
diff --git a/release-non-auto-checks/release-note b/release-non-auto-checks/release-note
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/reproducibility-checked b/release-non-auto-checks/reproducibility-checked
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/release-non-auto-checks/security-to-man-page-info-transfer b/release-non-auto-checks/security-to-man-page-info-transfer
@@ -1,2 +1,2 @@
-2.1.1
-2023-04-17
+2.1.2
+2023-04-24
diff --git a/scripts/install-development-environment b/scripts/install-development-environment
@@ -2,7 +2,7 @@
 # Copyright 2023, project-repo and the cagebreak contributors
 # SPDX-License-Identifier: MIT
 
-sudo pacman -Syu --noconfirm git grep sed xev meson ninja clang gcc shellcheck jq openbsd-netcat gnupg binutils alacritty wlroots wayland libxkbcommon cairo pango fontconfig libinput libevdev systemd-libs # systemd-libs is included because of libudev
+sudo pacman -Syu --noconfirm git grep sed xorg-xev meson ninja clang gcc shellcheck jq openbsd-netcat gnupg binutils alacritty wlroots wayland wayland-protocols libxkbcommon cairo pango fontconfig libinput libevdev pkgconf scdoc systemd-libs # systemd-libs is included because of libudev
 
 if [[ -n ${MESON_SOURCE_ROOT} ]]
 then

diff --git a/scripts/set-version b/scripts/set-version
@@ -15,6 +15,6 @@ version="${1}"
 sed -i -e "s/minversion\=[0-9]*\.[0-9]*.[0-9]*/minversion=$version/" README.md
 
 
-sed -i -e "s/Version [0-9]*\.[0-9]*.[0-9]*/VERSION $version/" man/cagebreak.1.md
-sed -i -e "s/Version [0-9]*\.[0-9]*.[0-9]*/VERSION $version/" man/cagebreak-config.5.md
-sed -i -e "s/Version [0-9]*\.[0-9]*.[0-9]*/VERSION $version/" man/cagebreak-socket.7.md
+sed -i -e "s/Version [0-9]*\.[0-9]*.[0-9]*/Version $version/" man/cagebreak.1.md
+sed -i -e "s/Version [0-9]*\.[0-9]*.[0-9]*/Version $version/" man/cagebreak-config.5.md
+sed -i -e "s/Version [0-9]*\.[0-9]*.[0-9]*/Version $version/" man/cagebreak-socket.7.md
diff --git a/signatures/2.1.1-cagebreak-config.5.sig b/signatures/2.1.1-cagebreak-config.5.sig
diff --git a/signatures/2.1.1-cagebreak-socket.7.sig b/signatures/2.1.1-cagebreak-socket.7.sig
diff --git a/signatures/2.1.1-cagebreak.1.sig b/signatures/2.1.1-cagebreak.1.sig
diff --git a/signatures/2.1.1-cagebreak.sig b/signatures/2.1.1-cagebreak.sig
diff --git a/signatures/cagebreak-config.5.sig b/signatures/cagebreak-config.5.sig
diff --git a/signatures/cagebreak-socket.7.sig b/signatures/cagebreak-socket.7.sig
diff --git a/signatures/cagebreak.1.sig b/signatures/cagebreak.1.sig
diff --git a/signatures/cagebreak.sig b/signatures/cagebreak.sig
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
-.1.1
--04-17
+.1.2
+-04-24