Merge lp:~barry/ubuntu/natty/python-lzma/594919-ftbfs into lp:ubuntu/natty/python-lzma

Proposed by Barry Warsaw
Status: Merged
Merged at revision: 8
Proposed branch: lp:~barry/ubuntu/natty/python-lzma/594919-ftbfs
Merge into: lp:ubuntu/natty/python-lzma
Diff against target: 36 lines (+18/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/594919-py27-linkage-fix (+10/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~barry/ubuntu/natty/python-lzma/594919-ftbfs
Reviewer Review Type Date Requested Status
Micah Gersten (community) Needs Fixing
Ubuntu branches Pending
Review via email: mp+43577@code.launchpad.net

Description of the change

python-lzma (0.5.3-1build4) natty; urgency=low

  [ Stefano Rivera ]
  * Fix shared library linkage when building with Python 2.7. (LP: #594919)

 -- Barry Warsaw <email address hidden> Mon, 13 Dec 2010 15:58:54 -0500

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Version should be 0.5.3-1ubuntu1 since there are changes.

review: Needs Fixing

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-12-08 13:08:26 +0000
3+++ debian/changelog 2010-12-13 21:07:44 +0000
4@@ -1,3 +1,10 @@
5+python-lzma (0.5.3-1build4) natty; urgency=low
6+
7+ [ Stefano Rivera ]
8+ * Fix shared library linkage when building with Python 2.7. (LP: #594919)
9+
10+ -- Barry Warsaw <barry@ubuntu.com> Mon, 13 Dec 2010 15:58:54 -0500
11+
12 python-lzma (0.5.3-1build3) natty; urgency=low
13
14 * Rebuild with python 2.7 as the python default.
15
16=== added directory 'debian/patches'
17=== added file 'debian/patches/594919-py27-linkage-fix'
18--- debian/patches/594919-py27-linkage-fix 1970-01-01 00:00:00 +0000
19+++ debian/patches/594919-py27-linkage-fix 2010-12-13 21:07:44 +0000
20@@ -0,0 +1,10 @@
21+--- a/setup.py
22++++ b/setup.py
23+@@ -54,6 +54,7 @@
24+ pc_libs = subprocess.Popen("pkg-config --libs liblzma", shell=True, stdout=subprocess.PIPE, close_fds=True).stdout.readline().strip()
25+ if(pc_libs):
26+ link_args.extend(pc_libs.split(' '))
27++link_args.append('-lpython%i.%i' % sys.version_info[:2])
28+
29+ extens=[Extension('lzma', c_files, extra_compile_args=compile_args, extra_link_args=link_args, define_macros=version_define)]
30+
31
32=== added file 'debian/patches/series'
33--- debian/patches/series 1970-01-01 00:00:00 +0000
34+++ debian/patches/series 2010-12-13 21:07:44 +0000
35@@ -0,0 +1,1 @@
36+594919-py27-linkage-fix

Subscribers

People subscribed via source and target branches

to all changes: