[Python-modules-commits] r637 - in /packages/libapache2-mod-python/trunk/debian: changelog control patches/ patches/00list patches/01_configure.diff patches/02_makefile.diff patches/03_includes.diff rules

nobse at users.alioth.debian.org nobse at users.alioth.debian.org
Tue May 16 13:43:17 UTC 2006 

Author: nobse
Date: Tue May 16 13:43:16 2006
New Revision: 637

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=637
Log:
Use dpatch.

Added:
    packages/libapache2-mod-python/trunk/debian/patches/
    packages/libapache2-mod-python/trunk/debian/patches/00list
    packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff
    packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff
    packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff
Modified:
    packages/libapache2-mod-python/trunk/debian/changelog
    packages/libapache2-mod-python/trunk/debian/control
    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=637&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/changelog (original)
+++ packages/libapache2-mod-python/trunk/debian/changelog Tue May 16 13:43:16 2006
@@ -13,8 +13,9 @@
   * Added Robert and myself to uploaders.
   * Removed python2.2 packages. (closes: #353805, #362474)
   * Depend on debconf | debconf-2.0. (closes: #331996)
+  * Splitted out patches and used dpatch instead.
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 16 May 2006 02:18:04 -0500
+ -- Norbert Tretkowski <nobse at debian.org>  Tue, 16 May 2006 08:42:48 -0500
 
 libapache2-mod-python (3.1.3-3) unstable; urgency=high
 

Modified: packages/libapache2-mod-python/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/control?rev=637&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/control (original)
+++ packages/libapache2-mod-python/trunk/debian/control Tue May 16 13:43:16 2006
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Robert S. Edmonds <edmonds at debian.org>, Norbert Tretkowski <nobse at debian.org>
-Build-Depends: debhelper (>= 4.1.16), debconf, autoconf, python, python2.3-dev, python2.4-dev, apache2-threaded-dev (>= 2.0.50-10)
+Build-Depends: debhelper (>= 4.1.16), debconf, autoconf, python, python2.3-dev, python2.4-dev, apache2-threaded-dev (>= 2.0.50-10), dpatch
 Standards-Version: 3.6.1
  
 Package: libapache2-mod-python

Added: packages/libapache2-mod-python/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/patches/00list?rev=637&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/00list (added)
+++ packages/libapache2-mod-python/trunk/debian/patches/00list Tue May 16 13:43:16 2006
@@ -1,0 +1,1 @@
+01_configure.diff 02_makefile.diff 03_includes.diff

Added: 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=637&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff (added)
+++ packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff Tue May 16 13:43:16 2006
@@ -1,0 +1,82 @@
+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
+@@ -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

Added: packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff?rev=637&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff (added)
+++ packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff Tue May 16 13:43:16 2006
@@ -1,0 +1,12 @@
+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:

Added: packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff?rev=637&op=file
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff (added)
+++ packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff Tue May 16 13:43:16 2006
@@ -1,0 +1,12 @@
+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=

Modified: packages/libapache2-mod-python/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/libapache2-mod-python/trunk/debian/rules?rev=637&op=diff
==============================================================================
--- packages/libapache2-mod-python/trunk/debian/rules (original)
+++ packages/libapache2-mod-python/trunk/debian/rules Tue May 16 13:43:16 2006
@@ -5,6 +5,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
 
 # This is the debhelper compatability version to use.
 export DH_COMPAT=3
@@ -20,7 +22,7 @@
 	touch configure-stamp
 
 build: configure-stamp build-stamp
-build-stamp:
+build-stamp: patch
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -30,7 +32,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -130,4 +132,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure unpatch

More information about the Python-modules-commits mailing list