Merge ~levihackerman-102/ubuntu/+source/sysvinit:merge-lp2073946-oracular into ubuntu/+source/sysvinit:debian/sid

Proposed by Anshul Singh
Status: Work in progress
Proposed branch: ~levihackerman-102/ubuntu/+source/sysvinit:merge-lp2073946-oracular
Merge into: ubuntu/+source/sysvinit:debian/sid
Diff against target: 437 lines (+237/-2)
3 files modified
debian/changelog (+223/-0)
debian/control (+2/-1)
debian/rules (+12/-1)
Reviewer Review Type Date Requested Status
Canonical Server Reporter Pending
git-ubuntu import Pending
Review via email: mp+470549@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Anshul Singh (levihackerman-102) wrote :

Unmerged commits

3c36ebe... by Anshul Singh

Update maintainer

9772c96... by Anshul Singh

reconstruct-changelog

80ca590... by Anshul Singh

merge-changelogs

827ea20... by Anshul Singh

Adjust DEP17 move for Ubuntu

461d875... by Anshul Singh

3.08-6ubuntu1 (patches unapplied)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index bde1f06..b453908 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+sysvinit (3.09-2ubuntu1) oracular; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+3.08-6ubuntu1 (patches unapplied)
10+Adjust DEP17 move for Ubuntu
11+
12+ -- Anshul Singh <anshul.singh@canonical.com> Thu, 01 Aug 2024 11:11:55 +0530
13+
14 sysvinit (3.09-2) unstable; urgency=medium
15
16 [ Mark Hindley ]
17@@ -42,6 +50,29 @@ sysvinit (3.08-7) unstable; urgency=medium
18
19 -- Mark Hindley <leepen@debian.org> Thu, 29 Feb 2024 11:22:45 +0000
20
21+sysvinit (3.08-6ubuntu3) noble; urgency=high
22+
23+ * No change rebuild for 64-bit time_t and frame pointers.
24+
25+ -- Julian Andres Klode <juliank@ubuntu.com> Mon, 08 Apr 2024 18:20:36 +0200
26+
27+sysvinit (3.08-6ubuntu2) noble; urgency=medium
28+
29+ [ Helmut Grohne ]
30+ * DEP17: Move files to /usr. (Closes: #1060139)
31+
32+ [ Julian Andres Klode ]
33+ * Adjust DEP17 move for Ubuntu
34+
35+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 22 Feb 2024 13:40:25 +0100
36+
37+sysvinit (3.08-6ubuntu1) noble; urgency=medium
38+
39+ * Merge with Debian Unstable. Remaining changes:
40+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
41+
42+ -- Simon Quigley <tsimonq2@ubuntu.com> Wed, 21 Feb 2024 12:36:24 -0600
43+
44 sysvinit (3.08-6) unstable; urgency=medium
45
46 * d/sysvinit-core.postinst: don't do_restart() for new installations.
47@@ -74,6 +105,13 @@ sysvinit (3.08-4) experimental; urgency=medium
48
49 -- Mark Hindley <leepen@debian.org> Mon, 27 Nov 2023 18:45:44 +0000
50
51+sysvinit (3.08-3ubuntu1) noble; urgency=low
52+
53+ * Merge with Debian Unstable. Remaining changes:
54+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
55+
56+ -- Simon Quigley <tsimonq2@ubuntu.com> Mon, 20 Nov 2023 17:34:46 -0600
57+
58 sysvinit (3.08-3) unstable; urgency=medium
59
60 * Release to unstable
61@@ -95,6 +133,16 @@ sysvinit (3.08-1) unstable; urgency=medium
62
63 -- Mark Hindley <leepen@debian.org> Sun, 17 Sep 2023 20:10:53 +0100
64
65+sysvinit (3.07-1ubuntu1) mantic; urgency=medium
66+
67+ * Merge with Debian unstable (LP: #2029132). Remaining changes:
68+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
69+ * Dropped changes, merged in Debian:
70+ - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
71+ [Fixed in 3.07-1~exp1]
72+
73+ -- Olivier Gayot <olivier.gayot@canonical.com> Mon, 31 Jul 2023 15:26:23 +0200
74+
75 sysvinit (3.07-1) unstable; urgency=medium
76
77 [ Olivier Gayot ]
78@@ -122,6 +170,25 @@ sysvinit (3.07-1~exp1) experimental; urgency=medium
79
80 -- Mark Hindley <leepen@debian.org> Mon, 01 May 2023 11:24:07 +0100
81
82+sysvinit (3.06-4ubuntu1) mantic; urgency=medium
83+
84+ * Merge with Debian unstable (LP: #2018596). Remaining changes:
85+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
86+ - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
87+ (Closes: #1028586)
88+ * Dropped changes:
89+ - Define the DEB_HOST_* variables in d/rules if not defined already
90+
91+ * The dropped change was undocumented and first introduced in focal. It is
92+ unclear what it was originally fixing. One assumption is that, when Debian
93+ started relying on /usr/share/dpkg/common.mk, the file was not present (or
94+ incomplete) on some architectures in Ubuntu. We have kept this change
95+ around for nearly four years, potentially for no valid reason.
96+ In 3.06-2ubuntu1, this change was worded as "Adjust debian/rules to fix an
97+ arch: all build failure". This is a mistake and should not be trusted.
98+
99+ -- Olivier Gayot <olivier.gayot@canonical.com> Sun, 07 May 2023 01:04:33 +0200
100+
101 sysvinit (3.06-4) unstable; urgency=medium
102
103 * Add Romanian debconf translations with thanks to Remus-Gabriel Chelu
104@@ -138,6 +205,16 @@ sysvinit (3.06-3) unstable; urgency=medium
105
106 -- Mark Hindley <leepen@debian.org> Thu, 30 Mar 2023 13:59:53 +0100
107
108+sysvinit (3.06-2ubuntu1) lunar; urgency=medium
109+
110+ * Merge with Debian unstable (LP: #2007421). Remaining changes:
111+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
112+ - Fix absence of changelog.Debian.gz in sysvinit-utils binary package
113+ - Adjust debian/rules to fix an arch: all build failure
114+ - d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
115+
116+ -- Olivier Gayot <olivier.gayot@canonical.com> Thu, 16 Feb 2023 14:53:59 +0100
117+
118 sysvinit (3.06-2) unstable; urgency=medium
119
120 * Upload to unstable.
121@@ -173,6 +250,23 @@ sysvinit (3.06~beta1-1) experimental; urgency=medium
122
123 -- Mark Hindley <leepen@debian.org> Fri, 02 Dec 2022 11:29:21 +0000
124
125+sysvinit (3.05-7ubuntu2) lunar; urgency=medium
126+
127+ * d/rules: fix installation of 50-ubuntu-logging when building on Ubuntu
128+ (LP: #2002789)
129+
130+ -- Olivier Gayot <olivier.gayot@canonical.com> Fri, 13 Jan 2023 11:33:36 +0100
131+
132+sysvinit (3.05-7ubuntu1) lunar; urgency=low
133+
134+ * Merge from Debian unstable (LP: #1998325). Remaining changes:
135+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
136+ - Define the DEB_HOST_* variables in d/rules if not defined already
137+ * Fix absence of changelog.Debian.gz in sysvinit-utils binary package.
138+ (LP: #1998324)
139+
140+ -- Olivier Gayot <olivier.gayot@canonical.com> Wed, 30 Nov 2022 10:32:54 +0100
141+
142 sysvinit (3.05-7) unstable; urgency=medium
143
144 * Drop libcrypt-dev from B-Depends, we don't ship sulogin since Stretch
145@@ -233,6 +327,14 @@ sysvinit (3.05-1) experimental; urgency=medium
146
147 -- Mark Hindley <leepen@debian.org> Wed, 24 Aug 2022 13:05:57 +0100
148
149+sysvinit (3.04-1ubuntu1) kinetic; urgency=low
150+
151+ * Merge from Debian unstable. (LP: #1987257) Remaining changes:
152+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
153+ - Define the DEB_HOST_* variables in d/rules if not defined already
154+
155+ -- Olivier Gayot <olivier.gayot@canonical.com> Sat, 22 Aug 2022 09:57:41 +0200
156+
157 sysvinit (3.04-1) unstable; urgency=medium
158
159 * New upstream version 3.04
160@@ -259,6 +361,14 @@ sysvinit (3.02-1) experimental; urgency=medium
161
162 -- Mark Hindley <leepen@debian.org> Tue, 29 Mar 2022 16:00:24 +0100
163
164+sysvinit (3.01-1ubuntu1) jammy; urgency=low
165+
166+ * Merge from Debian unstable. (Closes: LP: #1958666) Remaining changes:
167+ - When building for Ubuntu, skip all binaries except for sysvinit-utils
168+ - Define the DEB_HOST_* variables in d/rules if not defined already
169+
170+ -- Olivier Gayot <olivier.gayot@canonical.com> Tue, 14 Dec 2021 21:17:22 +0000
171+
172 sysvinit (3.01-1) unstable; urgency=medium
173
174 * Update upstream signing key.
175@@ -320,6 +430,19 @@ sysvinit (3.00~beta-1) experimental; urgency=medium
176
177 -- Mark Hindley <leepen@debian.org> Wed, 15 Sep 2021 11:19:13 +0100
178
179+sysvinit (2.96-7ubuntu2) impish; urgency=medium
180+
181+ * No-change rebuild to build packages with zstd compression.
182+
183+ -- Matthias Klose <doko@ubuntu.com> Thu, 07 Oct 2021 12:25:10 +0200
184+
185+sysvinit (2.96-7ubuntu1) impish; urgency=low
186+
187+ * Merge from Debian unstable. Remaining changes:
188+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
189+
190+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 27 Apr 2021 20:19:54 -0700
191+
192 sysvinit (2.96-7) unstable; urgency=medium
193
194 [ Mark Hindley ]
195@@ -332,6 +455,15 @@ sysvinit (2.96-7) unstable; urgency=medium
196
197 -- Adam Borowski <kilobyte@angband.pl> Sun, 18 Apr 2021 17:38:40 +0200
198
199+sysvinit (2.96-6ubuntu1) hirsute; urgency=low
200+
201+ * Merge from Debian unstable. Remaining changes:
202+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
203+ * Dropped changes, no longer needed:
204+ - Make mountpoint.c compile with new glibc.
205+
206+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 17 Mar 2021 10:02:02 -0700
207+
208 sysvinit (2.96-6) unstable; urgency=medium
209
210 [ Matthew Vernon ]
211@@ -346,6 +478,14 @@ sysvinit (2.96-6) unstable; urgency=medium
212
213 -- Matthew Vernon <matthew@debian.org> Sun, 21 Feb 2021 13:53:09 +0000
214
215+sysvinit (2.96-5ubuntu1) hirsute; urgency=low
216+
217+ * Merge from Debian unstable. Remaining changes:
218+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
219+ - Make mountpoint.c compile with new glibc.
220+
221+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 24 Oct 2020 19:04:47 -0700
222+
223 sysvinit (2.96-5) unstable; urgency=low
224
225 * Team upload.
226@@ -389,6 +529,14 @@ sysvinit (2.96-4) unstable; urgency=critical
227
228 -- Thorsten Glaser <tg@mirbsd.de> Fri, 14 Aug 2020 02:29:31 +0200
229
230+sysvinit (2.96-3ubuntu1) groovy; urgency=low
231+
232+ * Merge from Debian unstable. Remaining changes:
233+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
234+ - Make mountpoint.c compile with new glibc.
235+
236+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 May 2020 07:41:28 -0700
237+
238 sysvinit (2.96-3) unstable; urgency=medium
239
240 * Update Dmitry's address.
241@@ -398,6 +546,14 @@ sysvinit (2.96-3) unstable; urgency=medium
242
243 -- Adam Borowski <kilobyte@angband.pl> Thu, 19 Mar 2020 23:37:42 +0100
244
245+sysvinit (2.96-2.1ubuntu1) focal; urgency=low
246+
247+ * Merge from Debian unstable. Remaining changes:
248+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
249+ - Make mountpoint.c compile with new glibc.
250+
251+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 13 Feb 2020 10:38:21 -0800
252+
253 sysvinit (2.96-2.1) unstable; urgency=medium
254
255 * Non-maintainer upload.
256@@ -415,6 +571,14 @@ sysvinit (2.96-2) unstable; urgency=medium
257
258 -- Dmitry Bogatov <KAction@debian.org> Thu, 28 Nov 2019 21:07:03 +0000
259
260+sysvinit (2.96-1ubuntu1) focal; urgency=low
261+
262+ * Merge from Debian unstable. Remaining changes:
263+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
264+ - Make mountpoint.c compile with new glibc.
265+
266+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Oct 2019 15:59:53 -0700
267+
268 sysvinit (2.96-1) unstable; urgency=medium
269
270 * New upstream release.
271@@ -429,6 +593,21 @@ sysvinit (2.96-1) unstable; urgency=medium
272
273 -- Dmitry Bogatov <KAction@debian.org> Sat, 19 Oct 2019 00:37:48 +0000
274
275+sysvinit (2.96~beta-3ubuntu2) focal; urgency=medium
276+
277+ * Fix debian/rules to not try to install bits into a sysvinit-core package
278+ we aren't building.
279+
280+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 25 Oct 2019 13:21:15 -0700
281+
282+sysvinit (2.96~beta-3ubuntu1) focal; urgency=low
283+
284+ * Merge from Debian unstable. Remaining changes:
285+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
286+ - Make mountpoint.c compile with new glibc.
287+
288+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 18 Oct 2019 14:21:33 -0700
289+
290 sysvinit (2.96~beta-3) unstable; urgency=medium
291
292 * Team upload.
293@@ -482,6 +661,20 @@ sysvinit (2.95-6) unstable; urgency=medium
294
295 -- Dmitry Bogatov <KAction@debian.org> Fri, 23 Aug 2019 16:26:28 +0000
296
297+sysvinit (2.95-5ubuntu2) eoan; urgency=medium
298+
299+ * Adjust debian/rules to fix an arch: all build failure.
300+
301+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 16 Aug 2019 09:01:15 -0700
302+
303+sysvinit (2.95-5ubuntu1) eoan; urgency=low
304+
305+ * Merge from Debian unstable. Remaining changes:
306+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
307+ - Make mountpoint.c compile with new glibc.
308+
309+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 15 Aug 2019 23:55:53 -0700
310+
311 sysvinit (2.95-5) unstable; urgency=medium
312
313 * [2d158bc6] Make default TTYMODE match default TTYPERM of `login' package
314@@ -528,6 +721,14 @@ sysvinit (2.95-3) unstable; urgency=medium
315
316 -- Dmitry Bogatov <KAction@debian.org> Mon, 29 Jul 2019 08:10:44 +0000
317
318+sysvinit (2.95-2ubuntu1) eoan; urgency=low
319+
320+ * Merge from Debian unstable. Remaining changes:
321+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
322+ - Make mountpoint.c compile with new glibc.
323+
324+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 24 Jul 2019 12:32:57 -0700
325+
326 sysvinit (2.95-2) unstable; urgency=medium
327
328 * [22e43c01] Make sure dh_fixperms is called during build.
329@@ -621,6 +822,14 @@ sysvinit (2.93-9) experimental; urgency=medium
330
331 -- Dmitry Bogatov <KAction@debian.org> Thu, 14 Feb 2019 20:55:23 +0000
332
333+sysvinit (2.93-8ubuntu1) eoan; urgency=low
334+
335+ * Merge from Debian unstable. Remaining changes:
336+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
337+ - Make mountpoint.c compile with new glibc.
338+
339+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 29 Apr 2019 22:02:02 -0700
340+
341 sysvinit (2.93-8) unstable; urgency=medium
342
343 * Return alternative dependency on file-rc for convenience of
344@@ -839,6 +1048,19 @@ sysvinit (2.88dsf-59.11) unstable; urgency=medium
345
346 -- Michael Biebl <biebl@debian.org> Sun, 07 Oct 2018 16:04:09 +0200
347
348+sysvinit (2.88dsf-59.10ubuntu2) cosmic; urgency=medium
349+
350+ * Make mountpoint.c compile with new glibc.
351+
352+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 04 Oct 2018 16:32:29 +0100
353+
354+sysvinit (2.88dsf-59.10ubuntu1) bionic; urgency=medium
355+
356+ * Merge with Debian, restoring 6ac609340af19a8d021c5ab8fea50c65241d1d0b:
357+ - When building for Ubuntu, skip all binaries except for sysvinit-utils.
358+
359+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 01 Nov 2017 15:00:29 -0600
360+
361 sysvinit (2.88dsf-59.10) unstable; urgency=medium
362
363 * Non-maintainer upload.
364@@ -5683,3 +5905,4 @@ sysvinit (2.66-1) unstable; urgency=medium
365 /var/log and /etc itself.
366
367 -- Miquel van Smoorenburg <miquels@cistron.nl> Tue, 29 Oct 1996 13:46:54 +0100
368+
369diff --git a/debian/control b/debian/control
370index 118737e..efe07db 100644
371--- a/debian/control
372+++ b/debian/control
373@@ -1,7 +1,8 @@
374 Source: sysvinit
375 Section: admin
376 Priority: optional
377-Maintainer: Debian sysvinit maintainers <debian-init-diversity@chiark.greenend.org.uk>
378+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
379+XSBC-Original-Maintainer: Debian sysvinit maintainers <debian-init-diversity@chiark.greenend.org.uk>
380 Uploaders:
381 Ian Jackson <ijackson@chiark.greenend.org.uk>,
382 Benda Xu <heroxbd@gentoo.org>,
383diff --git a/debian/rules b/debian/rules
384index b5b6497..795eccb 100755
385--- a/debian/rules
386+++ b/debian/rules
387@@ -24,6 +24,10 @@ endif
388
389 DH_OPTIONS =
390
391+ifeq ($(derives_from_ubuntu),yes)
392+ DH_OPTIONS = -Nsysvinit-core -Nsysv-rc -Ninitscripts -Nbootlogd
393+endif
394+
395 # Use debhelper's dh
396 %:
397 dh $@ $(DH_OPTIONS)
398@@ -41,6 +45,7 @@ override_dh_auto_install-indep:
399 override_dh_install-arch:
400 dh_install
401
402+ifneq (,$(findstring sysvinit-core, $(shell dh_listpackages)))
403 # sysvinit package
404 if test -e debian/share/inittab.$(DEB_HOST_GNU_TYPE) ; \
405 then \
406@@ -56,6 +61,7 @@ override_dh_install-arch:
407 $(INSTALL_DATA) debian/share/inittab \
408 $(sysvtmp)/usr/share/sysvinit/inittab ; \
409 fi
410+endif
411
412 # initscripts package may include /sys
413 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
414@@ -65,7 +71,7 @@ endif
415 ifeq ($(derives_from_ubuntu),yes)
416 ifneq (,$(findstring sysvinit-utils, $(shell dh_listpackages)))
417 cp -p debian/src/lsb-base/init-functions.d/50-ubuntu-logging \
418- debian/sysvinit-utils/lib/lsb/init-functions.d/
419+ debian/sysvinit-utils/usr/lib/lsb/init-functions.d/
420 endif
421 endif
422
423@@ -73,9 +79,14 @@ install-arch: build-arch
424 dh $@ $(DH_OPTIONS)
425
426 override_dh_installchangelogs-arch:
427+ifneq ($(derives_from_ubuntu),yes)
428 dh_installchangelogs -psysvinit-core doc/Changelog
429+endif
430 dh_installchangelogs -psysvinit-utils --exclude doc/Changelog
431+
432+ifneq ($(derives_from_ubuntu),yes)
433 dh_installchangelogs -pbootlogd
434+endif
435
436 override_dh_installchangelogs-indep:
437 dh_installchangelogs

Subscribers

People subscribed via source and target branches