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
=== modified file 'configure'
--- configure 2006-01-28 13:02:08 +0000
+++ configure 2010-02-06 04:33:15 +0000
@@ -20136,10 +20136,11 @@
20136 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"20136 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
20137 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"20137 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
20138 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"20138 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
20139 PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`20139 # Only python itself should reference python's LOCALMODLIBS
20140 # PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
20140 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`20141 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
20141 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`20142 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
20142 PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"20143 PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
2014320144
2014420145
2014520146
2014620147
=== modified file 'configure.in'
--- configure.in 2006-01-28 13:02:08 +0000
+++ configure.in 2010-02-06 04:33:15 +0000
@@ -100,10 +100,11 @@
100 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"100 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
101 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"101 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
102 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"102 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
103 PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`103 # Only python itself should reference python's LOCALMODLIBS
104 # PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
104 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`105 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
105 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`106 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
106 PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"107 PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
107 AC_SUBST(PY_LIBS)108 AC_SUBST(PY_LIBS)
108 AC_SUBST(PY_LIB_LOC)109 AC_SUBST(PY_LIB_LOC)
109 AC_SUBST(PY_CFLAGS)110 AC_SUBST(PY_CFLAGS)
110111
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-01 21:03:51 +0000
+++ debian/changelog 2010-02-06 04:33:15 +0000
@@ -1,3 +1,10 @@
1gwp (0.4.0-1.2ubuntu1) lucid; urgency=low
2
3 * Remove invalid reference to python's LOCALMODLIBS to fix -lssl FTBFS
4 (LP: #nnnnnn)
5
6 -- Kamal Mostafa <kamal@whence.com> Fri, 05 Feb 2010 19:52:34 -0800
7
1gwp (0.4.0-1.2build1) lucid; urgency=low8gwp (0.4.0-1.2build1) lucid; urgency=low
29
3 * Rebuild for python2.6 as the default python version.10 * Rebuild for python2.6 as the default python version.
411
=== modified file 'debian/control'
--- debian/control 2007-03-20 23:45:12 +0000
+++ debian/control 2010-02-06 04:33:15 +0000
@@ -1,5 +1,6 @@
1Source: gwp1Source: gwp
2Maintainer: Lucas Di Pentima <lucas@lunix.com.ar>2Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
3XSBC-Original-Maintainer: Lucas Di Pentima <lucas@lunix.com.ar>
3Section: contrib/games4Section: contrib/games
4Priority: optional5Priority: optional
5Build-Depends: debhelper (>= 4.0.0), gnome-core-devel, python-dev, libpcre3-dev, libgtkglext1-dev, scrollkeeper, python-gtk2-dev6Build-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: