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
1
gmobilemedia (0.4+dfsg-10ubuntu1) natty; urgency=low
6
2
7
3
  * debian/patches/distutils.patch: Fix FTBFS by explicitly importing
8
4
    distutils.sysconfig.  Without that, the submodule will not have been
9
5
    imported and won't be an attribute on the distutils module.  (LP:
10
6
    #748089)
11
7
12
8
 -- Barry Warsaw <barry@ubuntu.com>  Thu, 07 Apr 2011 13:53:10 -0400
13
9
14
1
gmobilemedia (0.4+dfsg-10) unstable; urgency=low
10
gmobilemedia (0.4+dfsg-10) unstable; urgency=low
15
2
11
16
3
  * Remove old install instructions, thanks to Jakub Wilk for spotting this
12
  * Remove old install instructions, thanks to Jakub Wilk for spotting this
17
4
13
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
1
Source: gmobilemedia
1
Source: gmobilemedia
23
2
Section: comm
2
Section: comm
24
3
Priority: optional
3
Priority: optional
26
4
Maintainer: Michal Čihař <nijel@debian.org>
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27
5
XSBC-Original-Maintainer: Michal Čihař <nijel@debian.org>
28
5
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
6
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
29
6
Build-Depends: debhelper (>= 7.0.50)
7
Build-Depends: debhelper (>= 7.0.50)
30
7
Build-Depends-Indep: python, python-support (>= 0.5.3)
8
Build-Depends-Indep: python, python-support (>= 0.5.3)
31
8
9
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
4
4
37
5
--- /dev/null
5
--- /dev/null
38
6
+++ b/setup.py
6
+++ b/setup.py
40
7
@@ -0,0 +1,110 @@
7
@@ -0,0 +1,111 @@
41
8
+#!/usr/bin/python
8
+#!/usr/bin/python
42
9
+# -*- coding: UTF-8 -*-
9
+# -*- coding: UTF-8 -*-
43
10
+
10
+
44
@@ -13,6 +13,7 @@
45
13
+import re
13
+import re
46
14
+from distutils.core import setup
14
+from distutils.core import setup
47
15
+import distutils.command.build_scripts
15
+import distutils.command.build_scripts
48
16
+import distutils.sysconfig
49
16
+from stat import ST_MODE
17
+from stat import ST_MODE
50
17
+
18
+
51
18
+# check if Python is called on the first line with this expression
19
+# check if Python is called on the first line with this expression
52
19
20
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
6
import re
6
import re
58
7
from distutils.core import setup
7
from distutils.core import setup
59
8
import distutils.command.build_scripts
8
import distutils.command.build_scripts
60
9
import distutils.sysconfig
61
9
from stat import ST_MODE
10
from stat import ST_MODE
62
10
11
63
11
# check if Python is called on the first line with this expression
12
# check if Python is called on the first line with this expression
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Andres Rodriguez (community)		Approve on 2011-04-13
Ubuntu branches	2011-04-07	Pending
Review via email: mp+56815@code.launchpad.net