Merge ~maxgmr/ubuntu/+source/boxer:merge-lp2134170-resolute into ubuntu/+source/boxer:debian/sid

Proposed by Max Gilmour
Status: Needs review
Proposed branch: ~maxgmr/ubuntu/+source/boxer:merge-lp2134170-resolute
Merge into: ubuntu/+source/boxer:debian/sid
Diff against target: 51 lines (+17/-2)
2 files modified
debian/changelog (+15/-0)
debian/control (+2/-2)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+497003@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Max Gilmour (maxgmr) wrote :

This merge is ready for sponsorship.

Autopkgtests: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-maxgmr-boxer-lp2134170/resolute/amd64/b/boxer/20251205_200708_3e0c1@/log.gz

PPA: https://launchpad.net/~maxgmr/+archive/ubuntu/boxer-lp2134170/+packages

Lintian:
W: boxer source: recommended-field (in section for source) Priority [debian/control:1]

Unmerged commits

43b14f0... by Max Gilmour

Fix changelog

ade62cd... by Max Gilmour

update-maintainer

dddf72d... by Max Gilmour

reconstruct-changelog

1cd4a09... by Max Gilmour

merge-changelogs

f194219... by Vladimir Petko

d/control: remove boxer-data from Recommends; not in Ubuntu (LP: #2058853).

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 b0c0eee..06eec8a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+boxer (1.4.3-2ubuntu1) resolute; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #2134170). Remaining changes:
9+ - d/control: remove boxer-data from Recommends; not in Ubuntu
10+ (LP: #2058853).
11+
12+ -- Max Gilmour <max.gilmour@canonical.com> Fri, 05 Dec 2025 10:10:57 -0800
13+
14 boxer (1.4.3-2) unstable; urgency=medium
15
16 * Team upload.
17@@ -11,6 +19,13 @@ boxer (1.4.3-2) unstable; urgency=medium
18
19 -- gregor herrmann <gregoa@debian.org> Wed, 01 Oct 2025 22:46:38 +0200
20
21+boxer (1.4.3-1ubuntu1) noble; urgency=medium
22+
23+ * d/control: remove boxer-data from Recommends: it is not present in
24+ Ubuntu (LP: #2058853).
25+
26+ -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 25 Mar 2024 08:25:26 +1300
27+
28 boxer (1.4.3-1) unstable; urgency=medium
29
30 [ upstream ]
31diff --git a/debian/control b/debian/control
32index 8a4a026..c823919 100644
33--- a/debian/control
34+++ b/debian/control
35@@ -1,6 +1,7 @@
36 Source: boxer
37 Standards-Version: 4.7.2
38-Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
39+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
40+XSBC-Original-Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
41 Uploaders:
42 Jonas Smedegaard <dr@jones.dk>,
43 Section: admin
44@@ -76,7 +77,6 @@ Depends:
45 libtypes-path-tiny-perl,
46 libyaml-libyaml-perl,
47 Recommends:
48- boxer-data,
49 debootstrap | cdebootstrap | mmdebstrap,
50 mmdebstrap,
51 Suggests:

Subscribers

People subscribed via source and target branches

to all changes: