--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: pre-unblock: ctdb/2.5.4+debian0-4
- From: Mathieu Parent <sathieu@debian.org>
- Date: Wed, 28 Jan 2015 21:43:26 +0100
- Message-id: <20150128204326.20805.89319.reportbug@ultrathieu.sathieu.net>
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
I just want to make sure I could upload a new CTDB to sid...
I prepared (see attached patch and [git]) a new ctdb version, which fixes an
important bug: Before the patch, systemd was not be aware of the ctdb.service
file after upgrade from wheezy (#774328).
The patch ensure that ctdb.service is copied before dh_systemd_enable.
Summary: the bug is not critical (it can be workarounded by running
"systemctl daemon-reload"), but the patch is simple.
It will be:
unblock ctdb/2.5.4+debian0-4
[git]: commits since -3 at http://anonscm.debian.org/cgit/pkg-samba/ctdb.git/log/
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index 2207a6d..bb64ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ctdb (2.5.4+debian0-4) unstable; urgency=medium
+
+ * Install ctdb.service during dh_install, and thus before dh_systemd_enable
+ (Closes: #774328)
+ * d/rules: Remove unneeded override_dh_systemd_enable
+
+ -- Mathieu Parent <sathieu@debian.org> Wed, 28 Jan 2015 19:19:14 +0100
+
ctdb (2.5.4+debian0-3) unstable; urgency=medium
* Simplify fix for bug #773016 by simply passing --localstatedir=/var.
diff --git a/debian/ctdb.install b/debian/ctdb.install
index 87b1674..62890b3 100644
--- a/debian/ctdb.install
+++ b/debian/ctdb.install
@@ -3,3 +3,4 @@ etc/sudoers.d
usr/bin/*
usr/sbin/*
usr/share/man/man1/*
+config/ctdb.service /lib/systemd/system/
diff --git a/debian/rules b/debian/rules
index 48ab952..9b62d13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,6 @@ override_dh_auto_configure: check-external-libs
override_dh_auto_test:
# skipping (runtime) tests
-override_dh_systemd_enable:
- dh_systemd_enable -pctdb
-
override_dh_systemd_start:
dh_systemd_start -pctdb --no-start --no-restart-on-upgrade
@@ -42,9 +39,6 @@ override_dh_installinit:
# Install /etc/init.d/ctdb
mkdir -p $(CURDIR)/debian/ctdb/etc/init.d
install -m755 config/ctdb.init $(CURDIR)/debian/ctdb/etc/init.d/ctdb
- # Install /lib/systemd/system/ctdb.service
- mkdir -p $(CURDIR)/debian/ctdb/lib/systemd/system
- install -m644 config/ctdb.service $(CURDIR)/debian/ctdb/lib/systemd/system/ctdb.service
# Install dh scripts
dh_installinit -pctdb --no-start --no-restart-on-upgrade --onlyscripts
--- End Message ---