Merge lp:~bitglue/openobject-server/fix-debian-builddeps into lp:openobject-server

Proposed by Phil Frost
Status: Needs review
Proposed branch: lp:~bitglue/openobject-server/fix-debian-builddeps
Merge into: lp:openobject-server
Diff against target: 26 lines (+8/-1)
1 file modified
debian/control (+8/-1)
To merge this branch: bzr merge lp:~bitglue/openobject-server/fix-debian-builddeps
Reviewer Review Type Date Requested Status
Phil Frost (community) Approve
OpenERP Core Team Pending
Review via email: mp+141696@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
Phil Frost (bitglue) wrote :

I've found these changes aren't enough to work in all cases. See https://bugs.launchpad.net/openobject-server/+bug/1095709

Since fixing both bugs in separate branches isn't possible without introducing conflicts, I'll withdraw this merge request and work on fixing both.

review: Needs Fixing
Revision history for this message
Phil Frost (bitglue) wrote :

Fix was as simple as adding python-support to Build-Depends. This was suggested by lintian as well as the python-support documentation /usr/share/doc/python-support/README.gz. I've also added ${python:Depends} to Depends as suggested by that same documentation.

review: Approve

Unmerged revisions

4699. By Phil Frost <pfrost@openerpdev>

include python-support in Build-Depends, and depend on ${python:Depends} as suggested by /usr/share/doc/python-support/README.gz

4698. By Phil Frost <pfrost@openerpdev>

apply patch from https://bugs.launchpad.net/openobject-server/+bug/985381

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-12-17 11:22:52 +0000
3+++ debian/control 2013-01-03 17:02:22 +0000
4@@ -2,7 +2,13 @@
5 Section: net
6 Priority: optional
7 Maintainer: OpenERP SA <al@openerp.com>
8-Build-Depends: debhelper (>= 7.0.50~), python, rsync
9+Build-Depends:
10+ debhelper (>= 7.0.50~),
11+ python,
12+ rsync,
13+ python-support,
14+ python-setuptools,
15+ python-pybabel
16 Standards-Version: 3.9.1
17 Homepage: http://www.openerp.com/
18 Vcs-Bzr: https://launchpad.net/openobject
19@@ -12,6 +18,7 @@
20 Architecture: all
21 Depends:
22 ${misc:Depends},
23+ ${python:Depends},
24 adduser,
25 python,
26 postgresql-client,