Commit 16329c37 authored by Guillem Jover's avatar Guillem Jover

debian: Install s-s-d directly into /sbin

This properly fixes the empty usr/sbin directory that needs cleanup,
and avoids the annoying path moves in debian/rules.
parent af2524c2
......@@ -9,6 +9,8 @@ dpkg (1.17.1) UNRELEASED; urgency=low
* Reword libdpkg-perl description and only list public modules.
* Remove space before value in dpkg-parsechangelog -S option on pkg-info.mk.
Closes: #718014
* Make the build system install start-stop-daemon directly under /sbin,
instead of moving it around in debian/rules.
-- Guillem Jover <guillem@debian.org> Sat, 27 Jul 2013 05:32:21 +0200
......
......@@ -2,6 +2,7 @@
etc/dpkg/dpkg.cfg.d
etc/alternatives
sbin/start-stop-daemon
usr/bin/dpkg
usr/bin/dpkg-deb
usr/bin/dpkg-divert
......@@ -11,7 +12,6 @@ usr/bin/dpkg-split
usr/bin/dpkg-statoverride
usr/bin/dpkg-trigger
usr/bin/update-alternatives
usr/sbin
usr/share/dpkg/*table
usr/share/locale/*/LC_MESSAGES/dpkg.mo
var/lib/dpkg/alternatives
......
......@@ -49,6 +49,7 @@ build-tree/config.status: configure
--mandir=\$${datadir}/man \
--infodir=\$${datadir}/info \
--sysconfdir=/etc \
--sbindir=/sbin \
--localstatedir=/var \
--with-zlib \
--with-liblzma \
......@@ -98,11 +99,6 @@ binary-arch: install
dh_install --sourcedir=debian/tmp -a
dh_installcron -a
dh_installlogrotate -a
install -d debian/dpkg/sbin
mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
rmdir --ignore-fail-on-non-empty debian/dpkg/usr/sbin
dh_installchangelogs -a ChangeLog*
dh_installdocs -a
$(call dpkg-installmanl10n,dpkg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment