diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/do-not-install | 1 | ||||
| -rw-r--r-- | debian/freeipa-helper+devuan.dsc | 2 | ||||
| -rw-r--r-- | debian/freeipa-helper.links | 3 | ||||
| -rw-r--r-- | src/Makefile | 17 |
6 files changed, 19 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index b8c6e75..15b8333 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +freeipa-helper (0.0.3-1+devuan) obs; urgency=medium + + * Do not package systemctl which is now a part of + systemctl-service-shim. + + -- B. Stack <bgstack15@gmail.com> Fri, 11 Jun 2021 15:51:08 -0400 + freeipa-helper (0.0.2-2+devuan) obs; urgency=medium * Provides devuan-sanity-systemctl. diff --git a/debian/control b/debian/control index 9296ee1..e2e3867 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ Package: freeipa-helper Architecture: all Multi-Arch: foreign Suggests: pam-mkhomedir | oddjob-mkhomedir (=0.0.1-1) -Recommends: freeipa-client -Provides: devuan-sanity-systemctl +Recommends: freeipa-client, systemctl-service-shim Depends: ${misc:Depends}, ${shlibs:Depends} Description: makes running ipa-client-install easier Use this set of scripts as part of your ipa client diff --git a/debian/do-not-install b/debian/do-not-install new file mode 100644 index 0000000..7a74006 --- /dev/null +++ b/debian/do-not-install @@ -0,0 +1 @@ +usr/sbin/systemctl diff --git a/debian/freeipa-helper+devuan.dsc b/debian/freeipa-helper+devuan.dsc index 32d461f..8411759 100644 --- a/debian/freeipa-helper+devuan.dsc +++ b/debian/freeipa-helper+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: freeipa-helper Binary: freeipa-helper Architecture: all -Version: 0.0.2-2+devuan +Version: 0.0.3-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://gitlab.com/bgstack15/freeipa-helper Standards-Version: 4.1.4 diff --git a/debian/freeipa-helper.links b/debian/freeipa-helper.links deleted file mode 100644 index 5c2a7b0..0000000 --- a/debian/freeipa-helper.links +++ /dev/null @@ -1,3 +0,0 @@ -/usr/sbin/systemctl /bin/systemctl -/usr/sbin/systemctl /usr/bin/hostnamectl -/usr/sbin/systemctl /usr/bin/systemd-detect-virt diff --git a/src/Makefile b/src/Makefile index a328501..3f4f7b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,6 +5,7 @@ # Title: Makefile for freeipa-helper source package # Purpose: To use traditional Unix make utility # History: +# 2021-06-11 0.0.3 remove systemctl which is now in systemctl-service-shim # Usage: # Reference: # bgscripts Makefile @@ -13,7 +14,7 @@ # Dependencies: APPNAME = freeipa-helper -APPVERSION = 0.0.2 +APPVERSION = 0.0.3 SRCDIR = $(CURDIR) prefix = /usr SYSCONFDIR = $(DESTDIR)/etc @@ -57,18 +58,18 @@ deplist_opts: install: @${echobin} Installing files to ${DESTDIR} ${installbin} -d ${SBINDIR} ${DOCDIR} ${BINDIR} ${BINDIR1} ${APPDIR} - ${installbin} -m 0755 -t ${SBINDIR} ${SRCDIR}/usr/sbin/* + ${installbin} -m 0755 -t ${SBINDIR} ${SRCDIR}/usr/sbin/freeipa-helper* ${installbin} -m 0644 -t ${APPDIR} ${SRCDIR}/usr/share/${APPNAME}/* - test -L ${BINDIR1}/systemctl || ${lnbin} -s ${SBINDIR}/systemctl ${BINDIR1}/systemctl - test -L ${BINDIR}/hostnamectl || ${lnbin} -s ${SBINDIR}/systemctl ${BINDIR}/hostnamectl - test -L ${BINDIR}/systemd-detect-virt || ${lnbin} -s ${SBINDIR}/systemctl ${BINDIR}/systemd-detect-virt +# test -L ${BINDIR1}/systemctl || ${lnbin} -s ${SBINDIR}/systemctl ${BINDIR1}/systemctl +# test -L ${BINDIR}/hostnamectl || ${lnbin} -s ${SBINDIR}/systemctl ${BINDIR}/hostnamectl +# test -L ${BINDIR}/systemd-detect-virt || ${lnbin} -s ${SBINDIR}/systemctl ${BINDIR}/systemd-detect-virt uninstall: @${echobin} "#" SRCDIR=${SRCDIR} ${rmbin} -f $$( ${findbin} ${SRCDIR} -mindepth 1 ! -type d -printf '%p\n' | ${sedbin} -r -e "s:^${SRCDIR}:${DESTDIR}:" ) - ${rmbin} ${BINDIR1}/systemctl || : - ${rmbin} ${BINDIR}/hostnamectl || : - ${rmbin} ${BINDIR}/systemd-detect-virt || : +# ${rmbin} ${BINDIR1}/systemctl || : +# ${rmbin} ${BINDIR}/hostnamectl || : +# ${rmbin} ${BINDIR}/systemd-detect-virt || : # remove all installed directories that are now blank. rmdir ${BINDIR} ${BINDIR1} || : |