[Python-modules-commits] r1165 - in /packages/libapache2-mod-python/trunk/debian: changelog patches/01_configure.diff rules

[pox-guest at users.alioth.debian.org]

Author: pox-guest
Date: Tue Jul 18 09:22:34 2006
New Revision: 1165

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1165
Log:
applied a patch from Robert Edmonds (bug #370234)

Modified:
    packages/libapache2-mod-python/trunk/debian/changelog
    packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff
    packages/libapache2-mod-python/trunk/debian/rules

Modified: packages/libapache2-mod-python/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/changelog?rev=1165&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/changelog (original)
+++ packages/libapache2-mod-python/trunk/debian/changelog Tue Jul 18 09:22:34 2006
@@ -7,6 +7,10 @@
 
   [ Piotr Ozarowski ]
   * Added watch file
+
+  [ Robert S. Edmonds ]
+  * Patching the generated configure script is wrong and unnecessary.
+    (closes: #370234)
 
  -- Piotr Ozarowski <ozarow at gmail.com>  Tue,  6 Jun 2006 13:39:06 +0200
 

Modified: packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff?rev=1165&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff (original)
+++ packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff Tue Jul 18 09:22:34 2006
@@ -14,51 +14,6 @@
 exit 0
 
 @DPATCH@
-diff -Nur mod_python-3.2.8.orig/configure mod_python-3.2.8/configure
---- mod_python-3.2.8.orig/configure	2005-10-28 11:06:22.000000000 -0500
-+++ mod_python-3.2.8/configure	2006-05-16 08:38:20.000000000 -0500
-@@ -2706,19 +2706,21 @@
-   ALL="dso"
- 
-   # check Apache version
--  echo "$as_me:$LINENO: checking Apache version" >&5
--echo $ECHO_N "checking Apache version... $ECHO_C" >&6
--  HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
--  ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
--  echo "$as_me:$LINENO: result: $ver" >&5
--echo "${ECHO_T}$ver" >&6
-+# peterh: Remove apache version check for debian package, since we don't
-+# want to build-depend on apache2.
-+#  echo "$as_me:$LINENO: checking Apache version" >&5
-+#echo $ECHO_N "checking Apache version... $ECHO_C" >&6
-+#  HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
-+#  ver=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
-+#  echo "$as_me:$LINENO: result: $ver" >&5
-+#echo "${ECHO_T}$ver" >&6
- 
-   # make sure version begins with 2
--  if test -z "`echo $ver | egrep \^2`"; then
--    { { echo "$as_me:$LINENO: error: This version of mod_python only works with Apache 2. The one you have seems to be $ver." >&5
--echo "$as_me: error: This version of mod_python only works with Apache 2. The one you have seems to be $ver." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
-+#  if test -z "`echo $ver | egrep \^2`"; then
-+#    { { echo "$as_me:$LINENO: error: This version of mod_python only works with Apache 2. The one you have seems to be $ver." >&5
-+#echo "$as_me: error: This version of mod_python only works with Apache 2. The one you have seems to be $ver." >&2;}
-+#   { (exit 1); exit 1; }; }
-+#  fi
- 
-   # determine LIBEXEC
-   echo "$as_me:$LINENO: checking for Apache libexec directory" >&5
-@@ -3035,7 +3037,7 @@
- # get the mod_python 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
 diff -Nur mod_python-3.2.8.orig/configure.in mod_python-3.2.8/configure.in
 --- mod_python-3.2.8.orig/configure.in	2005-10-28 11:06:22.000000000 -0500
 +++ mod_python-3.2.8/configure.in	2006-05-16 08:40:23.000000000 -0500

Modified: packages/libapache2-mod-python/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/rules?rev=1165&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/rules (original)
+++ packages/libapache2-mod-python/trunk/debian/rules Tue Jul 18 09:22:34 2006
@@ -16,7 +16,6 @@
 	dh_testdir
 	# Add here commands to configure the package.
 	
-	autoconf
 	# Don't configure here (see install)
 #	-./configure --enable-EAPI --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 	touch configure-stamp
@@ -53,6 +52,8 @@
 
 	# Add here commands to install the package into debian/libapache-mod-python.
 	#$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python
+
+	autoconf
 
 	# python 2.3
 	rm -f config.cache config.status