Ubuntu
tftp-hpa package

Merge ~paelzer/ubuntu/+source/tftp-hpa:lp-1855490-revert-default-path-focal into ubuntu/+source/tftp-hpa:ubuntu/focal-devel

  1. Git
  2. lp:~paelzer/ubuntu/+source/tftp-hpa
  3. lp-1855490-revert-default-path-focal
  4. Merge into ubuntu/focal-devel
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 02110bff3aa99337274e33f466b12405cd80b177
Merge reported by: Christian Ehrhardt 
Merged at revision: 02110bff3aa99337274e33f466b12405cd80b177
Proposed branch: ~paelzer/ubuntu/+source/tftp-hpa:lp-1855490-revert-default-path-focal
Merge into: ubuntu/+source/tftp-hpa:ubuntu/focal-devel
Diff against target: 19 lines (+11/-0) (has conflicts)
1 file modified
debian/changelog (+11/-0)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Alkis Georgopoulos (community) Approve
Canonical Server packageset reviewers Pending
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+376524@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

The requested change seems right and trivial.

Since this wasn't built for quite some releases there might be surprises, so I started PPA [1] to check that in advance to an upload.

[1]: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3860

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Ok, it still builds fine in the PPA.

Revision history for this message
Alkis Georgopoulos (alkisg) wrote :

The .diff seems fine, and I tested the PPA version and it worked out of the box.

There's a small typo in the commit message of https://git.launchpad.net/~paelzer/ubuntu/+source/tftp-hpa/commit/?id=02110bff3aa99337274e33f466b12405cd80b177, it's missing the r in revert.

Great work, thank you!

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/tftp-hpa
 * [new tag] upload/5.2+20150808-1ubuntu4 -> upload/5.2+20150808-1ubuntu4

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading tftp-hpa_5.2+20150808-1ubuntu4.dsc: done.
  Uploading tftp-hpa_5.2+20150808-1ubuntu4.tar.gz: done.
  Uploading tftp-hpa_5.2+20150808-1ubuntu4_source.buildinfo: done.
  Uploading tftp-hpa_5.2+20150808-1ubuntu4_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This completed in Focal -> merged

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 cbd1bc5..74ad00d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+<<<<<<< debian/changelog
7+=======
8+tftp-hpa (5.2+20150808-1ubuntu4) focal; urgency=medium
9+
10+ * debian/tftpd-hpa.templates: revert the default back to /srv/tftp. This
11+ was done mainly for the ltsp-server package but is no more needed
12+ (LP: #1855490).
13+
14+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 09 Dec 2019 16:02:44 +0100
15+
16+>>>>>>> debian/changelog
17 tftp-hpa (5.2+20150808-1ubuntu3) zesty; urgency=medium
18
19 * d/tftpd-hpa.config : Add version guard to avoid rewriting TFTP_ADDRESS

Subscribers

People subscribed via source and target branches