From d36e7c1dfc80552675c9afb6a63c1681c3b23b68 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 15 May 2012 10:56:51 +0200 Subject: [PATCH] Put the Ubuntu logging functions in the hooks directory. Add the needed maintscript helper to remove the untouched lsb-base-logging.sh; including Pre-Dependency on recent-enough dpkg. --- debian/control | 1 + debian/lsb-base.maintscript.Ubuntu | 1 + debian/rules | 7 ++++++- .../50-ubuntu-logging | 0 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 debian/lsb-base.maintscript.Ubuntu rename lsb-base-logging-ubuntu.sh => init-functions.d/50-ubuntu-logging (100%) diff --git a/debian/control b/debian/control index fde40a4..13333b3 100644 --- a/debian/control +++ b/debian/control @@ -301,6 +301,7 @@ Package: lsb-base Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Priority: required Description: Linux Standard Base 4.1 init script functionality The Linux Standard Base (http://www.linuxbase.org/) is a standard diff --git a/debian/lsb-base.maintscript.Ubuntu b/debian/lsb-base.maintscript.Ubuntu new file mode 100644 index 0000000..4a85b2e --- /dev/null +++ b/debian/lsb-base.maintscript.Ubuntu @@ -0,0 +1 @@ +rm_conffile /etc/lsb-base-logging.sh 4.1+Debian3+ lsb-base diff --git a/debian/rules b/debian/rules index a465fc4..04e7065 100755 --- a/debian/rules +++ b/debian/rules @@ -43,6 +43,7 @@ endif override_dh_clean: dh_clean rm -f *.py[co] + rm -f debian/lsb-base.maintscript override_dh_python2: dh_python2 @@ -51,7 +52,11 @@ override_dh_python2: override_dh_install: dh_install ifeq ($(derives_from_ubuntu),yes) - cp -p lsb-base-logging-ubuntu.sh debian/lsb-base/etc/lsb-base-logging.sh + cp -p init-functions.d/50-ubuntu-logging debian/lsb-base/lib/lsb/init-functions.d/ + +override_dh_installdeb: + cp debian/lsb-base.maintscript.Ubuntu debian/lsb-base.maintscript + dh_installdeb endif override_dh_gencontrol: diff --git a/lsb-base-logging-ubuntu.sh b/init-functions.d/50-ubuntu-logging similarity index 100% rename from lsb-base-logging-ubuntu.sh rename to init-functions.d/50-ubuntu-logging -- 2.30.2