debian/rules: Drop manual creation of .service files symlink, this should be handled by dh_systemd now

This commit is contained in:
Laurent Bigonville 2013-06-26 18:48:42 +02:00
parent 65234e6c7b
commit a60005575f
2 changed files with 3 additions and 6 deletions

4
debian/changelog vendored
View file

@ -12,13 +12,15 @@ nut (2.6.5-3) UNRELEASED; urgency=low
* Added dep-8-tests to improve QA (from Ubuntu, closes: #708130) * Added dep-8-tests to improve QA (from Ubuntu, closes: #708130)
* debian/nut-monitor.menu, nut-monitor.xpm: Add Debian menu entry (Closes: * debian/nut-monitor.menu, nut-monitor.xpm: Add Debian menu entry (Closes:
#708813) #708813)
* debian/rules: Drop manual creation of .service files symlink, this should
be handled by dh_systemd now
[ Ivo De Decker ] [ Ivo De Decker ]
* debian/nut-client.preinst: also revert /etc/nut/nut.conf mangling done * debian/nut-client.preinst: also revert /etc/nut/nut.conf mangling done
by postinst during upgrade from lenny to squeeze (Really closes: #677054) by postinst during upgrade from lenny to squeeze (Really closes: #677054)
Thanks to Andreas Beckmann for the review. Thanks to Andreas Beckmann for the review.
-- Laurent Bigonville <bigon@debian.org> Tue, 18 Jun 2013 21:49:12 +0200 -- Laurent Bigonville <bigon@debian.org> Wed, 26 Jun 2013 18:47:52 +0200
nut (2.6.5-2) experimental; urgency=low nut (2.6.5-2) experimental; urgency=low

5
debian/rules vendored
View file

@ -85,11 +85,6 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
$(CURDIR)/debian/nut-client/usr/lib/tmpfiles.d/nut-client.conf $(CURDIR)/debian/nut-client/usr/lib/tmpfiles.d/nut-client.conf
install -m 644 -D $(CURDIR)/debian/nut-server.tmpfiles \ install -m 644 -D $(CURDIR)/debian/nut-server.tmpfiles \
$(CURDIR)/debian/nut-server/usr/lib/tmpfiles.d/nut-server.conf $(CURDIR)/debian/nut-server/usr/lib/tmpfiles.d/nut-server.conf
# This is needed to avoid services to be started twice (systemd and LSB)
mkdir -p $(CURDIR)/debian/nut-client/etc/systemd/system/
ln -s /lib/systemd/system/nut-monitor.service \
$(CURDIR)/debian/nut-client/etc/systemd/system/nut-client.service
endif endif
common-install-indep:: common-install-indep::