diff -Nru sysvinit-3.04/debian/changelog sysvinit-3.04/debian/changelog --- sysvinit-3.04/debian/changelog 2022-08-03 12:49:34.000000000 +0200 +++ sysvinit-3.04/debian/changelog 2022-08-22 09:57:41.000000000 +0200 @@ -1,3 +1,11 @@ +sysvinit (3.04-1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. (LP: #1987257) Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils + - Define the DEB_HOST_* variables in d/rules if not defined already + + -- Olivier Gayot Sat, 22 Aug 2022 09:57:41 +0200 + sysvinit (3.04-1) unstable; urgency=medium * New upstream version 3.04 @@ -24,6 +32,14 @@ -- Mark Hindley Tue, 29 Mar 2022 16:00:24 +0100 +sysvinit (3.01-1ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. (Closes: LP: #1958666) Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils + - Define the DEB_HOST_* variables in d/rules if not defined already + + -- Olivier Gayot Tue, 14 Dec 2021 21:17:22 +0000 + sysvinit (3.01-1) unstable; urgency=medium * Update upstream signing key. @@ -85,6 +101,19 @@ -- Mark Hindley Wed, 15 Sep 2021 11:19:13 +0100 +sysvinit (2.96-7ubuntu2) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:25:10 +0200 + +sysvinit (2.96-7ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + + -- Steve Langasek Tue, 27 Apr 2021 20:19:54 -0700 + sysvinit (2.96-7) unstable; urgency=medium [ Mark Hindley ] @@ -97,6 +126,15 @@ -- Adam Borowski Sun, 18 Apr 2021 17:38:40 +0200 +sysvinit (2.96-6ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + * Dropped changes, no longer needed: + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Wed, 17 Mar 2021 10:02:02 -0700 + sysvinit (2.96-6) unstable; urgency=medium [ Matthew Vernon ] @@ -111,6 +149,14 @@ -- Matthew Vernon Sun, 21 Feb 2021 13:53:09 +0000 +sysvinit (2.96-5ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Sat, 24 Oct 2020 19:04:47 -0700 + sysvinit (2.96-5) unstable; urgency=low * Team upload. @@ -154,6 +200,14 @@ -- Thorsten Glaser Fri, 14 Aug 2020 02:29:31 +0200 +sysvinit (2.96-3ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Fri, 01 May 2020 07:41:28 -0700 + sysvinit (2.96-3) unstable; urgency=medium * Update Dmitry's address. @@ -163,6 +217,14 @@ -- Adam Borowski Thu, 19 Mar 2020 23:37:42 +0100 +sysvinit (2.96-2.1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Thu, 13 Feb 2020 10:38:21 -0800 + sysvinit (2.96-2.1) unstable; urgency=medium * Non-maintainer upload. @@ -180,6 +242,14 @@ -- Dmitry Bogatov Thu, 28 Nov 2019 21:07:03 +0000 +sysvinit (2.96-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Thu, 31 Oct 2019 15:59:53 -0700 + sysvinit (2.96-1) unstable; urgency=medium * New upstream release. @@ -194,6 +264,21 @@ -- Dmitry Bogatov Sat, 19 Oct 2019 00:37:48 +0000 +sysvinit (2.96~beta-3ubuntu2) focal; urgency=medium + + * Fix debian/rules to not try to install bits into a sysvinit-core package + we aren't building. + + -- Steve Langasek Fri, 25 Oct 2019 13:21:15 -0700 + +sysvinit (2.96~beta-3ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Fri, 18 Oct 2019 14:21:33 -0700 + sysvinit (2.96~beta-3) unstable; urgency=medium * Team upload. @@ -247,6 +332,20 @@ -- Dmitry Bogatov Fri, 23 Aug 2019 16:26:28 +0000 +sysvinit (2.95-5ubuntu2) eoan; urgency=medium + + * Adjust debian/rules to fix an arch: all build failure. + + -- Steve Langasek Fri, 16 Aug 2019 09:01:15 -0700 + +sysvinit (2.95-5ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Thu, 15 Aug 2019 23:55:53 -0700 + sysvinit (2.95-5) unstable; urgency=medium * [2d158bc6] Make default TTYMODE match default TTYPERM of `login' package @@ -293,6 +392,14 @@ -- Dmitry Bogatov Mon, 29 Jul 2019 08:10:44 +0000 +sysvinit (2.95-2ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Wed, 24 Jul 2019 12:32:57 -0700 + sysvinit (2.95-2) unstable; urgency=medium * [22e43c01] Make sure dh_fixperms is called during build. @@ -386,6 +493,14 @@ -- Dmitry Bogatov Thu, 14 Feb 2019 20:55:23 +0000 +sysvinit (2.93-8ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + - Make mountpoint.c compile with new glibc. + + -- Steve Langasek Mon, 29 Apr 2019 22:02:02 -0700 + sysvinit (2.93-8) unstable; urgency=medium * Return alternative dependency on file-rc for convenience of @@ -604,6 +719,19 @@ -- Michael Biebl Sun, 07 Oct 2018 16:04:09 +0200 +sysvinit (2.88dsf-59.10ubuntu2) cosmic; urgency=medium + + * Make mountpoint.c compile with new glibc. + + -- Dimitri John Ledkov Thu, 04 Oct 2018 16:32:29 +0100 + +sysvinit (2.88dsf-59.10ubuntu1) bionic; urgency=medium + + * Merge with Debian, restoring 6ac609340af19a8d021c5ab8fea50c65241d1d0b: + - When building for Ubuntu, skip all binaries except for sysvinit-utils. + + -- Adam Conrad Wed, 01 Nov 2017 15:00:29 -0600 + sysvinit (2.88dsf-59.10) unstable; urgency=medium * Non-maintainer upload. @@ -5448,3 +5576,4 @@ /var/log and /etc itself. -- Miquel van Smoorenburg Tue, 29 Oct 1996 13:46:54 +0100 + diff -Nru sysvinit-3.04/debian/control sysvinit-3.04/debian/control --- sysvinit-3.04/debian/control 2022-08-03 12:49:34.000000000 +0200 +++ sysvinit-3.04/debian/control 2022-08-03 17:45:02.000000000 +0200 @@ -1,7 +1,8 @@ Source: sysvinit Section: admin Priority: optional -Maintainer: Debian sysvinit maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian sysvinit maintainers Uploaders: Ian Jackson , Benda Xu , diff -Nru sysvinit-3.04/debian/rules sysvinit-3.04/debian/rules --- sysvinit-3.04/debian/rules 2022-08-03 12:40:48.000000000 +0200 +++ sysvinit-3.04/debian/rules 2022-08-03 17:45:02.000000000 +0200 @@ -13,6 +13,12 @@ LC_ALL = POSIX +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +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 -m 644 INSTALL = install -m 755 @@ -25,6 +31,10 @@ 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) @@ -41,6 +51,7 @@ override_dh_install-arch: dh_install +ifneq (,$(findstring sysvinit-core, $(shell dh_listpackages))) # sysvinit package if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \ then \ @@ -56,6 +67,7 @@ $(INSTALL_DATA) debian/share/inittab \ $(sysvtmp)/usr/share/sysvinit/inittab ; \ fi +endif # initscripts package may include /sys ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd)) @@ -68,6 +80,7 @@ override_dh_installchangelogs-arch: dh_installchangelogs -psysvinit-core doc/Changelog +ifneq ($(shell dpkg-vendor --query vendor),Ubuntu) dh_installchangelogs -psysvinit-utils rm -f $(utiltmp)$(doc)/sysvinit-utils/changelog sed -i -ne '/sysvinit (2.93-8)/q' -e p \ @@ -76,15 +89,18 @@ dh_installchangelogs -pbootlogd sed -i -ne '/sysvinit (2.93-8)/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.93-8)/q' -e p \ $(rctmp)$(doc)/sysv-rc/changelog.Debian dh_installchangelogs -pinitscripts sed -i -ne '/sysvinit (2.93-8)/q' -e p \ $(inittmp)$(doc)/initscripts/changelog.Debian +endif override_dh_installdeb: dh_installdeb