fix workflow

v0.12.0 - new upstream release

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [barnumbirr]

.github/workflows/main.yml

@@ -1,53 +1,46 @@
-name: Build alacritty Debian packages
+name: Build and release packages
 
 on:
  push:
   tags:
-    - "*"
+    - '*'
+
+env:
+  DEBIAN_STABLE: bullseye
+  PKG_NAME: alacritty
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
+    # Continue running on Ubuntu 20.04 because I can't be bothered to fix
+    # the whole rename.ul drama.
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926637
+    # rename.ul was added back to Debian Testing so it should be back for Ubuntu
+    # 24.04
+    # https://manpages.debian.org/testing/util-linux/rename.ul.1.en.html
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v2
+
       - name: Build packages
         run: |
           set -xe
           mkdir -p assets
-          ./build.sh -i debian:buster-slim
-          rename.ul .deb _debian_buster.deb target/alacritty_*.deb
-          mv -n target/alacritty_*.deb assets/
+          ./build.sh -i debian:${{ env.DEBIAN_STABLE }}-slim
+          rename.ul .deb _${{ env.DEBIAN_STABLE }}.deb target/${{ env.PKG_NAME }}_*.deb
+          mv -n target/${{ env.PKG_NAME }}_*.deb assets/
 
           ./build.sh -i debian:testing-slim
-          rename.ul .deb _debian_testing.deb target/alacritty_*.deb
-          mv -n target/alacritty_*.deb assets/
+          rename.ul .deb _testing.deb target/${{ env.PKG_NAME }}_*.deb
+          mv -n target/${{ env.PKG_NAME }}_*.deb assets/
 
           ./build.sh -i debian:unstable-slim
-          rename.ul .deb _debian_unstable.deb target/alacritty_*.deb
-          mv -n target/alacritty_*.deb assets/
-      - name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          rename.ul .deb _unstable.deb target/${{ env.PKG_NAME }}_*.deb
+          mv -n target/${{ env.PKG_NAME }}_*.deb assets/
+
+      - name: Build packages
+        uses: "marvinpinto/action-automatic-releases@v1.2.1"
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: false
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
           prerelease: false
-      - name: Upload packages
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ID: ${{ steps.create_release.outputs.id }}
-        run: |
-          set -xe
-          for asset in assets/*
-          do
-            UPLOAD_URL="https://uploads.github.com/repos/$GITHUB_REPOSITORY/releases/$ID/assets"
-            curl                                          \
-              -X POST                                     \
-              -H "Authorization: token $GITHUB_TOKEN"     \
-              -H "Content-Type: application/octet-stream" \
-              --data-binary @"$asset"                     \
-              "${UPLOAD_URL}?name=$(basename $asset)"
-          done
+          files: assets/*.deb

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2020-2021 Martin Simon
+Copyright 2020-2022 Martin Simon
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -9,7 +9,7 @@ If you have [Docker](https://www.docker.com/) installed locally, just run the fo
 ```bash
 user@hostname$ ./build.sh
 ```
-By default this will build alacritty v0.6.0 on Debian Buster.
+By default this will build alacritty v0.12.0 on Debian Bullseye.
 
 If you want to customize the build at runtime, use the following:
 
@@ -28,7 +28,7 @@ To publish a new package version to Github, follow these steps:
 ## License
 
 ```
-Copyright 2020-2021 Martin Simon
+Copyright 2020-2022 Martin Simon
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -44,6 +44,17 @@ limitations under the License.
 
 ```
 
+## Buy me a coffee?
+
+If you feel like buying me a coffee (or a beer?), donations are welcome:
+
+```
+BTC : bc1qq04jnuqqavpccfptmddqjkg7cuspy3new4sxq9
+DOGE: DRBkryyau5CMxpBzVmrBAjK6dVdMZSBsuS
+ETH : 0x2238A11856428b72E80D70Be8666729497059d95
+LTC : MQwXsBrArLRHQzwQZAjJPNrxGS1uNDDKX6
+```
+
 ## References
 
 * [ayosec/polybar-debian](https://github.com/ayosec/polybar-debian)

build.sh

@@ -2,9 +2,9 @@
 
 set -eu
 
-IMAGE="debian:buster-slim"
+IMAGE="debian:bullseye-slim"
 TARGET="$(dirname "$0" | xargs realpath)"
-VERSION="v0.7.0-rc1"
+VERSION="v0.12.0"
 
 while getopts "v:i:h" opt
 do

debian/changelog

@@ -1,3 +1,197 @@
+alacritty (0.12.0) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Thu, 25 Apr 2023 00:00:00 +0000
+
+alacritty (0.11.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Thu, 13 Oct 2022 00:00:00 +0000
+
+alacritty (0.11.0-rc3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 10 Oct 2022 00:00:00 +0000
+
+alacritty (0.11.0-rc2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Sun, 17 Sep 2022 00:00:00 +0000
+
+alacritty (0.11.0-rc1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Sun, 11 Sep 2022 00:00:00 +0000
+
+alacritty (0.10.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 21 Feb 2022 00:00:00 +0000
+
+alacritty (0.10.1-rc1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Thu, 10 Feb 2022 00:00:00 +0000
+
+alacritty (0.10.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Sun, 23 Jan 2022 00:00:00 +0000
+
+alacritty (0.10.0-rc4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Thu, 13 Jan 2022 00:00:00 +0000
+
+alacritty (0.10.0-rc3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Thu, 13 Jan 2022 00:00:00 +0000
+
+alacritty (0.10.0-rc2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Sat, 08 Jan 2022 00:00:00 +0000
+
+alacritty (0.10.0-rc1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Install `alacritty-msg` man page
+
+ -- Martin Simon <me@martinsimon.me>  Tue, 03 Aug 2021 00:00:00 +0000
+
+alacritty (0.9.0-2) unstable; urgency=medium
+
+  * Bullseye is now stable
+  * Update debhelper
+  * Improve Debian version and package name handling in Github Action
+
+ -- Martin Simon <me@martinsimon.me>  Tue, 03 Aug 2021 00:00:00 +0000
+
+alacritty (0.9.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove manual terminfo file installation
+  * Added `ncurses-term` to recommended package list
+
+ -- Martin Simon <me@martinsimon.me>  Tue, 03 Aug 2021 00:00:00 +0000
+
+alacritty (0.9.0-rc5-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 02 Aug 2021 00:00:00 +0000
+
+alacritty (0.9.0-rc4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 02 Aug 2021 00:00:00 +0000
+
+alacritty (0.9.0-rc3-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Sat, 24 Jul 2021 00:00:00 +0000
+
+alacritty (0.9.0-rc2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 19 Jul 2021 00:00:00 +0000
+
+alacritty (0.9.0-rc1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Add new `libxkbcommon-dev` dependency
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 19 Jul 2021 00:00:00 +0000
+
+alacritty (0.8.0-4) unstable; urgency=medium
+
+  * Fix Alacritty terminfo file compilation
+
+ -- Martin Simon <me@martinsimon.me>  Fri, 25 Jun 2021 00:00:00 +0000
+
+alacritty (0.8.0-3) unstable; urgency=medium
+
+  * Fix Alacritty terminfo file extension
+  * Fix postinstall man
+
+ -- Martin Simon <me@martinsimon.me>  Wed, 19 May 2021 00:00:00 +0000
+
+alacritty (0.8.0-2) unstable; urgency=medium
+
+  * Fix Alacritty terminfo file installation
+
+ -- Martin Simon <me@martinsimon.me>  Wed, 19 May 2021 00:00:00 +0000
+
+alacritty (0.8.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Install Alacritty terminfo file (Closes: #3)
+
+ -- Martin Simon <me@martinsimon.me>  Wed, 19 May 2021 00:00:00 +0000
+
+alacritty (0.7.2-2) unstable; urgency=medium
+
+  * Remove xclip dependency (Closes: #2)
+
+ -- Martin Simon <me@martinsimon.me>  Sun, 14 Mar 2021 00:00:00 +0000
+
+alacritty (0.7.2-1) unstable; urgency=medium
+
+  * Version 0.7.2
+
+ -- Martin Simon <me@martinsimon.me>  Sat, 20 Feb 2021 00:00:00 +0000
+
+alacritty (0.7.2-rc2-1) unstable; urgency=medium
+
+  * Version 0.7.2-rc2
+
+ -- Martin Simon <me@martinsimon.me>  Wed, 17 Feb 2021 00:00:00 +0000
+
+alacritty (0.7.2-rc1-1) unstable; urgency=medium
+
+  * Version 0.7.2-rc1
+
+ -- Martin Simon <me@martinsimon.me>  Mon, 15 Feb 2021 00:00:00 +0000
+
+alacritty (0.7.1-1) unstable; urgency=medium
+
+  * Version 0.7.1
+
+ -- Martin Simon <me@martinsimon.me>  Sat, 09 Jan 2021 00:00:00 +0000
+
+alacritty (0.7.1-rc1-1) unstable; urgency=medium
+
+  * Version 0.7.1-rc1
+
+ -- Martin Simon <me@martinsimon.me>  Sat, 09 Jan 2021 00:00:00 +0000
+
+alacritty (0.7.0-1) unstable; urgency=medium
+
+  * Version 0.7.0
+
+ -- Martin Simon <me@martinsimon.me>  Fri, 08 Jan 2021 00:00:00 +0000
+
+alacritty (0.7.0-rc2-1) unstable; urgency=medium
+
+  * Version 0.7.0-rc2
+
+ -- Martin Simon <me@martinsimon.me>  Thu, 07 Jan 2021 00:00:00 +0000
+
 alacritty (0.7.0-rc1-1) unstable; urgency=medium
 
   * Version 0.7.0-rc1
@@ -46,7 +240,7 @@ alacritty (0.4.3-1) unstable; urgency=medium
 
  -- Martin Simon <me@martinsimon.me>  Wed, 03 Jun 2020 00:00:00 +0000
 
- alacritty (0.4.2-2) unstable; urgency=medium
+alacritty (0.4.2-2) unstable; urgency=medium
 
   * Version 0.4.2
   * add default package config file to examples

debian/compat

@@ -1 +1 @@
-11
+12

debian/control

@@ -4,17 +4,17 @@ Priority: optional
 Maintainer: Martin Simon <me@martinsimon.me>
 Build-Depends:
  cargo:native,
- debhelper (>= 11),
- help2man,
+ debhelper (>= 12),
  libfreetype6-dev,
  libfontconfig1-dev,
  libxcb1-dev,
  libxcb-render0-dev,
  libxcb-shape0-dev,
  libxcb-xfixes0-dev,
+ libxkbcommon-dev,
  rustc:native,
  python3,
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Homepage: https://github.com/alacritty/alacritty
 
 Package: alacritty
@@ -22,8 +22,7 @@ Architecture: amd64
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Recommends:
- xclip
+Recommends: ncurses-term
 Provides:
  x-terminal-emulator
 Description: GPU-accelerated terminal emulator

debian/copyright

@@ -7,7 +7,7 @@ Copyright: 2016 Joe Wilm, The Alacritty Project Contributors
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2020-2021 Martin Simon <me@martinsimon.me>
+Copyright: 2020-2022 Martin Simon <me@martinsimon.me>
 License: Apache-2.0
 
 License: Apache-2.0

debian/postinst

@@ -1,6 +1,7 @@
 #!/bin/sh
+
 set -e
 
-update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/alacritty 20 \
-  --slave /usr/share/man/man1/x-terminal-emulator.1.gz x-terminal-emulator.1.gz /usr/local/share/man/man1/alacritty.1.gz
-
+update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator \
+  /usr/bin/alacritty 20 --slave /usr/share/man/man1/x-terminal-emulator.1.gz \
+  x-terminal-emulator.1.gz /usr/share/man/man1/alacritty.1.gz

debian/prerm

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -e
 
 update-alternatives --remove x-terminal-emulator /usr/bin/alacritty

debian/rules

@@ -10,15 +10,16 @@ override_dh_auto_build:
 	cargo build --release
 
 override_dh_auto_install:
-	mkdir -p debian/alacritty/usr/share/man/man1/
-	help2man "target/release/alacritty" | gzip > "debian/alacritty/usr/share/man/man1/alacritty.1.gz"
+	mkdir -p debian/alacritty/usr/share/man/man1
+	gzip -c "extra/alacritty.man" | tee "debian/alacritty/usr/share/man/man1/alacritty.1.gz" > /dev/null
+	gzip -c "extra/alacritty-msg.man" | tee "debian/alacritty/usr/share/man/man1/alacritty-msg.1.gz" > /dev/null
 	install -Dm04755 "target/release/alacritty" "debian/alacritty/usr/bin/alacritty"
 	install -Dm0644 "extra/completions/alacritty.bash" "debian/alacritty/usr/share/bash-completion/completions/alacritty"
 	install -Dm0644 "extra/completions/alacritty.fish" "debian/alacritty/usr/share/fish/completions/alacritty.fish"
 	install -Dm0644 "extra/completions/_alacritty" "debian/alacritty/usr/share/vendor-completions/_alacritty"
-	install -Dm0644 "extra/logo/alacritty-term.svg" "debian/alacritty/usr/share/pixmaps/com.alacritty.Alacritty.svg"
-	install -Dm0644 "extra/linux/Alacritty.desktop" "debian/alacritty/usr/share/applications/com.alacritty.Alacritty.desktop"
-	sed -i 's/Icon=Alacritty/Icon=com.alacritty.Alacritty/g' "debian/alacritty/usr/share/applications/com.alacritty.Alacritty.desktop"
+	install -Dm0644 "extra/logo/alacritty-term.svg" "debian/alacritty/usr/share/pixmaps/org.alacritty.Alacritty.svg"
+	install -Dm0644 "extra/linux/Alacritty.desktop" "debian/alacritty/usr/share/applications/org.alacritty.Alacritty.desktop"
+	sed -i 's/Icon=Alacritty/Icon=org.alacritty.Alacritty/g' "debian/alacritty/usr/share/applications/org.alacritty.Alacritty.desktop"
 
 override_dh_installexamples:
 	dh_installexamples "alacritty.yml"

entrypoint.sh

@@ -12,7 +12,7 @@ export DEBIAN_FRONTEND DEB_BUILD_OPTIONS
 
 dependencies() {
     apt update && apt install -y devscripts equivs git
-    if [ "$OS_VERSION" = 10 ]; then
+    if [ "$OS_VERSION" = 11 ]; then
         apt install -y curl
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
         . ~/.cargo/env