Re: Michal Čihař 2006-11-07 <[EMAIL PROTECTED]>
> you can find attached patch for building metakit for python 2.4 what
> obviously fixes this problem. I'm going to push this as NMU through my
> AM.

Hi,

here comes the diff for the NMU I'll upload in a minute.

debdiff libmetakit2.4.9.3_2.4.9.3-6.1.dsc 
/srv/pbuilder/result/libmetakit2.4.9.3_2.4.9.3-6.2.dsc
 libmetakit2.4.9.3-2.4.9.3/debian/changelog |    7 +++++++
 debian/pyversions                          |    1 -
 libmetakit2.4.9.3-2.4.9.3/debian/control   |    4 +++-
 libmetakit2.4.9.3-2.4.9.3/debian/rules     |    8 +++++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff -u libmetakit2.4.9.3-2.4.9.3/debian/changelog 
libmetakit2.4.9.3-2.4.9.3/debian/changelog
--- libmetakit2.4.9.3-2.4.9.3/debian/changelog
+++ libmetakit2.4.9.3-2.4.9.3/debian/changelog
@@ -1,3 +1,10 @@
+libmetakit2.4.9.3 (2.4.9.3-6.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build against python 2.4 (Closes: #386480).
+
+ -- Michal Čihař <[EMAIL PROTECTED]>  Sun, 26 Nov 2006 15:45:49 +0100
+
 libmetakit2.4.9.3 (2.4.9.3-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
reverted:
--- libmetakit2.4.9.3-2.4.9.3/debian/pyversions
+++ libmetakit2.4.9.3-2.4.9.3.orig/debian/pyversions
@@ -1 +0,0 @@
-2.3
diff -u libmetakit2.4.9.3-2.4.9.3/debian/control 
libmetakit2.4.9.3-2.4.9.3/debian/control
--- libmetakit2.4.9.3-2.4.9.3/debian/control
+++ libmetakit2.4.9.3-2.4.9.3/debian/control
@@ -2,8 +2,9 @@
 Section: libs
 Priority: optional
 Maintainer: Gerfried Fuchs <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0), tcl8.4-dev, python2.3-dev, python-support 
(>= 0.4.0)
+Build-Depends: debhelper (>= 5.0.38), tcl8.4-dev, python-dev, python-support 
(>= 0.4.0)
 Standards-Version: 3.7.2
+XS-Python-Version: current
 
 Package: libmetakit2.4.9.3c2
 Architecture: any
@@ -26,6 +27,7 @@
 Provides: libmetakit-python, ${python:Provides}
 Replaces: libmetakit-python, python2.3-metakit (<< 2.4.9.3-6.1)
 Conflicts: libmetakit-python, python2.3-metakit (<< 2.4.9.3-6.1)
+XB-Python-Version: ${python:Versions}
 Description: Metakit bindings for python
  MetaKit is an embeddable database library. It lets you build applications
  which store their data efficiently, in a portable way, and which will not
diff -u libmetakit2.4.9.3-2.4.9.3/debian/rules 
libmetakit2.4.9.3-2.4.9.3/debian/rules
--- libmetakit2.4.9.3-2.4.9.3/debian/rules
+++ libmetakit2.4.9.3-2.4.9.3/debian/rules
@@ -8,6 +8,8 @@
 # This is the upstream release number to use in libtool -release
 export UPSTREAM_RELEASE=2.4.9.3
 
+PYTHON_VERSION=$(shell pyversions -d)
+
 CXXFLAGS=-g -fomit-frame-pointer -DNDEBUG
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CXXFLAGS += -O0
@@ -35,7 +37,7 @@
                --mandir=\$${prefix}/share/man \
                --infodir=\$${prefix}/share/info \
                --with-tcl=/usr/include/tcl8.4,/usr/lib/tcl8.4 \
-               --with-python=/usr
+               
--with-python=/usr/include/$(PYTHON_VERSION),/usr/lib/$(PYTHON_VERSION)/site-packages
        touch configure-stamp
 
 
@@ -52,7 +54,7 @@
        dh_clean -k
        dh_installdirs
        install -d debian/tmp/usr/include debian/tmp/usr/lib
-       mkdir -p debian/tmp/usr/lib/python2.3/site-packages
+       mkdir -p debian/tmp/usr/lib/$(PYTHON_VERSION)/site-packages
        (cd builds && ln -s ../debian debian)
        $(MAKE) -C builds install DESTDIR=$(CURDIR)/debian/tmp
        builds/libtool --finish $(CURDIR)/debian/tmp/usr/lib
@@ -78,7 +80,7 @@
        dh_installmanpages
        dh_installinfo
        dh_installchangelogs CHANGES
-       dh_pysupport -V2.3
+       dh_pysupport
        dh_link
        dh_strip
        dh_compress

Christoph
-- 
[EMAIL PROTECTED] | http://www.df7cb.de/

Attachment: signature.asc
Description: Digital signature

Reply via email to