From c5edf5ea484ed241f4dfa326d596a56b76beb0bc Mon Sep 17 00:00:00 2001 From: Nathan13888 <29968201+Nathan13888@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:24:22 -0500 Subject: [PATCH 1/2] update packaging version and instructions Signed-off-by: Nathan13888 <29968201+Nathan13888@users.noreply.github.com> --- .gitignore | 3 +++ PACKAGING.md | 10 +++++++++- VERSION.txt | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 84b1aba..219e84b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # If you update this file, please also update the extend-diff-ignore option # in debian/source/options. +*.key +*.gpg + __pycache__/ /venv/ /dist/ diff --git a/PACKAGING.md b/PACKAGING.md index ce0e452..51cace5 100644 --- a/PACKAGING.md +++ b/PACKAGING.md @@ -16,6 +16,9 @@ Use Docker/Podman to avoid screwing up your main system. For example, to create a package for bullseye (replace `podman` with `docker` in all instances below if you're using Docker): ```sh podman run -it --name pyceo-packaging -v "$PWD":"$PWD":z -w "$PWD" --security-opt="label=disable" debian:bullseye bash +# if disconnected from shell, reconnect with: +podman start pyceo-packaging +podman exec -it pyceo-packaging bash ``` **Important**: Make sure to use a container image for the same distribution which you're packaging. For example, if you're creating a package for bullseye, you should be using the debian:bullseye @@ -26,15 +29,20 @@ Here are some of the prerequisites you'll need to build the deb files ```sh apt update apt install -y devscripts debhelper git-buildpackage vim +apt install -y python3-venv libkrb5-dev libpq-dev libaugeas0 scdoc # dependencies for buildingceo ``` Make sure to also install all of the packages in the 'Build-Depends' section in debian/control. -Update VERSION.txt to the next version, and do a git commit. +Update VERSION.txt to the next version, and do a git commit (or `dpkg-source --commit`). Now run `dch -i` and edit the changelog. Now you will build a signed package. Place your key ID after the `-k` argument, e.g. ```sh +# (pre-requisite) if container doesn't have your gpg key +gpg --import private.key +gpg --list-secret-keys # get key id +# build package gbp buildpackage --git-upstream-branch=master -k8E5568ABB0CF96BC367806ED127923BE10DA48DC --lintian-opts --no-lintian ``` This will create a bunch of files (deb, dsc, tar.gz, etc.) in the parent directory. diff --git a/VERSION.txt b/VERSION.txt index 4c24bf1..475bda9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.0.29 +1.0.30 From b1dac8ce075b04fa38e6fbb2c28ca8c31d39e3d5 Mon Sep 17 00:00:00 2001 From: Nathan13888 <29968201+Nathan13888@users.noreply.github.com> Date: Sun, 4 Feb 2024 14:47:08 -0500 Subject: [PATCH 2/2] 1.0.30: update changelog and package uploaders Signed-off-by: Nathan13888 <29968201+Nathan13888@users.noreply.github.com> --- debian/changelog | 8 ++++++++ debian/control | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 27c14a4..efd3c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ceo (1.0.30-bookworm1) bookworm; urgency=medium + + * Support for new positions + * Improved username validation + * UWLDAP API integration for alumni information + + -- Nathan Sun, 04 Feb 2024 19:38:18 +0000 + ceo (1.0.29-bookworm1) bookworm; urgency=medium * Upgrade dependencies diff --git a/debian/control b/debian/control index 829d10a..17c613c 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Vcs-Git: https://git.csclub.uwaterloo.ca/public/pyceo.git Vcs-Browser: https://git.csclub.uwaterloo.ca/public/pyceo Uploaders: Max Erenberg , Raymond Li , + Nathan , Edwin Build-Depends: debhelper (>= 13), python3-dev (>= 3.9),