Launchpad Dependencies

Merge lp:~maxb/meta-lp-deps/no-sshd into lp:meta-lp-deps

  1. no-sshd
  2. Merge into trunk
Proposed by Max Bowsher
Status: Merged
Merged at revision: not available
Proposed branch: lp:~maxb/meta-lp-deps/no-sshd
Merge into: lp:meta-lp-deps
Diff against target: 42 lines (+9/-4)
2 files modified
debian/changelog (+6/-2)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~maxb/meta-lp-deps/no-sshd
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+16280@code.launchpad.net

This proposal supersedes a proposal from 2009-12-17.

To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote : Posted in a previous version of this proposal

I ran the full testsuite without openssh-client/server installed.

Turns out we require openssh-client in *production*, to run ssh-vulnkey on newly added keys.

So I've amended the lp-deps and lp-dev-deps appropriately.

Revision history for this message
Max Bowsher (maxb) wrote :

I ran the full testsuite without openssh-client/server installed.

Turns out we require openssh-client in *production*, to run ssh-vulnkey on newly added keys.

So I've amended the lp-deps and lp-dev-deps appropriately.

Revision history for this message
Max Bowsher (maxb) wrote : Posted in a previous version of this proposal

I pushed to the wrong branch and broke things, see the resubmitted MP instead.

Revision history for this message
Michael Nelson (michael.nelson) wrote :

Thanks Max!

JFTR: I checked with Salgado and he's in agreement (just checked because I've been out of the loop of this discussion).

And for my own learning:

<noodles775> maxb: sorry, I'm not so familiar with the lp dependencies - is there a reason why you've not incremented the version to 0.62 and added a new changelog entry, rather than editing the 0.61 entry that you created with r67?

Is it simply because you're only removing an unneeded dependency, so it won't matter if users are stuck with the original 0.61 version?

review: Approve (code)
Revision history for this message
Max Bowsher (maxb) wrote :

> <noodles775> maxb: sorry, I'm not so familiar with the lp dependencies - is
> there a reason why you've not incremented the version to 0.62 and added a new
> changelog entry, rather than editing the 0.61 entry that you created with r67?
>
> Is it simply because you're only removing an unneeded dependency, so it won't
> matter if users are stuck with the original 0.61 version?

The reason this merge adds to an existing version is because that version has not yet been tagged/uploaded.

(Launchpad wouldn't let us build two things called 0.61 in the same PPA anyway.)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-12-16 10:02:58 +0000
3+++ debian/changelog 2009-12-17 12:49:13 +0000
4@@ -1,9 +1,13 @@
5-launchpad-dependencies (0.61) lucid; urgency=low
6+launchpad-dependencies (0.61) karmic; urgency=low
7
8 * launchpad-developer-dependencies: Remove python-pullparser, which has been
9 removed from Lucid and is not used.
10+ * launchpad-developer-dependencies: Remove ssh, running a sshd is neither
11+ required nor desirable (LP: #495454).
12+ * launchpad-dependencies: Add openssh-client, LP operationally shells out to
13+ ssh-vulnkey when a user adds an SSH key.
14
15- -- Max Bowsher <maxb@f2s.com> Wed, 16 Dec 2009 10:02:15 +0000
16+ -- Max Bowsher <maxb@f2s.com> Thu, 17 Dec 2009 10:44:08 +0000
17
18 launchpad-dependencies (0.60) karmic; urgency=low
19
20
21=== modified file 'debian/control'
22--- debian/control 2009-12-16 10:02:58 +0000
23+++ debian/control 2009-12-17 12:49:13 +0000
24@@ -18,7 +18,8 @@
25 python-magic, geoip-data | geoip-data-city-lite,
26 python-psycopg2 (>= 2.0.7+bzr361-0~CAT.8.04), python-pygments,
27 python-support, python-openid, python2.5-pysqlite2, zlib1g-dev,
28- ca-certificates, python-pyrex, libapr1-dev, libsvn-dev
29+ ca-certificates, python-pyrex, libapr1-dev, libsvn-dev,
30+ openssh-client
31 Recommends: launchpad-database-dependencies (= ${source:Version})
32 Suggests:
33 Description: Metapackage for dependencies of Launchpad
34@@ -38,7 +39,7 @@
35 launchpad-soyuz-dependencies (= ${source:Version}),
36 exuberant-ctags, bzr-pqm, python-clientcookie,
37 postgresql-doc-8.3, postgresql-autodoc, tidy,
38- python-codespeak-lib, pylint, ssh, mhonarc,
39+ python-codespeak-lib, pylint, mhonarc,
40 fakeroot, rsync, spidermonkey-bin, git-core, memcached,
41 xvfb, firefox, xfonts-base
42 Recommends: pyflakes

Subscribers

People subscribed via source and target branches