[Python-modules-commits] r6038 - in packages/libapache2-mod-python/trunk/debian (8 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Wed Jul 23 20:03:38 UTC 2008
Date: Wednesday, July 23, 2008 @ 20:03:36
Author: morph-guest
Revision: 6038
renamed *.diff in *.dpatch; added patch header
Added:
packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch
(from rev 6033, packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff)
packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch
(from rev 6033, packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff)
packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch
(from rev 6033, packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff)
Modified:
packages/libapache2-mod-python/trunk/debian/changelog
packages/libapache2-mod-python/trunk/debian/patches/00list
Deleted:
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/changelog 2008-07-23 19:31:21 UTC (rev 6037)
+++ packages/libapache2-mod-python/trunk/debian/changelog 2008-07-23 20:03:36 UTC (rev 6038)
@@ -25,6 +25,9 @@
* debian/po/eu.po
- added Basque debconf translation; thanks to Xabier Bilbao;
Closes: #492043
+ * debian/patches/{01_configure,02_makefile,03_includes}.dpatch
+ - renamed from <file>.diff
+ - added dpatch header and remove the scripting code
[ Norbert Tretkowski ]
* Remove myself from uploaders.
@@ -35,7 +38,7 @@
[ Piotr Ożarowski ]
* Remove myself from uploaders.
- -- Sandro Tosi <matrixhasu at gmail.com> Wed, 23 Jul 2008 20:05:19 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com> Wed, 23 Jul 2008 22:04:44 +0200
libapache2-mod-python (3.3.1-3) unstable; urgency=low
Modified: packages/libapache2-mod-python/trunk/debian/patches/00list
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/00list 2008-07-23 19:31:21 UTC (rev 6037)
+++ packages/libapache2-mod-python/trunk/debian/patches/00list 2008-07-23 20:03:36 UTC (rev 6038)
@@ -1,3 +1,3 @@
-01_configure.diff
-02_makefile.diff
-03_includes.diff
+01_configure
+02_makefile
+03_includes
Deleted: packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff 2008-07-23 19:31:21 UTC (rev 6037)
+++ packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff 2008-07-23 20:03:36 UTC (rev 6038)
@@ -1,53 +0,0 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- 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.dpatch (from rev 6033, packages/libapache2-mod-python/trunk/debian/patches/01_configure.diff)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch 2008-07-23 20:03:36 UTC (rev 6038)
@@ -0,0 +1,45 @@
+#! /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
Property changes on: packages/libapache2-mod-python/trunk/debian/patches/01_configure.dpatch
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff 2008-07-23 19:31:21 UTC (rev 6037)
+++ packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff 2008-07-23 20:03:36 UTC (rev 6038)
@@ -1,28 +0,0 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- 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.dpatch (from rev 6033, packages/libapache2-mod-python/trunk/debian/patches/02_makefile.diff)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch 2008-07-23 20:03:36 UTC (rev 6038)
@@ -0,0 +1,20 @@
+#! /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:
Property changes on: packages/libapache2-mod-python/trunk/debian/patches/02_makefile.dpatch
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff 2008-07-23 19:31:21 UTC (rev 6037)
+++ packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff 2008-07-23 20:03:36 UTC (rev 6038)
@@ -1,28 +0,0 @@
-#! /bin/sh -e
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- 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.dpatch (from rev 6033, packages/libapache2-mod-python/trunk/debian/patches/03_includes.diff)
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch 2008-07-23 20:03:36 UTC (rev 6038)
@@ -0,0 +1,20 @@
+#! /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=
Property changes on: packages/libapache2-mod-python/trunk/debian/patches/03_includes.dpatch
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the Python-modules-commits
mailing list