diff --git a/.gitignore b/.gitignore index 64e3e49..900ab65 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ config.log config.status PKGBUILD *.deb +*.zst diff --git a/admin/Dockerfile-arch b/admin/Dockerfile-arch index 0017295..c38d530 100644 --- a/admin/Dockerfile-arch +++ b/admin/Dockerfile-arch @@ -12,9 +12,14 @@ RUN pacman --noconfirm -Syu && \ # Thanks to https://github.com/lxqt/lxqt-panel/pull/1562 RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \ curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \ - bsdtar -C / -xvf "$patched_glibc" + bsdtar -C / -xvf "$patched_glibc" -RUN pacman --noconfirm -S man-db man-pages vim base-devel gdb rust cargo && \ +# Get the mirrorlist up-to-date +RUN pacman rsync --noconfirm -S reflector rsync && reflector --latest 16 --protocol https --sort rate --save /etc/pacman.d/mirrorlist + +# TODO(sp1ff): WTF? See here https://bbs.archlinux.org/viewtopic.php?id=141029 +# RUN pacman --noconfirm -S man-db man-pages texinfo vim base-devel gdb && \ +RUN pacman --noconfirm -Syyu man-db man-pages texinfo vim base-devel gdb rust cargo && \ ln -sf /usr/share/zoneinfo/America/Los_Angeles /etc/localtime && \ useradd -ms /bin/bash -G users,wheel mgh && \ echo 'mgh:mgh' | chpasswd && \ @@ -28,8 +33,10 @@ RUN pacman --noconfirm -S man-db man-pages vim base-devel gdb rust cargo && \ USER mgh +# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust.sh && chmod 755 ./rust.sh && ./rust.sh -y + ENV PATH="/home/mgh/.cargo/bin:${PATH}" -RUN cargo install cargo-aur && \ - cargo install cargo-arch +# RUN cargo install cargo-aur && \ +# cargo install cargo-arch diff --git a/admin/Dockerfile-debian b/admin/Dockerfile-debian index a1b6ccd..d2dcea1 100644 --- a/admin/Dockerfile-debian +++ b/admin/Dockerfile-debian @@ -8,7 +8,7 @@ RUN set -ex && \ apt-get update && \ apt-get install -y --no-install-recommends \ # mpdpopm pre-requisistes \ - rustc cargo locales \ + rustc cargo locales texinfo \ # for my sanity \ less procps gdb sudo info vim && \ # tidy-up \ diff --git a/admin/deb-maintainer-scripts/postinst b/admin/deb-maintainer-scripts/postinst new file mode 100755 index 0000000..0743c2a --- /dev/null +++ b/admin/deb-maintainer-scripts/postinst @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +if [ "configure" != "$1" ]; then + echo "mpdpopm postinst invoked with ``$1'' as command-- bailing!" + exit 0 +fi +if ! test -x /usr/bin/install-info; then + echo "mpdpopm postinst can't find install-info-- bailing!" + exit 0 +fi +/usr/bin/install-info --info-dir=/usr/local/share/info /usr/local/share/info/mpdpopm.info diff --git a/admin/deb-maintainer-scripts/prerm b/admin/deb-maintainer-scripts/prerm new file mode 100755 index 0000000..8654e8f --- /dev/null +++ b/admin/deb-maintainer-scripts/prerm @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +if ! test -x /usr/bin/install-info; then + echo "mpdpopm prerm can't find install-info-- bailing!" + exit 0 +fi +/usr/bin/install-info --delete --info-dir=/usr/local/share/info /usr/local/share/info/mpdpopm.info diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..1f453a4 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,2 @@ +mpdpopm.info +stamp-vti diff --git a/doc/version.texi b/doc/version.texi index 6c9134f..50270e4 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 28 March 2021 +@set UPDATED 29 March 2021 @set UPDATED-MONTH March 2021 @set EDITION 0.2.3 @set VERSION 0.2.3 diff --git a/mpdpopm/Cargo.toml.in b/mpdpopm/Cargo.toml.in index 3f5effb..1b3564c 100644 --- a/mpdpopm/Cargo.toml.in +++ b/mpdpopm/Cargo.toml.in @@ -54,11 +54,13 @@ priority = "optional" # that it only needs 2.28-10 (and possibly much older). I'm going to # roll the dice & just specify no version. depends = "libc6" +maintainer-scripts = "../admin/deb-maintainer-scripts" assets = [ ["target/release/mppopm", "usr/local/bin/", "755"], ["target/release/mppopmd", "usr/local/bin/", "755"], ["README.md", "usr/local/share/doc/mpdpopm/README", "644"], - ["mppopmd.conf", "/usr/local/share/doc/mpdpopm/examples/mppopmd.conf", "644"], - ["mppopmd.service", "/usr/local/lib/systemd/user/mppopmd.service", "644"], - ["mppopmd.service", "/usr/local/lib/systemd/system/mppopmd.service", "644"], + ["mppopmd.conf", "usr/local/share/doc/mpdpopm/examples/mppopmd.conf", "644"], + ["mppopmd.service", "usr/local/lib/systemd/user/mppopmd.service", "644"], + ["mppopmd.service", "usr/local/lib/systemd/system/mppopmd.service", "644"], + ["../doc/mpdpopm.info", "usr/local/share/info/", "644"], ]