The following commit has been merged in the master branch:
commit 16329c3799604b4f20a622833661be2cd2e1e757
Author: Guillem Jover <[email protected]>
Date: Sun Jul 28 14:41:01 2013 +0200
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.
diff --git a/debian/changelog b/debian/changelog
index 3ac4068..482e2d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <[email protected]> Sat, 27 Jul 2013 05:32:21 +0200
diff --git a/debian/dpkg.install b/debian/dpkg.install
index 1150616..9f688cb 100644
--- a/debian/dpkg.install
+++ b/debian/dpkg.install
@@ -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
diff --git a/debian/rules b/debian/rules
index 2327216..9489874 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
