Merge lp:~lynxman/ubuntu/oneiric/ajaxterm/fixpythonpsyco into lp:ubuntu/oneiric/ajaxterm

Proposed by Marc Cluet
Status: Merged
Merge reported by: Dave Walker
Merged at revision: not available
Proposed branch: lp:~lynxman/ubuntu/oneiric/ajaxterm/fixpythonpsyco
Merge into: lp:ubuntu/oneiric/ajaxterm
Diff against target: 31 lines (+11/-2)
2 files modified
debian/changelog (+9/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~lynxman/ubuntu/oneiric/ajaxterm/fixpythonpsyco
Reviewer Review Type Date Requested Status
Dave Walker (community) Needs Fixing
Ubuntu branches Pending
Review via email: mp+72167@code.launchpad.net

Description of the change

Fix fo bug LP: #829271

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Please update changelog to reflect the reason for moving it from recommends -> suggests is to avoid pulling it into main.

Thanks. :)

review: Needs Fixing
Revision history for this message
Marc Cluet (lynxman) wrote :

> Please update changelog to reflect the reason for moving it from recommends ->
> suggests is to avoid pulling it into main.
>
> Thanks. :)

Fixed!

18. By Marc Cluet

* Fixed changelog to expand description of issue fixed

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 2011-08-17 12:29:51 +0000
3+++ debian/changelog 2011-08-19 11:48:24 +0000
4@@ -1,3 +1,12 @@
5+ajaxterm (0.10-11ubuntu2) oneiric; urgency=low
6+
7+ * Fix for bug LP: #829271
8+ + debian/control: Moved dependency for python-psyco from
9+ Recommends to Suggests to avoid pulling python-psyco
10+ into main
11+
12+ -- Marc Cluet <marc.cluet@ubuntu.com> Fri, 19 Aug 2011 11:40:27 +0100
13+
14 ajaxterm (0.10-11ubuntu1) oneiric; urgency=low
15
16 * Resolutions for issues outlined in MIR (LP: #795159, Closes: 638332):
17
18=== modified file 'debian/control'
19--- debian/control 2011-08-17 12:29:51 +0000
20+++ debian/control 2011-08-19 11:48:24 +0000
21@@ -13,8 +13,8 @@
22 Package: ajaxterm
23 Architecture: all
24 Depends: ${python:Depends}, ${misc:Depends}, adduser
25-Recommends: apache2 | httpd, openssh-server, python-psyco
26-Suggests: openssl
27+Recommends: apache2 | httpd, openssh-server
28+Suggests: openssl, python-psyco
29 Description: Web based terminal written in Python
30 Ajaxterm is a web based terminal written in Python and some AJAX
31 javascript for client side. It can use almost any web browser

Subscribers

People subscribed via source and target branches

to all changes: