Bug#535120: [PATCH] hk-classes FTBFS with python2.6 (test and fix)
tags 535120 + patch
thanks
Hi,
I have tested this patch with python2.5 and python2.6 from
experimental, and it builds fine on both python versions.
Cheers
P.S.- This patch includes previous sent patch.
--
Héctor Orón
diff -urN hk-classes-0.8.3/debian/patches/python2.6.patch hk-classes-0.8.3.bbb/debian/patches/python2.6.patch
--- hk-classes-0.8.3/debian/patches/python2.6.patch 1970-01-01 01:00:00.000000000 +0100
+++ hk-classes-0.8.3.bbb/debian/patches/python2.6.patch 2009-07-20 18:11:04.000000000 +0200
@@ -0,0 +1,30 @@
+diff -Nur -x '*.orig' -x '*~' hk-classes-0.8.3/python/Makefile.am hk-classes-0.8.3.new/python/Makefile.am
+--- hk-classes-0.8.3/python/Makefile.am 2006-05-23 18:02:11.000000000 +0000
++++ hk-classes-0.8.3.new/python/Makefile.am 2009-06-26 04:07:47.000000000 +0000
+@@ -10,9 +10,9 @@
+
+ install-data-hook:
+ if test -z "$(DESTDIR)"; then \
+- python setup.py install ; \
++ python setup.py install --install-layout=deb ; \
+ else \
+- python setup.py install --root $(DESTDIR) ; \
++ python setup.py install --install-layout=deb --root $(DESTDIR) ; \
+ fi
+ /bin/rm -f -R ./build/*
+
+diff -Nur -x '*.orig' -x '*~' hk-classes-0.8.3/python/Makefile.in hk-classes-0.8.3.new/python/Makefile.in
+--- hk-classes-0.8.3/python/Makefile.in 2006-12-17 14:27:52.000000000 +0000
++++ hk-classes-0.8.3.new/python/Makefile.in 2009-06-26 04:07:00.000000000 +0000
+@@ -371,9 +371,9 @@
+
+ install-data-hook:
+ if test -z "$(DESTDIR)"; then \
+- python setup.py install ; \
++ python setup.py install --install-layout=deb ; \
+ else \
+- python setup.py install --root $(DESTDIR) ; \
++ python setup.py install --install-layout=deb --root $(DESTDIR) ; \
+ fi
+ /bin/rm -f -R ./build/*
+
diff -urN hk-classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp hk-classes-0.8.3.bbb/hk_firebirdclasses/hk_firebirdcolumn.cpp
--- hk-classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp 2005-07-02 16:15:04.000000000 +0200
+++ hk-classes-0.8.3.bbb/hk_firebirdclasses/hk_firebirdcolumn.cpp 2009-07-20 18:11:23.000000000 +0200
@@ -10,6 +10,7 @@
// ****************************************************************************
#include "hk_firebirdcolumn.h"
#include "hk_firebirddatasource.h"
+#include <string.h>
hk_firebirdcolumn::hk_firebirdcolumn(hk_firebirddatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE)
diff -urN hk-classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp hk-classes-0.8.3.bbb/hk_firebirdclasses/hk_firebirdconnection.cpp
--- hk-classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp 2006-07-16 21:11:52.000000000 +0200
+++ hk-classes-0.8.3.bbb/hk_firebirdclasses/hk_firebirdconnection.cpp 2009-07-20 18:11:23.000000000 +0200
@@ -12,6 +12,7 @@
#include "hk_firebirddatabase.h"
#include <dlfcn.h>
#include <dirent.h>
+#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#ifdef HAVE_SSTREAM
diff -urN hk-classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp hk-classes-0.8.3.bbb/hk_firebirdclasses/hk_firebirddatasource.cpp
--- hk-classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp 2006-06-29 20:10:17.000000000 +0200
+++ hk-classes-0.8.3.bbb/hk_firebirdclasses/hk_firebirddatasource.cpp 2009-07-20 18:11:23.000000000 +0200
@@ -14,6 +14,7 @@
#include "hk_firebirdcolumn.h"
#include "hk_firebirdactionquery.h"
#include <hk_datetime.h>
+#include <string.h>
#include <time.h>
#include <exception>
#include <new>
Reply to: