Merge ~mateus-morais/ubuntu/+source/cdebconf:merge-0.272-oracular into ubuntu/+source/cdebconf:debian/sid

Proposed by Mateus Rodrigues de Morais
Status: Merged
Merge reported by: Robie Basak
Merged at revision: 5e0dfd4ff43f40fc3bb0b64de47b8a413dd77723
Proposed branch: ~mateus-morais/ubuntu/+source/cdebconf:merge-0.272-oracular
Merge into: ubuntu/+source/cdebconf:debian/sid
Diff against target: 901 lines (+484/-51)
4 files modified
debian/changelog (+456/-0)
debian/control (+8/-2)
debian/rules (+8/-2)
src/modules/frontend/newt/newt.c (+12/-47)
Reviewer Review Type Date Requested Status
Lena Voytek (community) Approve
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+469961@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Lena Voytek (lvoytek) wrote :

LGTM, no new delta on our end and translation updates on Debian side look good. Sponsoring:

dput ubuntu ../cdebconf_0.272ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../cdebconf_0.272ubuntu1_source.changes: Valid signature from 34B8AD7D9529E793
Checking signature on .dsc
gpg: ../cdebconf_0.272ubuntu1.dsc: Valid signature from 34B8AD7D9529E793
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading cdebconf_0.272ubuntu1.dsc: done.
  Uploading cdebconf_0.272ubuntu1.tar.xz: done.
  Uploading cdebconf_0.272ubuntu1_source.buildinfo: done.
  Uploading cdebconf_0.272ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

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 f0d7b51..8b890fe 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+cdebconf (0.272ubuntu1) oracular; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #2073893). Remaining changes:
9+ - Allow to build without udeb packages.
10+ - Read newt palette from /etc/newt/palette, symlinked at
11+ initialisation according to FRONTEND_BACKGROUND.
12+
13+ -- Mateus Rodrigues de Morais <mateus.morais@canonical.com> Tue, 23 Jul 2024 11:25:44 -0300
14+
15 cdebconf (0.272) unstable; urgency=medium
16
17 * Team upload.
18@@ -10,6 +19,32 @@ cdebconf (0.272) unstable; urgency=medium
19
20 -- Holger Wansing <hwansing@mailbox.org> Tue, 28 May 2024 18:42:05 +0200
21
22+cdebconf (0.271ubuntu3) noble; urgency=medium
23+
24+ * No-change rebuild for CVE-2024-3094
25+
26+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 31 Mar 2024 07:29:25 +0000
27+
28+cdebconf (0.271ubuntu2) noble; urgency=medium
29+
30+ * No-change rebuild against libglib2.0-0t64
31+
32+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 08 Mar 2024 04:04:01 +0000
33+
34+cdebconf (0.271ubuntu1) noble; urgency=medium
35+
36+ * Merge with Debian unstable. Remaining changes:
37+ - Allow to build without udeb packages.
38+ - Read newt palette from /etc/newt/palette, symlinked at
39+ initialisation according to FRONTEND_BACKGROUND.
40+ * Dropped changes, no longer relevant since udebs are not built:
41+ - Install palettes for [original, dark, ubuntu].
42+ - Install a default /etc/newt/palette symlink to
43+ /etc/newt/palette.ubuntu.
44+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
45+
46+ -- Nick Rosbrook <enr0n@ubuntu.com> Wed, 29 Nov 2023 16:39:23 -0500
47+
48 cdebconf (0.271) unstable; urgency=medium
49
50 * Team upload.
51@@ -21,6 +56,21 @@ cdebconf (0.271) unstable; urgency=medium
52
53 -- Holger Wansing <hwansing@mailbox.org> Sat, 23 Sep 2023 20:44:21 +0200
54
55+cdebconf (0.270ubuntu1) mantic; urgency=medium
56+
57+ * Merge with Debian
58+ - Drop fuzzy translation for Tibetan, as was done in Debian in 2016
59+ - Remaining changes:
60+ + Read newt palette from /etc/newt/palette, symlinked at
61+ initialisation according to FRONTEND_BACKGROUND.
62+ + Install palettes for [original, dark, ubuntu].
63+ + Install a default /etc/newt/palette symlink to
64+ /etc/newt/palette.ubuntu.
65+ + Don't build cdebconf-{gtk,newt}-udeb on i386.
66+ + Allow to build without udeb packages.
67+
68+ -- Adrien Nader <adrien.nader@canonical.com> Tue, 04 Jul 2023 13:59:53 +0200
69+
70 cdebconf (0.270) unstable; urgency=medium
71
72 [ Cyril Brulebois ]
73@@ -71,6 +121,19 @@ cdebconf (0.268) unstable; urgency=medium
74
75 -- Cyril Brulebois <kibi@debian.org> Wed, 29 Mar 2023 14:28:09 +0200
76
77+cdebconf (0.267ubuntu1) lunar; urgency=medium
78+
79+ * Merge with Debian; remaining changes:
80+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
81+ according to FRONTEND_BACKGROUND.
82+ - Install palettes for [original, dark, ubuntu].
83+ - Install a default /etc/newt/palette symlink to
84+ /etc/newt/palette.ubuntu.
85+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
86+ - Allow to build without udeb packages.
87+
88+ -- Matthias Klose <doko@ubuntu.com> Sat, 18 Feb 2023 12:22:25 +0100
89+
90 cdebconf (0.267) unstable; urgency=medium
91
92 [ Updated translations ]
93@@ -113,6 +176,19 @@ cdebconf (0.265) unstable; urgency=medium
94
95 -- Holger Wansing <hwansing@mailbox.org> Sat, 19 Nov 2022 23:47:52 +0100
96
97+cdebconf (0.264ubuntu1) kinetic; urgency=medium
98+
99+ * Merge with Debian; remaining changes:
100+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
101+ according to FRONTEND_BACKGROUND.
102+ - Install palettes for [original, dark, ubuntu].
103+ - Install a default /etc/newt/palette symlink to
104+ /etc/newt/palette.ubuntu.
105+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
106+ - Allow to build without udeb packages.
107+
108+ -- Matthias Klose <doko@ubuntu.com> Thu, 25 Aug 2022 10:19:35 +0200
109+
110 cdebconf (0.264) unstable; urgency=medium
111
112 * Team upload.
113@@ -151,6 +227,19 @@ cdebconf (0.262) unstable; urgency=medium
114
115 -- Samuel Thibault <sthibault@debian.org> Thu, 14 Apr 2022 00:36:19 +0200
116
117+cdebconf (0.261ubuntu1) jammy; urgency=medium
118+
119+ * Merge with Debian; remaining changes:
120+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
121+ according to FRONTEND_BACKGROUND.
122+ - Install palettes for [original, dark, ubuntu].
123+ - Install a default /etc/newt/palette symlink to
124+ /etc/newt/palette.ubuntu.
125+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
126+ - Allow to build without udeb packages.
127+
128+ -- Matthias Klose <doko@ubuntu.com> Fri, 04 Feb 2022 22:56:59 +0100
129+
130 cdebconf (0.261) unstable; urgency=medium
131
132 * Team upload.
133@@ -234,6 +323,36 @@ cdebconf (0.257) unstable; urgency=medium
134
135 -- Holger Wansing <hwansing@mailbox.org> Fri, 19 Mar 2021 19:21:24 +0100
136
137+cdebconf (0.256ubuntu4) impish; urgency=medium
138+
139+ * No-change rebuild to build packages with zstd compression.
140+
141+ -- Matthias Klose <doko@ubuntu.com> Thu, 07 Oct 2021 12:10:03 +0200
142+
143+cdebconf (0.256ubuntu3) hirsute; urgency=medium
144+
145+ * Allow to build without udeb packages.
146+
147+ -- Matthias Klose <doko@ubuntu.com> Thu, 25 Feb 2021 13:33:22 +0100
148+
149+cdebconf (0.256ubuntu2) hirsute; urgency=medium
150+
151+ * No-change rebuild to drop the udeb package.
152+
153+ -- Matthias Klose <doko@ubuntu.com> Mon, 22 Feb 2021 10:30:25 +0100
154+
155+cdebconf (0.256ubuntu1) hirsute; urgency=low
156+
157+ * Merge from Debian unstable. Remaining changes:
158+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
159+ according to FRONTEND_BACKGROUND.
160+ - Install palettes for [original, dark, ubuntu].
161+ - Install a default /etc/newt/palette symlink to
162+ /etc/newt/palette.ubuntu.
163+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
164+
165+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 06 Jan 2021 18:01:37 -0800
166+
167 cdebconf (0.256) unstable; urgency=medium
168
169 * Team upload
170@@ -246,6 +365,18 @@ cdebconf (0.256) unstable; urgency=medium
171
172 -- Holger Wansing <hwansing@mailbox.org> Wed, 30 Dec 2020 22:45:44 +0100
173
174+cdebconf (0.255ubuntu1) hirsute; urgency=low
175+
176+ * Merge from Debian unstable. Remaining changes:
177+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
178+ according to FRONTEND_BACKGROUND.
179+ - Install palettes for [original, dark, ubuntu].
180+ - Install a default /etc/newt/palette symlink to
181+ /etc/newt/palette.ubuntu.
182+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
183+
184+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 05 Nov 2020 15:59:19 -0800
185+
186 cdebconf (0.255) unstable; urgency=medium
187
188 [ Samuel Thibault ]
189@@ -263,6 +394,18 @@ cdebconf (0.255) unstable; urgency=medium
190
191 -- Holger Wansing <hwansing@mailbox.org> Wed, 28 Oct 2020 23:16:46 +0100
192
193+cdebconf (0.254ubuntu1) hirsute; urgency=low
194+
195+ * Merge from Debian unstable. Remaining changes:
196+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
197+ according to FRONTEND_BACKGROUND.
198+ - Install palettes for [original, dark, ubuntu].
199+ - Install a default /etc/newt/palette symlink to
200+ /etc/newt/palette.ubuntu.
201+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
202+
203+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 24 Oct 2020 17:11:51 -0700
204+
205 cdebconf (0.254) unstable; urgency=medium
206
207 * Team upload
208@@ -284,6 +427,18 @@ cdebconf (0.253) unstable; urgency=medium
209
210 -- Holger Wansing <hwansing@mailbox.org> Sun, 05 Jul 2020 21:36:47 +0200
211
212+cdebconf (0.252ubuntu1) groovy; urgency=low
213+
214+ * Merge from Debian unstable. Remaining changes:
215+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
216+ according to FRONTEND_BACKGROUND.
217+ - Install palettes for [original, dark, ubuntu].
218+ - Install a default /etc/newt/palette symlink to
219+ /etc/newt/palette.ubuntu.
220+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
221+
222+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 09 Jun 2020 13:14:47 -0700
223+
224 cdebconf (0.252) unstable; urgency=medium
225
226 * Team upload
227@@ -301,6 +456,18 @@ cdebconf (0.252) unstable; urgency=medium
228
229 -- Holger Wansing <hwansing@mailbox.org> Sun, 10 May 2020 17:45:10 +0200
230
231+cdebconf (0.251ubuntu1) focal; urgency=low
232+
233+ * Merge from Debian unstable. Remaining changes:
234+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
235+ according to FRONTEND_BACKGROUND.
236+ - Install palettes for [original, dark, ubuntu].
237+ - Install a default /etc/newt/palette symlink to
238+ /etc/newt/palette.ubuntu.
239+ - Don't build cdebconf-{gtk,newt}-udeb on i386.
240+
241+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 01 Feb 2020 21:18:17 -0800
242+
243 cdebconf (0.251) unstable; urgency=medium
244
245 * Team upload
246@@ -311,6 +478,23 @@ cdebconf (0.251) unstable; urgency=medium
247
248 -- Holger Wansing <hwansing@mailbox.org> Fri, 31 Jan 2020 23:08:40 +0100
249
250+cdebconf (0.250ubuntu2) focal; urgency=medium
251+
252+ * Don't build cdebconf-{gtk,newt}-udeb on i386.
253+
254+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 20 Dec 2019 17:54:42 +0000
255+
256+cdebconf (0.250ubuntu1) focal; urgency=low
257+
258+ * Merge from Debian unstable. Remaining changes:
259+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
260+ according to FRONTEND_BACKGROUND.
261+ - Install palettes for [original, dark, ubuntu].
262+ - Install a default /etc/newt/palette symlink to
263+ /etc/newt/palette.ubuntu.
264+
265+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 25 Oct 2019 21:15:28 -0700
266+
267 cdebconf (0.250) unstable; urgency=medium
268
269 * Team upload.
270@@ -329,6 +513,17 @@ cdebconf (0.250) unstable; urgency=medium
271
272 -- Holger Wansing <hwansing@mailbox.org> Sat, 19 Oct 2019 23:13:58 +0200
273
274+cdebconf (0.249ubuntu1) eoan; urgency=low
275+
276+ * Merge from Debian unstable. Remaining changes:
277+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
278+ according to FRONTEND_BACKGROUND.
279+ - Install palettes for [original, dark, ubuntu].
280+ - Install a default /etc/newt/palette symlink to
281+ /etc/newt/palette.ubuntu.
282+
283+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 22 Apr 2019 12:49:42 -0700
284+
285 cdebconf (0.249) unstable; urgency=medium
286
287 * Team upload.
288@@ -346,6 +541,17 @@ cdebconf (0.248) unstable; urgency=medium
289
290 -- Samuel Thibault <sthibault@debian.org> Fri, 01 Mar 2019 19:00:17 -0800
291
292+cdebconf (0.247ubuntu1) disco; urgency=low
293+
294+ * Merge from Debian unstable. Remaining changes:
295+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
296+ according to FRONTEND_BACKGROUND.
297+ - Install palettes for [original, dark, ubuntu].
298+ - Install a default /etc/newt/palette symlink to
299+ /etc/newt/palette.ubuntu.
300+
301+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Feb 2019 11:33:41 -0800
302+
303 cdebconf (0.247) unstable; urgency=medium
304
305 * Team upload.
306@@ -359,6 +565,17 @@ cdebconf (0.247) unstable; urgency=medium
307
308 -- Holger Wansing <hwansing@mailbox.org> Sat, 09 Feb 2019 17:26:54 +0100
309
310+cdebconf (0.246ubuntu1) disco; urgency=low
311+
312+ * Merge from Debian unstable. Remaining changes:
313+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
314+ according to FRONTEND_BACKGROUND.
315+ - Install palettes for [original, dark, ubuntu].
316+ - Install a default /etc/newt/palette symlink to
317+ /etc/newt/palette.ubuntu.
318+
319+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 31 Jan 2019 23:05:46 -0800
320+
321 cdebconf (0.246) unstable; urgency=medium
322
323 * Team upload.
324@@ -396,6 +613,17 @@ cdebconf (0.245) unstable; urgency=medium
325
326 -- Holger Wansing <hwansing@mailbox.org> Wed, 26 Sep 2018 22:04:21 +0200
327
328+cdebconf (0.244ubuntu1) cosmic; urgency=low
329+
330+ * Merge from Debian unstable. Remaining changes:
331+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
332+ according to FRONTEND_BACKGROUND.
333+ - Install palettes for [original, dark, ubuntu].
334+ - Install a default /etc/newt/palette symlink to
335+ /etc/newt/palette.ubuntu.
336+
337+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 19 Sep 2018 03:07:26 +0200
338+
339 cdebconf (0.244) unstable; urgency=medium
340
341 * Team upload.
342@@ -643,6 +871,19 @@ cdebconf (0.214) unstable; urgency=medium
343
344 -- Christian Perrier <bubulle@debian.org> Fri, 15 Jul 2016 19:51:11 +0200
345
346+cdebconf (0.213ubuntu1) yakkety; urgency=medium
347+
348+ * Merge from Debian unstable. Remaining changes:
349+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
350+ according to FRONTEND_BACKGROUND.
351+ - Install palettes for [original, dark, ubuntu].
352+ - Install a default /etc/newt/palette symlink to
353+ /etc/newt/palette.ubuntu.
354+ * Drop Vcs-Bzr:. Merges into bzr from git are really inconvenient, and there
355+ hasn't been any Ubuntu development for this package in years.
356+
357+ -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 08 Jun 2016 11:57:08 +0200
358+
359 cdebconf (0.213) unstable; urgency=medium
360
361 * Rebuild with translations really back in place...:-)
362@@ -766,6 +1007,17 @@ cdebconf (0.199) unstable; urgency=medium
363
364 -- Christian Perrier <bubulle@debian.org> Mon, 30 Nov 2015 07:19:19 +0100
365
366+cdebconf (0.198ubuntu1) xenial; urgency=low
367+
368+ * Merge from Debian unstable. Remaining changes:
369+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
370+ according to FRONTEND_BACKGROUND.
371+ - Install palettes for [original, dark, ubuntu].
372+ - Install a default /etc/newt/palette symlink to
373+ /etc/newt/palette.ubuntu.
374+
375+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 26 Nov 2015 21:49:45 +0100
376+
377 cdebconf (0.198) unstable; urgency=medium
378
379 [ Regis Boudin ]
380@@ -833,6 +1085,17 @@ cdebconf (0.193) unstable; urgency=medium
381
382 -- Christian Perrier <bubulle@debian.org> Wed, 13 May 2015 06:59:16 +0200
383
384+cdebconf (0.192ubuntu1) vivid; urgency=medium
385+
386+ * Resynchronise with Debian. Remaining changes:
387+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
388+ according to FRONTEND_BACKGROUND.
389+ - Install palettes for [original, dark, ubuntu].
390+ - Install a default /etc/newt/palette symlink to
391+ /etc/newt/palette.ubuntu.
392+
393+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 11 Nov 2014 13:23:44 +0000
394+
395 cdebconf (0.192) unstable; urgency=low
396
397 * Drop cdebconf-slang-udeb from debian/control instead of using the
398@@ -843,6 +1106,17 @@ cdebconf (0.192) unstable; urgency=low
399
400 -- Christian Perrier <bubulle@debian.org> Tue, 09 Sep 2014 08:39:44 +0200
401
402+cdebconf (0.191ubuntu1) utopic; urgency=medium
403+
404+ * Resynchronise with Debian. Remaining changes:
405+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
406+ according to FRONTEND_BACKGROUND.
407+ - Install palettes for [original, dark, ubuntu].
408+ - Install a default /etc/newt/palette symlink to
409+ /etc/newt/palette.ubuntu.
410+
411+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 05 Jun 2014 10:53:24 +0100
412+
413 cdebconf (0.191) unstable; urgency=low
414
415 [ Updated translations ]
416@@ -850,6 +1124,17 @@ cdebconf (0.191) unstable; urgency=low
417
418 -- Christian Perrier <bubulle@debian.org> Wed, 14 May 2014 06:43:40 +0200
419
420+cdebconf (0.190ubuntu1) utopic; urgency=medium
421+
422+ * Resynchronise with Debian. Remaining changes:
423+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
424+ according to FRONTEND_BACKGROUND.
425+ - Install palettes for [original, dark, ubuntu].
426+ - Install a default /etc/newt/palette symlink to
427+ /etc/newt/palette.ubuntu.
428+
429+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 30 Apr 2014 10:34:40 +0100
430+
431 cdebconf (0.190) unstable; urgency=medium
432
433 * Resize banner when window width and banner width don't match
434@@ -882,6 +1167,17 @@ cdebconf (0.188) unstable; urgency=medium
435
436 -- Cyril Brulebois <kibi@debian.org> Fri, 28 Feb 2014 21:49:31 +0300
437
438+cdebconf (0.187ubuntu1) trusty; urgency=medium
439+
440+ * Resynchronise with Debian. Remaining changes:
441+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
442+ according to FRONTEND_BACKGROUND.
443+ - Install palettes for [original, dark, ubuntu].
444+ - Install a default /etc/newt/palette symlink to
445+ /etc/newt/palette.ubuntu.
446+
447+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 13 Jan 2014 18:23:04 +0000
448+
449 cdebconf (0.187) unstable; urgency=medium
450
451 * Convert library packages to multiarch.
452@@ -895,6 +1191,17 @@ cdebconf (0.186) unstable; urgency=low
453
454 -- Christian Perrier <bubulle@debian.org> Sun, 15 Dec 2013 14:13:01 +0100
455
456+cdebconf (0.185ubuntu1) trusty; urgency=low
457+
458+ * Resynchronise with Debian. Remaining changes:
459+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
460+ according to FRONTEND_BACKGROUND.
461+ - Install palettes for [original, dark, ubuntu].
462+ - Install a default /etc/newt/palette symlink to
463+ /etc/newt/palette.ubuntu.
464+
465+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 25 Oct 2013 17:56:30 +0100
466+
467 cdebconf (0.185) unstable; urgency=low
468
469 * Drop useless shlibs.local file. Thanks to Sven Joachim
470@@ -956,6 +1263,17 @@ cdebconf (0.183) unstable; urgency=low
471
472 -- Christian Perrier <bubulle@debian.org> Tue, 16 Jul 2013 20:29:00 +0200
473
474+cdebconf (0.182ubuntu1) saucy; urgency=low
475+
476+ * Resynchronise with Debian. Remaining changes:
477+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
478+ according to FRONTEND_BACKGROUND.
479+ - Install palettes for [original, dark, ubuntu].
480+ - Install a default /etc/newt/palette symlink to
481+ /etc/newt/palette.ubuntu.
482+
483+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 30 Apr 2013 01:10:07 +0100
484+
485 cdebconf (0.182) unstable; urgency=low
486
487 [ Updated translations ]
488@@ -963,6 +1281,17 @@ cdebconf (0.182) unstable; urgency=low
489
490 -- Christian Perrier <bubulle@debian.org> Sat, 30 Mar 2013 16:00:24 +0100
491
492+cdebconf (0.181ubuntu1) raring; urgency=low
493+
494+ * Resynchronise with Debian. Remaining changes:
495+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
496+ according to FRONTEND_BACKGROUND.
497+ - Install palettes for [original, dark, ubuntu].
498+ - Install a default /etc/newt/palette symlink to
499+ /etc/newt/palette.ubuntu.
500+
501+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 08 Jan 2013 16:24:51 +0000
502+
503 cdebconf (0.181) unstable; urgency=low
504
505 * Fix the display of info messages (e.g. “Rescue mode”) by aligning them
506@@ -979,6 +1308,31 @@ cdebconf (0.180) unstable; urgency=low
507
508 -- Christian Perrier <bubulle@debian.org> Sun, 09 Dec 2012 16:33:29 +0100
509
510+cdebconf (0.179ubuntu3) raring; urgency=low
511+
512+ * Call newtInit after establishing /etc/newt/palette symlink.
513+ * Reformat palettes to match upstream file format in newt 0.52.13
514+ (LP: #1089331).
515+
516+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 13 Dec 2012 13:13:42 +0000
517+
518+cdebconf (0.179ubuntu2) raring; urgency=low
519+
520+ * Rebuild against libnewt-dev with fixed libnewt.so symlink.
521+
522+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 28 Nov 2012 15:21:41 +0000
523+
524+cdebconf (0.179ubuntu1) raring; urgency=low
525+
526+ * Resynchronise with Debian. Remaining changes:
527+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
528+ according to FRONTEND_BACKGROUND.
529+ - Install palettes for [original, dark, ubuntu].
530+ - Install a default /etc/newt/palette symlink to
531+ /etc/newt/palette.ubuntu.
532+
533+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 28 Nov 2012 13:24:36 +0000
534+
535 cdebconf (0.179) unstable; urgency=low
536
537 [ Updated translations ]
538@@ -1077,6 +1431,17 @@ cdebconf (0.173) unstable; urgency=low
539
540 -- Christian Perrier <bubulle@debian.org> Sat, 25 Aug 2012 08:10:43 +0200
541
542+cdebconf (0.172ubuntu1) quantal; urgency=low
543+
544+ * Resynchronise with Debian. Remaining changes:
545+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
546+ according to FRONTEND_BACKGROUND.
547+ - Install palettes for [original, dark, ubuntu].
548+ - Install a default /etc/newt/palette symlink to
549+ /etc/newt/palette.ubuntu.
550+
551+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 20 Aug 2012 18:23:32 +0100
552+
553 cdebconf (0.172) unstable; urgency=low
554
555 * Add myself to Uploaders and remove inactive developers from there
556@@ -1096,6 +1461,17 @@ cdebconf (0.171) unstable; urgency=low
557
558 -- Christian Perrier <bubulle@debian.org> Tue, 03 Jul 2012 23:15:58 +0200
559
560+cdebconf (0.170ubuntu1) quantal; urgency=low
561+
562+ * Resynchronise with Debian. Remaining changes:
563+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
564+ according to FRONTEND_BACKGROUND.
565+ - Install palettes for [original, dark, ubuntu].
566+ - Install a default /etc/newt/palette symlink to
567+ /etc/newt/palette.ubuntu.
568+
569+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 03 Jul 2012 11:11:30 +0100
570+
571 cdebconf (0.170) unstable; urgency=low
572
573 * Team upload
574@@ -1141,6 +1517,17 @@ cdebconf (0.167) unstable; urgency=low
575
576 -- Christian Perrier <bubulle@debian.org> Thu, 21 Jun 2012 20:35:02 +0200
577
578+cdebconf (0.166ubuntu1) quantal; urgency=low
579+
580+ * Resynchronise with Debian. Remaining changes:
581+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
582+ according to FRONTEND_BACKGROUND.
583+ - Install palettes for [original, dark, ubuntu].
584+ - Install a default /etc/newt/palette symlink to
585+ /etc/newt/palette.ubuntu.
586+
587+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 21 Jun 2012 10:16:15 +0100
588+
589 cdebconf (0.166) unstable; urgency=low
590
591 * Team upload
592@@ -1200,6 +1587,17 @@ cdebconf (0.162) unstable; urgency=low
593
594 -- Christian Perrier <bubulle@debian.org> Fri, 15 Jun 2012 18:41:25 +0200
595
596+cdebconf (0.161ubuntu1) quantal; urgency=low
597+
598+ * Resynchronise with Debian. Remaining changes:
599+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
600+ according to FRONTEND_BACKGROUND.
601+ - Install palettes for [original, dark, ubuntu].
602+ - Install a default /etc/newt/palette symlink to
603+ /etc/newt/palette.ubuntu.
604+
605+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 11 Jun 2012 14:14:04 +0100
606+
607 cdebconf (0.161) unstable; urgency=low
608
609 [Christian Perrier]
610@@ -1223,6 +1621,17 @@ cdebconf (0.161) unstable; urgency=low
611
612 -- Regis Boudin <regis@debian.org> Sun, 10 Jun 2012 14:33:35 +0200
613
614+cdebconf (0.160ubuntu1) quantal; urgency=low
615+
616+ * Resynchronise with Debian. Remaining changes:
617+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
618+ according to FRONTEND_BACKGROUND.
619+ - Install palettes for [original, dark, ubuntu].
620+ - Install a default /etc/newt/palette symlink to
621+ /etc/newt/palette.ubuntu.
622+
623+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 07 May 2012 15:40:38 +0100
624+
625 cdebconf (0.160) unstable; urgency=high
626
627 * Fix cdebconf-gtk regression from 0.159 causing a fatal error on startup
628@@ -1257,6 +1666,18 @@ cdebconf (0.159) unstable; urgency=low
629
630 -- Regis Boudin <regis@debian.org> Mon, 12 Mar 2012 20:18:10 +0100
631
632+cdebconf (0.158ubuntu1) precise; urgency=low
633+
634+ * Resynchronise with Debian. Remaining changes:
635+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
636+ according to FRONTEND_BACKGROUND.
637+ - Install palettes for [original, dark, ubuntu].
638+ - Install a default /etc/newt/palette symlink to
639+ /etc/newt/palette.ubuntu.
640+ * Build cleanly with glib >= 2.31.
641+
642+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 20 Dec 2011 17:56:04 +0000
643+
644 cdebconf (0.158) unstable; urgency=low
645
646 [ Regis Boudin ]
647@@ -1283,6 +1704,17 @@ cdebconf (0.158) unstable; urgency=low
648
649 -- Regis Boudin <regis@debian.org> Sun, 20 Nov 2011 14:45:06 +0000
650
651+cdebconf (0.157ubuntu1) precise; urgency=low
652+
653+ * Resynchronise with Debian. Remaining changes:
654+ - Read newt palette from /etc/newt/palette, symlinked at initialisation
655+ according to FRONTEND_BACKGROUND.
656+ - Install palettes for [original, dark, ubuntu].
657+ - Install a default /etc/newt/palette symlink to
658+ /etc/newt/palette.ubuntu.
659+
660+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 17 Oct 2011 22:48:23 +0100
661+
662 cdebconf (0.157) unstable; urgency=low
663
664 [ Regis Boudin ]
665@@ -1363,6 +1795,29 @@ cdebconf (0.155) unstable; urgency=low
666
667 -- Christian Perrier <bubulle@debian.org> Fri, 22 Apr 2011 22:33:35 +0200
668
669+cdebconf (0.154ubuntu2) natty; urgency=low
670+
671+ Fix for LP: #730672
672+ * src/modules/frontend/newt/newt.c:
673+ - use Ubuntu newt's new ability to read palette from configuration file
674+ - establish a symlink to /etc/newt/palette at initialization according
675+ to an optional FRONTEND_BACKGROUND kernel parameter
676+ * debian/palette*, debian/cdebconf-newt-udeb.install:
677+ - install palettes for [original, dark, ubuntu]
678+ - install a default /etc/newt/palette symlink to /etc/newt/palette.ubuntu
679+ - other derivatives can install their palette at /etc/newt/palette.FOO
680+ and set the FRONTEND_BACKGROUND=FOO kernel parameter
681+
682+ -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 29 Mar 2011 12:22:21 -0500
683+
684+cdebconf (0.154ubuntu1) natty; urgency=low
685+
686+ * Appease compiler warnings in align_text_renderer_render. (In practice
687+ x_offset and y_offset are never uninitialised here, but knowing that
688+ requires knowing that cell_area can never be NULL.)
689+
690+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 23 Feb 2011 13:32:53 +0000
691+
692 cdebconf (0.154) unstable; urgency=low
693
694 [ Joey Hess ]
695@@ -4426,3 +4881,4 @@ cdebconf (0.10-1) experimental; urgency=low
696 * Initial Release.
697
698 -- Randolph Chung <tausq@debian.org> Sun, 1 Oct 2000 15:54:15 -0700
699+
700diff --git a/debian/control b/debian/control
701index de3d32e..0b67d83 100644
702--- a/debian/control
703+++ b/debian/control
704@@ -15,7 +15,8 @@ Build-Depends:
705 libselinux1-dev [linux-any] | libselinux-dev [linux-any],
706 dh-autoreconf,
707 dh-exec,
708-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
709+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
710+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
711 Uploaders:
712 Colin Watson <cjwatson@debian.org>,
713 Cyril Brulebois <kibi@debian.org>
714@@ -82,6 +83,7 @@ Priority: standard
715 Depends: ${shlibs:Depends}, ${misc:Depends}
716 Provides: debconf-2.0
717 Package-Type: udeb
718+Build-Profiles: <!noudeb>
719 Description: Debian Configuration Management System (C-implementation)
720 Debconf is a configuration management system for Debian packages. It is
721 used by some packages to prompt you for information before they are
722@@ -97,6 +99,7 @@ Section: debian-installer
723 Priority: standard
724 Depends: cdebconf-udeb, ${misc:Depends}
725 Package-Type: udeb
726+Build-Profiles: <!noudeb>
727 XB-Installer-Menu-Item: 93000
728 Description: Change debconf priority
729 This is a udeb that allows you to change the priority limit for the
730@@ -107,6 +110,7 @@ Architecture: any
731 Section: debian-installer
732 Depends: ${shlibs:Depends}, ${misc:Depends}, cdebconf-udeb
733 Package-Type: udeb
734+Build-Profiles: <!noudeb>
735 Description: Debian Configuration Management System (C-implementation)
736 Debconf is a configuration management system for Debian packages. It is
737 used by some packages to prompt you for information before they are
738@@ -120,6 +124,7 @@ Architecture: any
739 Section: debian-installer
740 Depends: cdebconf-udeb, ${shlibs:Depends}, ${misc:Depends}
741 Package-Type: udeb
742+Build-Profiles: <!noudeb>
743 Description: Plain text frontend for Debian Configuration Management System
744 Debconf is a configuration management system for Debian packages. It is
745 used by some packages to prompt you for information before they are
746@@ -134,6 +139,7 @@ Architecture: any
747 Section: debian-installer
748 Depends: cdebconf-udeb, di-utils-terminfo, ${shlibs:Depends}, ${misc:Depends}
749 Package-Type: udeb
750+Build-Profiles: <!noudeb>
751 Description: Newt frontend for Debian Configuration Management System
752 Debconf is a configuration management system for Debian packages. It is
753 used by some packages to prompt you for information before they are
754@@ -148,7 +154,7 @@ Architecture: any
755 Section: debian-installer
756 Depends: cdebconf-udeb, ${shlibs:Depends}, ${misc:Depends}, rootskel-gtk [!s390 !s390x]
757 Package-Type: udeb
758-Build-Profiles: <!pkg.cdebconf.nogtk>
759+Build-Profiles: <!pkg.cdebconf.nogtk !noudeb>
760 Description: Gtk+ frontend for Debian Configuration Management System
761 Debconf is a configuration management system for Debian packages. It is
762 used by some packages to prompt you for information before they are
763diff --git a/debian/rules b/debian/rules
764index a66e684..3ee2ec0 100755
765--- a/debian/rules
766+++ b/debian/rules
767@@ -12,6 +12,10 @@ udebbuild=debian/build-udeb
768
769 include /usr/share/dpkg/architecture.mk
770
771+ifeq (,$(filter noudeb, $(DEB_BUILD_PROFILES)))
772+ with_udeb = yes
773+endif
774+
775 CONFFILE=/etc/cdebconf.conf
776
777 #package names
778@@ -42,7 +46,7 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
779 DEBUG_CONFIGURE_OPT=--with-debug=yes
780 endif
781
782-build: build-deb build-udeb
783+build: build-deb $(if $(with_udeb),build-udeb)
784
785 build-arch: build
786 build-indep: build
787@@ -104,7 +108,9 @@ install-arch: build
788 dh_testroot
789 dh_prep
790 $(MAKE) -C $(debbuild) install DESTDIR=$(CURDIR)/debian/tmp/deb
791+ifeq ($(with_udeb),yes)
792 $(MAKE) -C $(udebbuild) install DESTDIR=$(CURDIR)/debian/tmp/udeb
793+endif
794 dh_install -a
795
796 install-indep:
797@@ -146,7 +152,7 @@ endif
798 dh_strip -a
799 dh_compress -a
800 dh_fixperms -a
801- dh_makeshlibs -a --add-udeb=libdebconfclient0-udeb
802+ dh_makeshlibs -a $(if $(with_udeb),--add-udeb=libdebconfclient0-udeb)
803 dh_installdeb -a
804 dh_shlibdeps -a
805 dh_gencontrol -a
806diff --git a/src/modules/frontend/newt/newt.c b/src/modules/frontend/newt/newt.c
807index ee754a2..838ff2f 100644
808--- a/src/modules/frontend/newt/newt.c
809+++ b/src/modules/frontend/newt/newt.c
810@@ -72,47 +72,6 @@ struct newt_data {
811 struct question *scale_info;
812 };
813
814-struct newtColors newtAltColorPalette = {
815- /*"white", "blue",*/ /* root fg, bg */
816- "white", "black", /* root fg, bg */
817- /*"black", "lightgray",*/ /* border fg, bg */
818- "white", "black", /* border fg, bg */
819- /*"black", "lightgray",*/ /* window fg, bg */
820- "white", "black", /* window fg, bg */
821- /*"white", "black",*/ /* shadow fg, bg */
822- "white", "black", /* shadow fg, bg */
823- /*"red", "lightgray",*/ /* title fg, bg */
824- "yellow", "black", /* title fg, bg */
825- /*"brightred", "gray",*/ /* button fg, bg */
826- "black", "lightgray", /* button fg, bg */
827- "gray", "brightred", /* active button fg, bg */
828- "white", "gray", /* checkbox fg, bg */
829- /*"yellow", "brown",*/ /* active checkbox fg, bg */
830- "black", "lightgray", /* active checkbox fg, bg */
831- /*"yellow", "blue",*/ /* entry box fg, bg */
832- "white", "black", /* entry box fg, bg */
833- /*"blue", "lightgray",*/ /* label fg, bg */
834- "brightred", "black", /* label fg, bg */
835- /*"black", "lightgray",*/ /* listbox fg, bg */
836- "white", "black", /* listbox fg, bg */
837- "yellow", "blue", /* active listbox fg, bg */
838- /*"black", "lightgray",*/ /* textbox fg, bg */
839- "white", "black", /* textbox fg, bg */
840- "lightgray", "black", /* active textbox fg, bg */
841- /*"white", "blue",*/ /* help line */
842- "white", "black", /* help line */
843- "yellow", "blue", /* root text */
844- /*"blue",*/ /* scale full */
845- "black", /* scale full */
846- /*"red",*/ /* scale empty */
847- "blue", /* scale empty */
848- "blue", "lightgray", /* disabled entry fg, bg */
849- /*"black", "lightgray",*/ /* compact button fg, bg */
850- "white", "black", /* compact button fg, bg */
851- "black", "lightgray", /* active & sel listbox */
852- "black", "brown" /* selected listbox */
853-};
854-
855 typedef int (newt_handler)(struct frontend *obj, struct question *q);
856
857 struct newt_help_callback_data {
858@@ -194,7 +153,6 @@ cdebconf_newt_setup(void)
859 {
860 SLang_init_tty(0, 1, 0); /* disable flow control */
861 newtInit();
862- newtSetColors(newtAltColorPalette);
863 newtCls();
864 }
865
866@@ -1120,7 +1078,7 @@ newt_handler_error(struct frontend *obj, struct question *q)
867 {
868 char *oldrootBg, *oldshadowBg, *oldhelpLineFg, *oldhelpLineBg;
869 int ret;
870- struct newtColors palette = newtAltColorPalette;
871+ struct newtColors palette = newtDefaultColorPalette;
872
873 oldrootBg = palette.rootBg;
874 oldshadowBg = palette.shadowBg;
875@@ -1190,15 +1148,22 @@ newt_initialize(struct frontend *obj, struct configuration *conf)
876 {
877 int width = 80, height = 24;
878 const char *palette;
879+ const char *base = "/etc/newt/palette";
880+ char *path;
881
882 obj->interactive = 1;
883 obj->data = calloc(1, sizeof(struct newt_data));
884 SLang_init_tty(0, 1, 0); /* disable flow control */
885- newtInit();
886 palette = getenv("FRONTEND_BACKGROUND");
887- if (palette == NULL || strcmp(palette, "dark") != 0)
888- newtAltColorPalette = newtDefaultColorPalette;
889- newtSetColors(newtAltColorPalette);
890+ if (palette != NULL && asprintf(&path, "%s.%s", base, palette) >= 0) {
891+ /* Establish a symlink from /etc/newt/palette to
892+ * /etc/newt/palette.$FRONTEND_BACKGROUND
893+ */
894+ unlink(base);
895+ link(path, base);
896+ free(path);
897+ }
898+ newtInit();
899 newtGetScreenSize(&width, &height);
900 newtFinished();
901 return DC_OK;

Subscribers

People subscribed via source and target branches