Mozilla Thunderbird

Merge lp:~bdrung/thunderbird/thunderbird.lunar into lp:thunderbird

  1. thunderbird.lunar
  2. Merge into thunderbird.lunar
Proposed by Benjamin Drung
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 768
Merged at revision: 768
Proposed branch: lp:~bdrung/thunderbird/thunderbird.lunar
Merge into: lp:thunderbird
Diff against target: 58 lines (+11/-3)
5 files modified
debian/build/rules.mk (+1/-1)
debian/changelog (+7/-0)
debian/rules (+1/-1)
debian/thunderbird.dirs.in (+1/-1)
debian/thunderbird.maintscript (+1/-0)
To merge this branch: bzr merge lp:~bdrung/thunderbird/thunderbird.lunar
Reviewer Review Type Date Requested Status
Rico Tzschichholz Needs Fixing
Sebastien Bacher Approve
Review via email: mp+437526@code.launchpad.net

Description of the change

Apport 2.25.0 renamed `/etc/apport/blacklist.d` to `/etc/apport/report-ignore`.

Tested the build and package upgrade locally in a chroot.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

This won't work while older releases receive major/minor release updates. "thunderbird.maintscript" would have to be dependent on the plain existence of /etc/apport/blacklist.d/thunderbird?

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

the easiest there would probably be to remove the version restriction from the .maintscript right?

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Yes, of course this means the move will be attempted every time.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'debian/apport/blacklist.in' => 'debian/apport/report-ignore.in'
2=== modified file 'debian/build/rules.mk'
3--- debian/build/rules.mk 2023-01-26 15:51:10 +0000
4+++ debian/build/rules.mk 2023-02-17 17:08:27 +0000
5@@ -290,7 +290,7 @@
6 common-binary-arch:: make-buildsymbols
7
8 binary-install/$(MOZ_PKG_NAME)::
9- install -m 0644 $(CURDIR)/debian/apport/blacklist $(CURDIR)/debian/$(MOZ_PKG_NAME)/etc/apport/blacklist.d/$(MOZ_PKG_NAME)
10+ install -m 0644 $(CURDIR)/debian/apport/report-ignore $(CURDIR)/debian/$(MOZ_PKG_NAME)/etc/apport/report-ignore/$(MOZ_PKG_NAME)
11 install -m 0644 $(CURDIR)/debian/apport/native-origins $(CURDIR)/debian/$(MOZ_PKG_NAME)/etc/apport/native-origins.d/$(MOZ_PKG_NAME)
12 # Copy hicolor icons (LP: #1639863)
13 $(foreach size,16 22 24 32 48 64 128 256, \
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2023-02-17 12:01:13 +0000
17+++ debian/changelog 2023-02-17 17:08:27 +0000
18@@ -1,3 +1,10 @@
19+thunderbird (1:102.8.0+build2-0ubuntu2) UNRELEASED; urgency=medium
20+
21+ * Rename /etc/apport/blacklist.d to /etc/apport/report-ignore for
22+ Apport >= 2.25.0
23+
24+ -- Benjamin Drung <bdrung@ubuntu.com> Fri, 17 Feb 2023 15:43:45 +0100
25+
26 thunderbird (1:102.8.0+build2-0ubuntu1) lunar; urgency=medium
27
28 * New upstream stable release (102.8.0+build2)
29
30=== modified file 'debian/rules'
31--- debian/rules 2021-08-16 13:24:19 +0000
32+++ debian/rules 2023-02-17 17:08:27 +0000
33@@ -36,7 +36,7 @@
34
35 MOZ_PKGNAME_SUBST_FILES = \
36 debian/$(MOZ_PKG_BASENAME).sh \
37- debian/apport/blacklist \
38+ debian/apport/report-ignore \
39 debian/apport/native-origins \
40 debian/apport/source_$(MOZ_PKG_NAME).py \
41 $(NULL)
42
43=== modified file 'debian/thunderbird.dirs.in'
44--- debian/thunderbird.dirs.in 2013-04-02 22:59:42 +0000
45+++ debian/thunderbird.dirs.in 2023-02-17 17:08:27 +0000
46@@ -4,5 +4,5 @@
47 @MOZ_ADDONDIR@/searchplugins
48 @MOZ_LIBDIR@/distribution/searchplugins/common
49 usr/share/indicators/messages/applications
50-etc/apport/blacklist.d
51+etc/apport/report-ignore
52 etc/apport/native-origins.d
53
54=== added file 'debian/thunderbird.maintscript'
55--- debian/thunderbird.maintscript 1970-01-01 00:00:00 +0000
56+++ debian/thunderbird.maintscript 2023-02-17 17:08:27 +0000
57@@ -0,0 +1,1 @@
58+mv_conffile /etc/apport/blacklist.d/thunderbird /etc/apport/report-ignore/thunderbird 1:102.8.0+build2-0ubuntu2~

Subscribers

People subscribed via source and target branches

to all changes: