diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-12 11:39:22 (GMT) |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-02-12 11:39:22 (GMT) |
| commit | e5650f3e1130e0488ed0a3a6b1fa595204bb334a (patch) | |
| tree | f46b0ce531d4e6779f6391658fce33aa898df393 | |
| parent | 3b86b3ee90178e5dc33a3182b60c1eaefd87aa26 (diff) | |
Three reasons:
* I think it is wrong to query dpkg-vendor in this way. The result
is that if an Ubuntu user tries to build "Debian's version" of
sysvinit, they get the Ubuntu version after all. Also, it seems
wrong for Ubuntu derivatives, too.
* This commit is not really suitable for upload to Debian sid at this
stage of the Debian release. (NB this wasn't true when it was
committed in July.)
* It contains an undocumented change to the definition of
INSTALL_DATA, to add -D. I think that directories should be
created explicitly.
This reverts commit 6ac609340af19a8d021c5ab8fea50c65241d1d0b.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index c2b00db..7ae73ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ sysvinit (2.88dsf-59.9) UNRELEASED; urgency=medium [ Martin Pitt ] - * When building for Ubuntu, skip all binaries except for sysvinit-utils. * Mark sysvinit-utils as Multi-Arch: foreign, like sysv-rc and initscripts. [ Michael Biebl ] diff --git a/debian/rules b/debian/rules index e3e076c..6a9a9fb 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -INSTALL_DATA = install -o root -g root -m 644 -D +INSTALL_DATA = install -o root -g root -m 644 INSTALL = install -o root -g root -m 755 # Handle cross builds @@ -33,10 +33,6 @@ endif DH_OPTIONS = -ifeq ($(shell dpkg-vendor --query vendor),Ubuntu) - DH_OPTIONS = -Nsysvinit-core -Nsysv-rc -Ninitscripts -Nbootlogd -endif - # Use debhelper's dh %: dh $@ $(DH_OPTIONS) @@ -82,7 +78,6 @@ install-arch: build-arch override_dh_installchangelogs-arch: dh_installchangelogs -psysvinit-core doc/Changelog -ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) dh_installchangelogs -psysvinit-utils doc/Changelog sed -i -ne '/sysvinit (2.86.ds1-47)/q' -e p \ $(utiltmp)$(doc)/sysvinit-utils/changelog.Debian @@ -94,14 +89,11 @@ ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) dh_installchangelogs -pbootlogd sed -i -ne '/sysvinit (2.86.ds1-47)/q' -e p \ $(bootlogdtmp)$(doc)/bootlogd/changelog.Debian -endif override_dh_installchangelogs-indep: dh_installchangelogs -ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) sed -i -ne '/sysvinit (2.86.ds1-47)/q' -e p \ $(rctmp)$(doc)/sysv-rc/changelog.Debian -endif override_dh_fixperms: dh_fixperms -X/etc/init.d/skeleton -X/etc/init.d/README |