Hi Matthias,
I've prepared a zero-day NMU for this bug, which I will be uploading
shortly. The final diff, with changelog entry, is attached.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
[EMAIL PROTECTED] http://www.debian.org/
diff -u pysvn-1.4.2+dfsg/Source/setup.py pysvn-1.4.2+dfsg/Source/setup.py
--- pysvn-1.4.2+dfsg/Source/setup.py
+++ pysvn-1.4.2+dfsg/Source/setup.py
@@ -367,6 +367,9 @@
return dir
def find_apr_inc( self, argv ):
+ result = os.popen('apr-config --includedir 2>/dev/null').read().strip()
+ if result:
+ return result
last_exception = None
for apr_ver in ['apr-1', 'apr-0']:
try:
diff -u pysvn-1.4.2+dfsg/debian/control pysvn-1.4.2+dfsg/debian/control
--- pysvn-1.4.2+dfsg/debian/control
+++ pysvn-1.4.2+dfsg/debian/control
@@ -2,7 +2,7 @@
Section: python
Priority: optional
Maintainer: Matthias Klose <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9),
python-cxx-dev (>= 5.3.5-2), libsvncpp-dev (>= 0.9.1), libapr0-dev, subversion
(>= 1.3.1)
+Build-Depends: debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-9),
python-cxx-dev (>= 5.3.5-2), libsvncpp-dev (>= 0.9.1), libapr1-dev, subversion
(>= 1.3.1)
XS-Python-Version: all
Standards-Version: 3.7.2
diff -u pysvn-1.4.2+dfsg/debian/changelog pysvn-1.4.2+dfsg/debian/changelog
--- pysvn-1.4.2+dfsg/debian/changelog
+++ pysvn-1.4.2+dfsg/debian/changelog
@@ -1,3 +1,13 @@
+pysvn (1.4.2+dfsg-0.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for etch-targetted RC bugfix.
+ * Build-depend on libapr1-dev instead of libapr0-dev and use
+ apr-config --includedir in setup.py, for the apache2.2 transition.
+ Closes: #391637.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Tue, 24 Oct 2006 02:15:19 -0700
+
pysvn (1.4.2+dfsg-0.1) unstable; urgency=medium
* Non-maintainer upload.
