Merge ~ogayot/ubuntu/+source/sysvinit:merge-lp2007421-lunar into ubuntu/+source/sysvinit:debian/sid

[Olivier Gayot]

[Olivier Gayot (ogayot)]

PPA: https://launchpad.net/~ogayot/+archive/ubuntu/lunar-proposed/

split tag: https://git.launchpad.net/~ogayot/ubuntu/+source/sysvinit/tag/?h=lp2007421/split/3.05-7ubuntu2
logical tag: https://git.launchpad.net/~ogayot/ubuntu/+source/sysvinit/tag/?h=lp2007421/logical/3.05-7ubuntu2
reconstruct tag: https://git.launchpad.net/~ogayot/ubuntu/+source/sysvinit/tag/?h=lp2007421/reconstruct/3.05-7ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 3f0c450..a05f3c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sysvinit (3.06-2ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #2007421). Remaining changes:
+    - When building for Ubuntu, skip all binaries except for sysvinit-utils
+    - Fix absence of changelog.Debian.gz in sysvinit-utils binary package
+    - Adjust debian/rules to fix an arch: all build failure
+    - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
+
+ -- Olivier Gayot <[e-mail]>  Thu, 16 Feb 2023 14:53:59 +0100
+
 sysvinit (3.06-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -33,6 +43,23 @@ sysvinit (3.06~beta1-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Fri, 02 Dec 2022 11:29:21 +0000
 
+sysvinit (3.05-7ubuntu2) lunar; urgency=medium
+
+  * d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
+    (LP: #2002789)
+
+ -- Olivier Gayot <[e-mail]>  Fri, 13 Jan 2023 11:33:36 +0100
+
+sysvinit (3.05-7ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable (LP: #1998325). 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
+  * Fix absence of changelog.Debian.gz in sysvinit-utils binary package.
+    (LP: #1998324)
+
+ -- Olivier Gayot <[e-mail]>  Wed, 30 Nov 2022 10:32:54 +0100
+
 sysvinit (3.05-7) unstable; urgency=medium
 
   * Drop libcrypt-dev from B-Depends, we don't ship sulogin since Stretch
@@ -93,6 +120,14 @@ sysvinit (3.05-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  Wed, 24 Aug 2022 13:05:57 +0100
 
+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 <[e-mail]>  Sat, 22 Aug 2022 09:57:41 +0200
+
 sysvinit (3.04-1) unstable; urgency=medium
 
   * New upstream version 3.04
@@ -119,6 +154,14 @@ sysvinit (3.02-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  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 <[e-mail]>  Tue, 14 Dec 2021 21:17:22 +0000
+
 sysvinit (3.01-1) unstable; urgency=medium
 
   * Update upstream signing key.
@@ -180,6 +223,19 @@ sysvinit (3.00~beta-1) experimental; urgency=medium
 
  -- Mark Hindley <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 27 Apr 2021 20:19:54 -0700
+
 sysvinit (2.96-7) unstable; urgency=medium
 
   [ Mark Hindley ]
@@ -192,6 +248,15 @@ sysvinit (2.96-7) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  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 <[e-mail]>  Wed, 17 Mar 2021 10:02:02 -0700
+
 sysvinit (2.96-6) unstable; urgency=medium
 
   [ Matthew Vernon ]
@@ -206,6 +271,14 @@ sysvinit (2.96-6) unstable; urgency=medium
 
  -- Matthew Vernon <[e-mail]>  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 <[e-mail]>  Sat, 24 Oct 2020 19:04:47 -0700
+
 sysvinit (2.96-5) unstable; urgency=low
 
   * Team upload.
@@ -249,6 +322,14 @@ sysvinit (2.96-4) unstable; urgency=critical
 
  -- Thorsten Glaser <[e-mail]>  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 <[e-mail]>  Fri, 01 May 2020 07:41:28 -0700
+
 sysvinit (2.96-3) unstable; urgency=medium
 
   * Update Dmitry's address.
@@ -258,6 +339,14 @@ sysvinit (2.96-3) unstable; urgency=medium
 
  -- Adam Borowski <[e-mail]>  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 <[e-mail]>  Thu, 13 Feb 2020 10:38:21 -0800
+
 sysvinit (2.96-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -275,6 +364,14 @@ sysvinit (2.96-2) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  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 <[e-mail]>  Thu, 31 Oct 2019 15:59:53 -0700
+
 sysvinit (2.96-1) unstable; urgency=medium
 
   * New upstream release.
@@ -289,6 +386,21 @@ sysvinit (2.96-1) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Fri, 18 Oct 2019 14:21:33 -0700
+
 sysvinit (2.96~beta-3) unstable; urgency=medium
 
   * Team upload.
@@ -342,6 +454,20 @@ sysvinit (2.95-6) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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
@@ -388,6 +514,14 @@ sysvinit (2.95-3) unstable; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  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 <[e-mail]>  Wed, 24 Jul 2019 12:32:57 -0700
+
 sysvinit (2.95-2) unstable; urgency=medium
 
   * [22e43c01] Make sure dh_fixperms is called during build.
@@ -481,6 +615,14 @@ sysvinit (2.93-9) experimental; urgency=medium
 
  -- Dmitry Bogatov <[e-mail]>  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 <[e-mail]>  Mon, 29 Apr 2019 22:02:02 -0700
+
 sysvinit (2.93-8) unstable; urgency=medium
 
   * Return alternative dependency on file-rc for convenience of
@@ -699,6 +841,19 @@ sysvinit (2.88dsf-59.11) unstable; urgency=medium
 
  -- Michael Biebl <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Wed, 01 Nov 2017 15:00:29 -0600
+
 sysvinit (2.88dsf-59.10) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -5543,3 +5698,4 @@ sysvinit (2.66-1) unstable; urgency=medium
     /var/log and /etc itself.
 
  -- Miquel van Smoorenburg <[e-mail]>  Tue, 29 Oct 1996 13:46:54 +0100
+
diff --git a/debian/control b/debian/control
index e3b9c91..de14b0e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sysvinit
 Section: admin
 Priority: optional
-Maintainer: Debian sysvinit maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian sysvinit maintainers <[e-mail]>
 Uploaders:
  Ian Jackson <[e-mail]>,
  Benda Xu <[e-mail]>,
diff --git a/debian/rules b/debian/rules
index 0a0bb84..c4c15cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,12 @@ doc	= /usr/share/doc
 
 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
 
@@ -27,6 +33,10 @@ 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)
@@ -44,6 +54,7 @@ override_dh_auto_install-indep:
 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 \
@@ -59,6 +70,7 @@ override_dh_install-arch:
 		$(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))
@@ -66,8 +78,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
 endif
 
 ifeq ($(derives_from_ubuntu),yes)
-ifneq (,$(findstring lsb-base, $(shell dh_listpackages)))
-	cp -p debian/src/lsb-base/init-functions.d/50-ubuntu-logging debian/lsb-base/lib/lsb/init-functions.d/
+ifneq (,$(findstring sysvinit-utils, $(shell dh_listpackages)))
+	cp -p debian/src/lsb-base/init-functions.d/50-ubuntu-logging \
+		debian/sysvinit-utils/lib/lsb/init-functions.d/
 endif
 endif
 
@@ -75,25 +88,31 @@ install-arch: build-arch
 	dh $@ $(DH_OPTIONS)
 
 override_dh_installchangelogs-arch:
+ifneq ($(shell dpkg-vendor --query vendor),Ubuntu)
 	dh_installchangelogs -psysvinit-core doc/Changelog
+endif
 
 	dh_installchangelogs -psysvinit-utils
 	rm -f $(utiltmp)$(doc)/sysvinit-utils/changelog
 	sed -i -ne '/sysvinit (2.93-8)/q' -e p \
 		$(utiltmp)$(doc)/sysvinit-utils/changelog.Debian
 
+ifneq ($(shell dpkg-vendor --query vendor),Ubuntu)
 	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