[Python-modules-commits] r24553 - in packages/libapache2-mod-python/trunk/debian (17 files)
adejong at users.alioth.debian.org
adejong at users.alioth.debian.org
Sun May 26 14:09:33 UTC 2013
Date: Sunday, May 26, 2013 @ 14:09:31
Author: adejong
Revision: 24553
* Switch from dpatch to source format 3.0 (quilt).
Added:
packages/libapache2-mod-python/trunk/debian/patches/01_configure.patch
(from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch)
packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch
(from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch)
packages/libapache2-mod-python/trunk/debian/patches/03_includes.patch
(from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch)
packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.patch
(from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.dpatch)
packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.patch
(from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch)
packages/libapache2-mod-python/trunk/debian/patches/series
(from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/00list)
Modified:
packages/libapache2-mod-python/trunk/debian/changelog
packages/libapache2-mod-python/trunk/debian/control
packages/libapache2-mod-python/trunk/debian/rules
packages/libapache2-mod-python/trunk/debian/source/format
Deleted:
packages/libapache2-mod-python/trunk/debian/README.source
packages/libapache2-mod-python/trunk/debian/patches/00list
packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch
packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch
packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch
packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.dpatch
packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch
Deleted: packages/libapache2-mod-python/trunk/debian/README.source
===================================================================
--- packages/libapache2-mod-python/trunk/debian/README.source 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/README.source 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
Modified: packages/libapache2-mod-python/trunk/debian/changelog
===================================================================
--- packages/libapache2-mod-python/trunk/debian/changelog 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/changelog 2013-05-26 14:09:31 UTC (rev 24553)
@@ -9,11 +9,12 @@
* Remove version from apache2-threaded-dev build dependency because every
version since etch is new enough.
* Dropped provides/replaces/conflicts for ancient versions of mod_python.
+ * Switch from dpatch to source format 3.0 (quilt).
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Arthur de Jong <adejong at debian.org> Sun, 26 May 2013 15:24:02 +0200
+ -- Arthur de Jong <adejong at debian.org> Sun, 26 May 2013 16:09:04 +0200
libapache2-mod-python (3.3.1-9) unstable; urgency=low
Modified: packages/libapache2-mod-python/trunk/debian/control
===================================================================
--- packages/libapache2-mod-python/trunk/debian/control 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/control 2013-05-26 14:09:31 UTC (rev 24553)
@@ -4,7 +4,7 @@
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Robert S. Edmonds <edmonds at debian.org>
Build-Depends: debhelper (>= 9), dh-autoreconf, python-dev (>= 2.6.6-3~),
- apache2-threaded-dev, dpatch
+ apache2-threaded-dev
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/libapache2-mod-python/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/libapache2-mod-python/trunk/
Homepage: http://www.modpython.org/
Deleted: packages/libapache2-mod-python/trunk/debian/patches/00list
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/00list 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/patches/00list 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,5 +0,0 @@
-01_configure
-02_makefile
-03_includes
-04_autoconf_python_multiarch
-10_bts521965
Deleted: packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_configure.dpatch by Robert S. Edmonds <edmonds at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch configure script
-
- at DPATCH@
-
-diff -Nur libapache2-mod-python-3.2.10.orig/configure.in libapache2-mod-python-3.2.10/configure.in
---- libapache2-mod-python-3.2.10.orig/configure.in 2006-04-12 14:03:09.000000000 +0200
-+++ libapache2-mod-python-3.2.10/configure.in 2006-08-18 23:44:37.000000000 +0200
-@@ -107,15 +107,17 @@
- ALL="dso"
-
- # check Apache version
-- AC_MSG_CHECKING(Apache version)
-- HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
-- ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
-- AC_MSG_RESULT($ver)
-+# peterh: Remove apache version check for debian package, since we don't
-+# want to build-depend on apache2.
-+# AC_MSG_CHECKING(Apache version)
-+# HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
-+# ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
-+# AC_MSG_RESULT($ver)
-
- # make sure version begins with 2
-- if test -z "`echo $ver | egrep \^2`"; then
-- AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.])
-- fi
-+# if test -z "`echo $ver | egrep \^2`"; then
-+# AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.])
-+# fi
-
- # determine LIBEXEC
- AC_MSG_CHECKING(for Apache libexec directory)
-@@ -287,7 +289,7 @@
- # get the mod_python version
- AC_SUBST(MP_VERSION)
- MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
--MP_VERSION=`echo $MP_VERSION | sed 's/["]//g'`
-+MP_VERSION=`echo $MP_VERSION | sed 's/"//g'`
-
- # get --with-python-src. The python src is required to generate the documentation
- # It is not required to compile or install mod_python itself
Copied: packages/libapache2-mod-python/trunk/debian/patches/01_configure.patch (from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/01_configure.patch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/01_configure.patch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -0,0 +1,41 @@
+Description: Patch configure script.
+ Remove apache version check for debian package, since we don't want to
+ build-depend on apache2.
+Author: Robert S. Edmonds <edmonds at debian.org>
+
+--- a/configure.in
++++ b/configure.in
+@@ -107,15 +107,17 @@ else
+ ALL="dso"
+
+ # check Apache version
+- AC_MSG_CHECKING(Apache version)
+- HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
+- ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
+- AC_MSG_RESULT($ver)
++# peterh: Remove apache version check for debian package, since we don't
++# want to build-depend on apache2.
++# AC_MSG_CHECKING(Apache version)
++# HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
++# ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
++# AC_MSG_RESULT($ver)
+
+ # make sure version begins with 2
+- if test -z "`echo $ver | egrep \^2`"; then
+- AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.])
+- fi
++# if test -z "`echo $ver | egrep \^2`"; then
++# AC_MSG_ERROR([This version of mod_python only works with Apache 2. The one you have seems to be $ver.])
++# fi
+
+ # determine LIBEXEC
+ AC_MSG_CHECKING(for Apache libexec directory)
+@@ -287,7 +289,7 @@ MOD_PYTHON_SO="`pwd`/src/mod_python.so"
+ # get the mod_python version
+ AC_SUBST(MP_VERSION)
+ MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
+-MP_VERSION=`echo $MP_VERSION | sed 's/["]//g'`
++MP_VERSION=`echo $MP_VERSION | sed 's/"//g'`
+
+ # get --with-python-src. The python src is required to generate the documentation
+ # It is not required to compile or install mod_python itself
Deleted: packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_makefile.dpatch by Peter Hawkins <peterh at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch makefile in setup.py call
-
- at DPATCH@
-
-diff -Nur mod_python-3.2.8.orig/dist/Makefile.in mod_python-3.2.8/dist/Makefile.in
---- mod_python-3.2.8.orig/dist/Makefile.in 2005-10-15 10:43:35.000000000 -0500
-+++ mod_python-3.2.8/dist/Makefile.in 2006-05-16 08:31:15.000000000 -0500
-@@ -36,7 +36,7 @@
- if test -z "$(DESTDIR)" ; then \
- $(PYTHON_BIN) setup.py install --optimize 2 --force ; \
- else \
-- $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
-+ $(PYTHON_BIN) setup.py install --force --root $(DESTDIR) --no-compile ; \
- fi
-
- mod_python.so:
Copied: packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch (from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -0,0 +1,14 @@
+Description: Patch makefile to issue correct setup.py call.
+Author: Peter Hawkins <peterh at debian.org>
+
+--- a/dist/Makefile.in
++++ b/dist/Makefile.in
+@@ -36,7 +36,7 @@ install_py_lib: mod_python src
+ if test -z "$(DESTDIR)" ; then \
+ $(PYTHON_BIN) setup.py install --optimize 2 --force ; \
+ else \
+- $(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
++ $(PYTHON_BIN) setup.py install --force --root $(DESTDIR) --no-compile ; \
+ fi
+
+ mod_python.so:
Deleted: packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_includes.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Additional INCLUDES
-
- at DPATCH@
-
-diff -Nur mod_python-3.2.8.orig/src/Makefile.in mod_python-3.2.8/src/Makefile.in
---- mod_python-3.2.8.orig/src/Makefile.in 2005-06-26 08:52:26.000000000 -0500
-+++ mod_python-3.2.8/src/Makefile.in 2006-05-16 08:32:47.000000000 -0500
-@@ -22,7 +22,7 @@
-
- # requires flex 2.5.31 for reentrant support
- LEX=@LEX@
--INCLUDES=@INCLUDES@
-+INCLUDES=@INCLUDES@ $(DEB_DEFINES)
- LIBS=@LIBS@
- LDFLAGS=@LDFLAGS@
- OPT=
Copied: packages/libapache2-mod-python/trunk/debian/patches/03_includes.patch (from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/03_includes.patch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/03_includes.patch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -0,0 +1,13 @@
+Description: Additional INCLUDES
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -22,7 +22,7 @@ MKDEP=@MKDEP@
+
+ # requires flex 2.5.31 for reentrant support
+ LEX=@LEX@
+-INCLUDES=@INCLUDES@
++INCLUDES=@INCLUDES@ $(DEB_DEFINES)
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+ OPT=
Deleted: packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.dpatch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.dpatch 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.dpatch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,75 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_autoconf_python_multiarch.dpatch by <ubuntu at server-e76384a2-51cb-4595-9b66-9ed53c1e0c44.canonistack>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-##
-## DP: Drop custom Python detection and use pkg-config instead. This fixes
-## DP: FTBFS due to multiarch include paths. Not sure if this should be
-## DP: fowrarded or not (see https://lists.ubuntu.com/archives/ubuntu-devel/2013-January/036291.html)
-## DP: Author: Robie Basak <robie.basak at canonical.com>
-## DP: Bug-Ubuntu: https://launchpad.net/bugs/1098597
-## DP: Forwarded: no
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libapache2-mod-python-3.3.1~/configure.in libapache2-mod-python-3.3.1/configure.in
---- libapache2-mod-python-3.3.1~/configure.in 2013-01-10 16:35:51.000000000 +0000
-+++ libapache2-mod-python-3.3.1/configure.in 2013-01-10 16:35:51.000000000 +0000
-@@ -223,39 +223,9 @@
- # set python std library variable
- AC_SUBST(LIBS)
-
--PyLIBP=${PY_STD_LIB}
--PyLIBPL=${PyLIBP}/config
--PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
--PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
--PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
--PyFRAMEWORK=`grep "^PYTHONFRAMEWORK=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
--PyFRAMEWORKDIR=`grep "^PYTHONFRAMEWORKDIR=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' ' | awk '{print $1}'`
--
--save_LDFLAGS="$LDFLAGS"
--save_LIBS="$LIBS"
--if test "$PyFRAMEWORKDIR" != "no-framework"; then
-- if test -n "$PyFRAMEWORK"; then
-- PyPYTHONLIBS="-framework $PyFRAMEWORK"
-- LDFLAGS="${LDFLAGS} -Wl,-framework,Python"
-- fi
--else
-- LDFLAGS="${LDFLAGS} -L${PyLIBPL}"
-- AC_CHECK_LIB(python${PyVERSION}, Py_NewInterpreter,
-- [ PyPYTHONLIBS="-lpython${PyVERSION}" ],
-- [ LDFLAGS="$save_LDFLAGS"
-- if test -f ${PyLIBPL}/libpython${PyVERSION}.a; then
-- PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
-- else
-- AC_ERROR(Can not link to python)
-- fi
-- ],
-- [ ${PyLIBS} ${PyMODLIBS} ] )
--fi
--LIBS="$save_LIBS"
--
- # (actually this check already just happened above)
- AC_MSG_CHECKING(what libraries Python was linked with)
--PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}"
-+PY_LIBS=`${PYTHON_BIN}-config --libs`
-
- ## XXX this is a small work around for a weird RedHat problem
- ## erase -lieee from library list
-@@ -268,15 +238,13 @@
-
- AC_MSG_CHECKING(linker flags used to link Python)
- AC_SUBST(LDFLAGS)
--PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
--PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
--LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}"
-+PY_LDFLAGS=`${PYTHON_BIN}-config --ldflags`
- LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}"
- AC_MSG_RESULT($PY_LDFLAGS)
-
- AC_MSG_CHECKING(where Python include files are)
- AC_SUBST(INCLUDES)
--PY_INCLUDES="-I${PyEXEC_INSTALLDIR}/include/python${PyVERSION}"
-+PY_INCLUDES=`${PYTHON_BIN}-config --includes`
- INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}"
- AC_MSG_RESULT($PY_INCLUDES)
-
Copied: packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.patch (from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.dpatch)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.patch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/04_autoconf_python_multiarch.patch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -0,0 +1,70 @@
+Description: Drop custom Python detection and use pkg-config instead.
+ Drop custom Python detection and use pkg-config instead. This fixes
+ FTBFS due to multiarch include paths. Not sure if this should be
+ fowrarded or not
+ (see https://lists.ubuntu.com/archives/ubuntu-devel/2013-January/036291.html)
+Author: Robie Basak <robie.basak at canonical.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1098597
+Forwarded: no
+
+--- a/configure.in
++++ b/configure.in
+@@ -223,39 +223,9 @@ AC_MSG_RESULT($PY_STD_LIB)
+ # set python std library variable
+ AC_SUBST(LIBS)
+
+-PyLIBP=${PY_STD_LIB}
+-PyLIBPL=${PyLIBP}/config
+-PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
+-PyLIBS=`grep "^LIB[[SMC]]=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+-PyMODLIBS=`grep "^LOCALMODLIBS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+-PyFRAMEWORK=`grep "^PYTHONFRAMEWORK=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+-PyFRAMEWORKDIR=`grep "^PYTHONFRAMEWORKDIR=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' ' | awk '{print $1}'`
+-
+-save_LDFLAGS="$LDFLAGS"
+-save_LIBS="$LIBS"
+-if test "$PyFRAMEWORKDIR" != "no-framework"; then
+- if test -n "$PyFRAMEWORK"; then
+- PyPYTHONLIBS="-framework $PyFRAMEWORK"
+- LDFLAGS="${LDFLAGS} -Wl,-framework,Python"
+- fi
+-else
+- LDFLAGS="${LDFLAGS} -L${PyLIBPL}"
+- AC_CHECK_LIB(python${PyVERSION}, Py_NewInterpreter,
+- [ PyPYTHONLIBS="-lpython${PyVERSION}" ],
+- [ LDFLAGS="$save_LDFLAGS"
+- if test -f ${PyLIBPL}/libpython${PyVERSION}.a; then
+- PyPYTHONLIBS=${PyLIBPL}/libpython${PyVERSION}.a
+- else
+- AC_ERROR(Can not link to python)
+- fi
+- ],
+- [ ${PyLIBS} ${PyMODLIBS} ] )
+-fi
+-LIBS="$save_LIBS"
+-
+ # (actually this check already just happened above)
+ AC_MSG_CHECKING(what libraries Python was linked with)
+-PY_LIBS="${PyPYTHONLIBS} ${PyLIBS} ${PyMODLIBS}"
++PY_LIBS=`${PYTHON_BIN}-config --libs`
+
+ ## XXX this is a small work around for a weird RedHat problem
+ ## erase -lieee from library list
+@@ -268,15 +238,13 @@ AC_MSG_RESULT($PY_LIBS)
+
+ AC_MSG_CHECKING(linker flags used to link Python)
+ AC_SUBST(LDFLAGS)
+-PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+-PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' ' '`
+-LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}"
++PY_LDFLAGS=`${PYTHON_BIN}-config --ldflags`
+ LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}"
+ AC_MSG_RESULT($PY_LDFLAGS)
+
+ AC_MSG_CHECKING(where Python include files are)
+ AC_SUBST(INCLUDES)
+-PY_INCLUDES="-I${PyEXEC_INSTALLDIR}/include/python${PyVERSION}"
++PY_INCLUDES=`${PYTHON_BIN}-config --includes`
+ INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}"
+ AC_MSG_RESULT($PY_INCLUDES)
+
Deleted: packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_bts521965.dpatch by Sandro Tosi <morph at debian.org>
-##
-## DP: fix a FTBFS due to new apr > 1.3.x (bb is the bucket brigade)
-## DP: From: http://www.modpython.org/pipermail/mod_python/2008-October/025724.html
-
- at DPATCH@
-diff -urNad libapache2-mod-python~/src/connobject.c libapache2-mod-python/src/connobject.c
---- libapache2-mod-python~/src/connobject.c 2006-12-03 05:36:37.000000000 +0100
-+++ libapache2-mod-python/src/connobject.c 2009-07-07 11:39:36.000000000 +0200
-@@ -139,7 +139,7 @@
- bytes_read = 0;
-
- while ((bytes_read < len || len == 0) &&
-- !(b == APR_BRIGADE_SENTINEL(b) ||
-+ !(b == APR_BRIGADE_SENTINEL(bb) ||
- APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
-
- const char *data;
Copied: packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.patch (from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.patch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.patch 2013-05-26 14:09:31 UTC (rev 24553)
@@ -0,0 +1,15 @@
+Description: fix a FTBFS due to new apr > 1.3.x (bb is the bucket brigade)
+Origin: http://www.modpython.org/pipermail/mod_python/2008-October/025724.html
+Bug-Debian: http://bugs.debian.org/521965
+
+--- a/src/connobject.c
++++ b/src/connobject.c
+@@ -139,7 +139,7 @@ static PyObject * _conn_read(conn_rec *c
+ bytes_read = 0;
+
+ while ((bytes_read < len || len == 0) &&
+- !(b == APR_BRIGADE_SENTINEL(b) ||
++ !(b == APR_BRIGADE_SENTINEL(bb) ||
+ APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
+
+ const char *data;
Copied: packages/libapache2-mod-python/trunk/debian/patches/series (from rev 24550, packages/libapache2-mod-python/trunk/debian/patches/00list)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/series (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/series 2013-05-26 14:09:31 UTC (rev 24553)
@@ -0,0 +1,5 @@
+01_configure.patch
+02_makefile.patch
+03_includes.patch
+04_autoconf_python_multiarch.patch
+10_bts521965.patch
Modified: packages/libapache2-mod-python/trunk/debian/rules
===================================================================
--- packages/libapache2-mod-python/trunk/debian/rules 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/rules 2013-05-26 14:09:31 UTC (rev 24553)
@@ -6,8 +6,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
PYVER=$(shell pyversions -d)
configure: configure-stamp
@@ -20,7 +18,7 @@
touch $@
build: configure-stamp build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -30,7 +28,7 @@
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -104,4 +102,4 @@
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure unpatch
+.PHONY: build clean binary-indep binary-arch binary install configure
Modified: packages/libapache2-mod-python/trunk/debian/source/format
===================================================================
--- packages/libapache2-mod-python/trunk/debian/source/format 2013-05-26 13:54:57 UTC (rev 24552)
+++ packages/libapache2-mod-python/trunk/debian/source/format 2013-05-26 14:09:31 UTC (rev 24553)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list