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

Proposed by Max Bowsher
Status: Superseded
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
Launchpad code reviewers Pending
Review via email: mp+16275@code.launchpad.net

This proposal has been superseded by a proposal from 2009-12-17.

To post a comment you must log in.
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 :

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

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches