Ubuntu
ubuntuone-installer package

Merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/fix-ftbfs into lp:ubuntu/oneiric/ubuntuone-installer

  1. Oneiric (11.10)
  2. fix-ftbfs
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 3
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-installer/fix-ftbfs
Merge into: lp:ubuntu/oneiric/ubuntuone-installer
Diff against target: 41 lines (+7/-8)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-2)
debian/rules (+0/-6)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/fix-ftbfs
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+72429@code.launchpad.net
To post a comment you must log in.

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:00:40 +0000
3+++ debian/changelog 2011-08-22 14:15:50 +0000
4@@ -1,3 +1,9 @@
5+ubuntuone-installer (1.7.2-0ubuntu2) oneiric; urgency=low
6+
7+ * Require new DistUtilsExtra, avoid override with xvfb, fixes FTBFS
8+
9+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Mon, 22 Aug 2011 10:10:59 -0400
10+
11 ubuntuone-installer (1.7.2-0ubuntu1) oneiric; urgency=low
12
13 * Initial packaging for Ubuntu (LP: #817133)
14
15=== modified file 'debian/control'
16--- debian/control 2011-08-17 12:00:40 +0000
17+++ debian/control 2011-08-22 14:15:50 +0000
18@@ -4,8 +4,7 @@
19 Build-Depends:
20 debhelper (>= 7.0.50),
21 python-all (>= 2.6.6-3),
22- python-distutils-extra (>= 2.26),
23- xvfb
24+ python-distutils-extra (>= 2.29)
25 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
26 XSBC-Original-Maintainer: Ubuntu One Hackers <ubuntuone-users@lists.launchpad.net>
27 Standards-Version: 3.9.1
28
29=== modified file 'debian/rules'
30--- debian/rules 2011-08-17 12:00:40 +0000
31+++ debian/rules 2011-08-22 14:15:50 +0000
32@@ -3,9 +3,3 @@
33 %:
34 dh --with=python2 $@
35
36-override_dh_auto_build:
37- xvfb-run python setup.py build
38-
39-override_dh_auto_install:
40- xvfb-run python setup.py install --force --root=$(CURDIR)/debian/ubuntuone-installer --no-compile -O0 --install-layout=deb
41-

Subscribers

People subscribed via source and target branches

to all changes: