[Python-modules-commits] r8989 - in packages/libapache2-mod-python/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Tuesday, July 7, 2009 @ 09:46:51
  Author: morph
Revision: 8989

* debian/patches/10_bts521965.dpatch
  - fix a FTBFS due to new apr (> 1.3.x); thanks to Daniel Schepler for the
    report; Closes: #521965 (RC hence urgency=medium)

Added:
  packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch
Modified:
  packages/libapache2-mod-python/trunk/debian/changelog
  packages/libapache2-mod-python/trunk/debian/patches/00list

Modified: packages/libapache2-mod-python/trunk/debian/changelog
===================================================================
--- packages/libapache2-mod-python/trunk/debian/changelog	2009-07-07 09:28:43 UTC (rev 8988)
+++ packages/libapache2-mod-python/trunk/debian/changelog	2009-07-07 09:46:51 UTC (rev 8989)
@@ -1,11 +1,17 @@
-libapache2-mod-python (3.3.1-8) UNRELEASED; urgency=low
+libapache2-mod-python (3.3.1-8) UNRELEASED; urgency=medium
 
+  [ Emilio Pozuelo Monfort ]
   * Unconditionally enable the Apache module upon first install, instead
     of asking the user through debconf. Closes: #512755.
   * Remove debconf templates and build magic because of the above change.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Wed, 25 Feb 2009 00:14:59 +0100
+  [ Sandro Tosi ]
+  * debian/patches/10_bts521965.dpatch
+    - fix a FTBFS due to new apr (> 1.3.x); thanks to Daniel Schepler for the
+      report; Closes: #521965 (RC hence urgency=medium)
 
+ -- Sandro Tosi <morph at debian.org>  Tue, 07 Jul 2009 11:41:07 +0200
+
 libapache2-mod-python (3.3.1-7) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/libapache2-mod-python/trunk/debian/patches/00list
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/00list	2009-07-07 09:28:43 UTC (rev 8988)
+++ packages/libapache2-mod-python/trunk/debian/patches/00list	2009-07-07 09:46:51 UTC (rev 8989)
@@ -1,3 +1,4 @@
 01_configure
 02_makefile
 03_includes
+10_bts521965

Added: packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch	                        (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch	2009-07-07 09:46:51 UTC (rev 8989)
@@ -0,0 +1,18 @@
+#! /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)
+
+ 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;


Property changes on: packages/libapache2-mod-python/trunk/debian/patches/10_bts521965.dpatch
___________________________________________________________________
Added: svn:executable
   + *