Merge lp:~barry/ubuntu/natty/gmobilemedia/bug-748089 into lp:ubuntu/natty/gmobilemedia

Proposed by Barry Warsaw on 2011-04-07
Status: Merged
Merged at revision: 8
Proposed branch: lp:~barry/ubuntu/natty/gmobilemedia/bug-748089
Merge into: lp:ubuntu/natty/gmobilemedia
Diff against target: 63 lines (+14/-2)
4 files modified
debian/changelog (+9/-0)
debian/control (+2/-1)
debian/patches/distutils.patch (+2/-1)
setup.py (+1/-0)
To merge this branch: bzr merge lp:~barry/ubuntu/natty/gmobilemedia/bug-748089
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2011-04-13
Ubuntu branches 2011-04-07 Pending
Review via email: mp+56815@code.launchpad.net
To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

Looks good!

review: Approve

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 2010-06-17 14:21:09 +0000
3+++ debian/changelog 2011-04-07 18:02:28 +0000
4@@ -1,3 +1,12 @@
5+gmobilemedia (0.4+dfsg-10ubuntu1) natty; urgency=low
6+
7+ * debian/patches/distutils.patch: Fix FTBFS by explicitly importing
8+ distutils.sysconfig. Without that, the submodule will not have been
9+ imported and won't be an attribute on the distutils module. (LP:
10+ #748089)
11+
12+ -- Barry Warsaw <barry@ubuntu.com> Thu, 07 Apr 2011 13:53:10 -0400
13+
14 gmobilemedia (0.4+dfsg-10) unstable; urgency=low
15
16 * Remove old install instructions, thanks to Jakub Wilk for spotting this
17
18=== modified file 'debian/control'
19--- debian/control 2010-06-17 14:21:09 +0000
20+++ debian/control 2011-04-07 18:02:28 +0000
21@@ -1,7 +1,8 @@
22 Source: gmobilemedia
23 Section: comm
24 Priority: optional
25-Maintainer: Michal Čihař <nijel@debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Michal Čihař <nijel@debian.org>
28 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
29 Build-Depends: debhelper (>= 7.0.50)
30 Build-Depends-Indep: python, python-support (>= 0.5.3)
31
32=== modified file 'debian/patches/distutils.patch'
33--- debian/patches/distutils.patch 2009-05-13 12:00:56 +0000
34+++ debian/patches/distutils.patch 2011-04-07 18:02:28 +0000
35@@ -4,7 +4,7 @@
36
37 --- /dev/null
38 +++ b/setup.py
39-@@ -0,0 +1,110 @@
40+@@ -0,0 +1,111 @@
41 +#!/usr/bin/python
42 +# -*- coding: UTF-8 -*-
43 +
44@@ -13,6 +13,7 @@
45 +import re
46 +from distutils.core import setup
47 +import distutils.command.build_scripts
48++import distutils.sysconfig
49 +from stat import ST_MODE
50 +
51 +# check if Python is called on the first line with this expression
52
53=== modified file 'setup.py'
54--- setup.py 2010-01-02 12:39:42 +0000
55+++ setup.py 2011-04-07 18:02:28 +0000
56@@ -6,6 +6,7 @@
57 import re
58 from distutils.core import setup
59 import distutils.command.build_scripts
60+import distutils.sysconfig
61 from stat import ST_MODE
62
63 # check if Python is called on the first line with this expression

Subscribers

People subscribed via source and target branches

to all changes: