diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 369e2f16..f2647318 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,10 @@ Source: webmin Section: admin Priority: optional Maintainer: Jeremy Davis -Build-Depends: debhelper (>= 10), gzip, tar +Build-Depends: + debhelper-compat (= 13), + gzip, + tar, Standards-Version: 4.0.0 Homepage: https://webmin.com/ Vcs-Browser: https://github.com/turnkeylinux/webmin/ diff --git a/debian/rules b/debian/rules index ba03aae7..649d22a6 100755 --- a/debian/rules +++ b/debian/rules @@ -2,42 +2,20 @@ DH_VERBOSE = 1 -progname=$(shell awk '/^Source/ {print $$2}' debian/control) -buildroot=debian/$(progname) - -share=$(buildroot)/usr/share/$(progname) -tmp=debian/tmp - %: dh $@ -clean: - dh_clean - -build: - dh_prep - mkdir -p $(tmp) +override_dh_auto_build: + # no build step required - pure Perl/config package -install: build - dh_testdir - dh_testroot - mkdir -p $(share) - cp -aR webmin_core/* $(share) - dh_install debian/etc/pam.d/webmin etc/pam.d +override_dh_auto_install: + # run bash script for plugin install steps DH_VERBOSE=$(DH_VERBOSE) ./plugins_deb_rules.sh - rm -rf $(tmp) - -binary-indep: install - dh_testdir - dh_testroot - dh_installinit -r --no-start -- start 91 2 3 4 5 . stop 01 0 1 6 . - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-arch: install -binary: binary-indep binary-arch +override_dh_install: + dh_install + find debian/webmin/usr/share/webmin -name "*.pl" -exec \ + sed -i '1s|^#!.*perl|#!/usr/bin/perl|' {} \; -.PHONY: clean binary-indep binary-arch binary install +override_dh_installsystemd: + dh_installsystemd --no-start diff --git a/debian/webmin.init b/debian/webmin.init deleted file mode 100755 index 9cf3b717..00000000 --- a/debian/webmin.init +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: webmin -# Required-Start: $all -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Webmin -# Description: A web-based administration interface for Unix systems -### END INIT INFO - -NAME=webmin - -set -e -. /lib/lsb/init-functions - -case "$1" in - 'start') - log_begin_msg "Starting $NAME" - /etc/webmin/start >/dev/null 2>&1 /dev/null || true + fi + endscript +} diff --git a/debian/postinst b/debian/webmin.postinst similarity index 100% rename from debian/postinst rename to debian/webmin.postinst diff --git a/debian/webmin.service b/debian/webmin.service index f98de905..61b4af2e 100644 --- a/debian/webmin.service +++ b/debian/webmin.service @@ -13,6 +13,7 @@ PIDFile=/var/webmin/miniserv.pid Restart=always RestartSec=2s TimeoutSec=15s +SyslogIdentifier=webmin [Install] WantedBy=multi-user.target diff --git a/debian/etc/pam.d/webmin b/etc/pam.d/webmin similarity index 100% rename from debian/etc/pam.d/webmin rename to etc/pam.d/webmin