Ubuntu
gwp package

Merge lp:~kamalmostafa/ubuntu/lucid/gwp/fix-517918-ftbfs into lp:ubuntu/lucid/gwp

  1. Lucid (10.04)
  2. fix-517918-ftbfs
  3. Merge into lucid
Proposed by Kamal Mostafa
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kamalmostafa/ubuntu/lucid/gwp/fix-517918-ftbfs
Merge into: lp:ubuntu/lucid/gwp
Diff against target: 62 lines (+15/-5)
4 files modified
configure (+3/-2)
configure.in (+3/-2)
debian/changelog (+7/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~kamalmostafa/ubuntu/lucid/gwp/fix-517918-ftbfs
Reviewer Review Type Date Requested Status
Michael Bienia (community) Approve
Ubuntu branches Pending
Review via email: mp+18743@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Bienia (geser) wrote :

Approved. Please don't forget to also insert the bugnumber into debian/changelog once you have it :).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2006-01-28 13:02:08 +0000
3+++ configure 2010-02-06 04:33:15 +0000
4@@ -20136,10 +20136,11 @@
5 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
6 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
7 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
8- PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
9+ # Only python itself should reference python's LOCALMODLIBS
10+ # PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
11 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
12 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
13- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
14+ PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
15
16
17
18
19=== modified file 'configure.in'
20--- configure.in 2006-01-28 13:02:08 +0000
21+++ configure.in 2010-02-06 04:33:15 +0000
22@@ -100,10 +100,11 @@
23 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
24 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
25 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
26- PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
27+ # Only python itself should reference python's LOCALMODLIBS
28+ # PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
29 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
30 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
31- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
32+ PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
33 AC_SUBST(PY_LIBS)
34 AC_SUBST(PY_LIB_LOC)
35 AC_SUBST(PY_CFLAGS)
36
37=== modified file 'debian/changelog'
38--- debian/changelog 2010-02-01 21:03:51 +0000
39+++ debian/changelog 2010-02-06 04:33:15 +0000
40@@ -1,3 +1,10 @@
41+gwp (0.4.0-1.2ubuntu1) lucid; urgency=low
42+
43+ * Remove invalid reference to python's LOCALMODLIBS to fix -lssl FTBFS
44+ (LP: #nnnnnn)
45+
46+ -- Kamal Mostafa <kamal@whence.com> Fri, 05 Feb 2010 19:52:34 -0800
47+
48 gwp (0.4.0-1.2build1) lucid; urgency=low
49
50 * Rebuild for python2.6 as the default python version.
51
52=== modified file 'debian/control'
53--- debian/control 2007-03-20 23:45:12 +0000
54+++ debian/control 2010-02-06 04:33:15 +0000
55@@ -1,5 +1,6 @@
56 Source: gwp
57-Maintainer: Lucas Di Pentima <lucas@lunix.com.ar>
58+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
59+XSBC-Original-Maintainer: Lucas Di Pentima <lucas@lunix.com.ar>
60 Section: contrib/games
61 Priority: optional
62 Build-Depends: debhelper (>= 4.0.0), gnome-core-devel, python-dev, libpcre3-dev, libgtkglext1-dev, scrollkeeper, python-gtk2-dev

Subscribers

People subscribed via source and target branches

to all changes: