From ee0b9835b8a2a3eaf989655a9128f033e094a66f Mon Sep 17 00:00:00 2001 From: JezerM Date: Tue, 7 Dec 2021 22:22:58 -0600 Subject: [PATCH] Fixed some DEBIAN packaging errors --- build/DEBIAN/control | 11 +++++------ build/DEBIAN/postinst | 2 +- build/utils.sh | 10 +++++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/build/DEBIAN/control b/build/DEBIAN/control index e893870..c888d53 100644 --- a/build/DEBIAN/control +++ b/build/DEBIAN/control @@ -1,5 +1,5 @@ Package: web-greeter -Version: 3.1.0 +Version: 3.1.1 Provides: lightdm-greeter Replaces: lightdm-webkit-greeter Section: x11 @@ -8,9 +8,8 @@ Homepage: https://github.com/JezerM/web-greeter Installed-Size: 402396 Architecture: all Maintainer: JezerM -Depends: liblightdm-gobject-1-0, - liblightdm-gobject-1-dev +Depends: liblightdm-gobject-1-0, liblightdm-gobject-1-dev, python3, python3-gi, python3-qt5, libqt5webengine5 Description: A modern, visually appealing greeter for LightDM. - Web Greeter utilizes themes built with HTML/CSS/JavaScript for it's login screen. Web Greeter - themes provide modern, visually appealing, and feature-rich login screens. Two themes are - included by default. There is also a growing number of 3rd-Party themes available online. + Web Greeter utilizes themes built with HTML/CSS/JavaScript for it's login screen. Web Greeter + themes provide modern, visually appealing, and feature-rich login screens. Two themes are + included by default. There is also a growing number of 3rd-Party themes available online. diff --git a/build/DEBIAN/postinst b/build/DEBIAN/postinst index aa2b7bc..594d29e 100755 --- a/build/DEBIAN/postinst +++ b/build/DEBIAN/postinst @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh # Link to the binary ln -sf '/opt/web-greeter/web-greeter' '/usr/bin/web-greeter' diff --git a/build/utils.sh b/build/utils.sh index da46651..a6b9fbd 100755 --- a/build/utils.sh +++ b/build/utils.sh @@ -63,14 +63,15 @@ init_build_dir() { [[ -e "${BUILD_DIR}/dist" ]] && rm -rf "${BUILD_DIR}/dist" rsync -a "${REPO_DIR}/web-greeter" "${BUILD_DIR}" --exclude "dist" --exclude "__pycache__" rsync -a "${REPO_DIR}/dist" "${BUILD_DIR}" - cp "${REPO_DIR}/README.md" "${BUILD_DIR}/web-greeter" + cp "${REPO_DIR}/NEWS.md" "${BUILD_DIR}/dist/NEWS.md" + cp "${REPO_DIR}/README.md" "${BUILD_DIR}/web-greeter/" } prepare_install() { cd "${BUILD_DIR}" INSTALL_PREFIX=$(echo ${INSTALL_ROOT}/${PREFIX} | sed -E 's/\/\//\//g') mkdir -p \ - "${INSTALL_PREFIX}"/share/{man/man1,metainfo,web-greeter,xgreeters,applications,zsh/vendor-completions,bash-completion/completions} \ + "${INSTALL_PREFIX}"/share/{man/man1,metainfo,doc/web-greeter,web-greeter,xgreeters,applications,zsh/vendor-completions,bash-completion/completions} \ "${INSTALL_ROOT}"/etc/{lightdm,xdg/lightdm/lightdm.conf.d} \ "${INSTALL_PREFIX}"/bin @@ -80,7 +81,10 @@ prepare_install() { && mv themes/_vendor .) # Man Page - cp "${BUILD_DIR}/dist/${PKGNAME}.1" "${INSTALL_PREFIX}/share/man/man1" + gzip -c9 "${BUILD_DIR}/dist/${PKGNAME}.1" > "${INSTALL_PREFIX}/share/man/man1/${PKGNAME}.1.gz" + + # News + gzip -c9 "${BUILD_DIR}/dist/NEWS.md" > "${INSTALL_PREFIX}/share/doc/web-greeter/NEWS.gz" # Command line completions if [[ -f /usr/bin/bash ]]; then