Merge ~liushuyu-011/ubuntu/+source/cfingerd:merge-lp2065214 into ubuntu/+source/cfingerd:debian/sid

Proposed by Zixing Liu
Status: Needs review
Proposed branch: ~liushuyu-011/ubuntu/+source/cfingerd:merge-lp2065214
Merge into: ubuntu/+source/cfingerd:debian/sid
Diff against target: 54 lines (+19/-2)
2 files modified
debian/changelog (+16/-0)
debian/control (+3/-2)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
Review via email: mp+465802@code.launchpad.net

Description of the change

This MP merges cfingerd changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16127365/+listing-archive-extra

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) :
review: Approve

Unmerged commits

f3f6233... by Zixing Liu

update-maintainer

ef44685... by Zixing Liu

reconstruct-changelog

d3ef273... by Zixing Liu

merge-changelogs

556deec... by Zixing Liu

    - debian/control: Add openbsd-inetd | inet-superserver dependencies,
      as cfingerd needs an inet server to work.

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 92dab1c..641a04c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+cfingerd (1.4.3-8ubuntu1) oracular; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #2065214). Remaining changes:
9+ - debian/control: Add openbsd-inetd | inet-superserver dependencies,
10+ as cfingerd needs an inet server to work.
11+
12+ -- Zixing Liu <zixing.liu@canonical.com> Wed, 08 May 2024 14:24:29 -0600
13+
14 cfingerd (1.4.3-8) unstable; urgency=medium
15
16 * QA upload.
17@@ -24,6 +32,14 @@ cfingerd (1.4.3-6) unstable; urgency=medium
18
19 -- Jelmer Vernooij <jelmer@debian.org> Wed, 25 May 2022 15:20:26 +0100
20
21+cfingerd (1.4.3-5ubuntu1) hirsute; urgency=medium
22+
23+ * Resynchronize on Debian, remaining Ubuntu change
24+ - debian/control: Add openbsd-inetd | inet-superserver dependencies,
25+ as cfingerd needs an inet server to work.
26+
27+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 05 Feb 2021 15:40:24 +0100
28+
29 cfingerd (1.4.3-5) unstable; urgency=medium
30
31 * QA upload.
32diff --git a/debian/control b/debian/control
33index 7bfab95..acd41b8 100644
34--- a/debian/control
35+++ b/debian/control
36@@ -1,7 +1,8 @@
37 Source: cfingerd
38 Section: net
39 Priority: optional
40-Maintainer: Debian QA Group <packages@qa.debian.org>
41+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
42+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
43 Build-Depends: debhelper-compat (= 13)
44 Standards-Version: 4.6.2
45 Vcs-Git: https://salsa.debian.org/debian/cfingerd.git
46@@ -13,7 +14,7 @@ Package: cfingerd
47 Architecture: any
48 Provides: finger-server
49 Conflicts: finger-server
50-Depends: ${shlibs:Depends}, ${misc:Depends}, update-inetd, netbase
51+Depends: ${shlibs:Depends}, ${misc:Depends}, update-inetd, netbase (>=2.00), openbsd-inetd | inet-superserver
52 Description: configurable finger daemon
53 This is a free replacement for standard finger daemons such as GNU
54 fingerd and MIT fingerd. Cfingerd can enable/disable finger services

Subscribers

People subscribed via source and target branches

to all changes: