Package: hk-classes Version: 0.8.1a-1 Severity: normal Tags: patch Hi,
Attached is the diff for my hk-classes 0.8.1a-1.1 NMU.
diff -u hk-classes-0.8.1a/debian/changelog hk-classes-0.8.1a/debian/changelog --- hk-classes-0.8.1a/debian/changelog +++ hk-classes-0.8.1a/debian/changelog @@ -1,3 +1,39 @@ +hk-classes (0.8.1a-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Convert the package to the new Python policy; fixes FTBFS, based on patch + by Martin Wuertele. (Closes: #380843) + * Update Standards-Version to 3.7.2. + * Build-depend on debhelper (>= 5.0.37.2). + * Build-depend on python-support (>= 0.3). + * Add a call to dh_pysupport. + * Add debian/pycompat with the value of 2. + * Change build-dependency on python2.3-dev to python-all-dev. Also remove + unneeded build-dependency on python. + * Remove the separate config.status target and move the configure + invocation into the build-stamp target, since we need to run configure + multiple times (once per supported Python version). + * Configure, build install and clean once per supported Python version. + Changes needed to do an out-of-tree build for each supported version: + * 01_setup.py.dpatch: Hack python/setup.py.in slightly (change the + include directory, and symlink the source file into the build + directory before building); this has been merged into + 01_python_Makefile.{am,in}.dpatch. + * 01_outoftree.dpatch: Fix subdirectories' -I flags so they use + $(srcdir) and the likes instead of hardcoding relative include paths. + * Change package name from python2.3-hk-classes to python-hk-classes. + * Add conflicts/replaces from python-hk-classes on python2.3-hk-classes + (<= 0.8.1a-1), and provides on ${python:Provides} (replacing the + provides on python-hk-classes). + * Add XB-Python-Version: ${python:Versions} to python-hk-classes. + * Don't depend on python2.3; use ${python:Depends} instead. + * Change patches 01_python_Makefile.am.dpatch and + 01_python_Makefile.in.dpatch to use $(PYTHON_VERSION) instead of + hardcoding 2.3. + * Rename python2.3-hk-classes.install to python-hk-classes.install. + + -- Steinar H. Gunderson <[EMAIL PROTECTED]> Tue, 12 Sep 2006 20:33:06 +0200 + hk-classes (0.8.1a-1) unstable; urgency=low * New upstream release diff -u hk-classes-0.8.1a/debian/control hk-classes-0.8.1a/debian/control --- hk-classes-0.8.1a/debian/control +++ hk-classes-0.8.1a/debian/control @@ -2,8 +2,8 @@ Section: libs Priority: optional Maintainer: Mike Schacht <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), autotools-dev, libmysqlclient15-dev, libpq-dev, libiodbc2-dev, libsqlite0-dev, libsqlite3-dev, mdbtools-dev, libxbsql-dev, pxlib-dev, libgsf-1-dev, python2.3-dev, python, dpatch, libmagic-dev, libfontconfig1-dev -Standards-Version: 3.7.0 +Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libmysqlclient15-dev, libpq-dev, libiodbc2-dev, libsqlite0-dev, libsqlite3-dev, mdbtools-dev, libxbsql-dev, pxlib-dev, libgsf-1-dev, python-all-dev (>= 2.3.5-11), python-support (>= 0.3), dpatch, libmagic-dev, libfontconfig1-dev +Standards-Version: 3.7.2 Package: libhk-classes13-dev Section: libdevel @@ -32,11 +32,14 @@ like forms and reports. hk_classes is database and GUI independent. It also includes command line tools to use hk_classes in scripts. -Package: python2.3-hk-classes +Package: python-hk-classes Section: python Architecture: any -Depends: python2.3, ${shlibs:Depends}, ${misc:Depends} -Provides: python-hk-classes +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python2.3-hk-classes (<= 0.8.1a-1) +Replaces: python2.3-hk-classes (<= 0.8.1a-1) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} Suggests: knoda-python-doc Description: Python scripting module for libhk-classes hk_classes is a set of C++ libraries for rapid development of database diff -u hk-classes-0.8.1a/debian/rules hk-classes-0.8.1a/debian/rules --- hk-classes-0.8.1a/debian/rules +++ hk-classes-0.8.1a/debian/rules @@ -21,35 +21,41 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif - -config.status: patch configure + +PYTHONS := $(shell pyversions -vr debian/control) + +build: patch build-stamp + +build-stamp: dh_testdir touch configure.in && \ touch aclocal.m4 && \ touch configure - - ./configure $(confflags) \ - --disable-dependency-tracking \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --enable-static \ - --with-postgres-incdir=/usr/include/postgresql \ - --with-mdb-dir=/usr \ - --with-paradox-dir=/usr \ - --disable-rpath - -build: build-stamp - -build-stamp: config.status - dh_testdir - $(MAKE) libdir=/usr/lib + + set -e; for version in ${PYTHONS}; do\ + mkdir -p build-$$version;\ + cd build-$$version;\ + PYTHON_VERSION=$$version ../configure $(confflags) \ + --disable-dependency-tracking \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --enable-static \ + --with-postgres-incdir=/usr/include/postgresql \ + --with-mdb-dir=/usr \ + --with-paradox-dir=/usr \ + --disable-rpath;\ + $(MAKE) libdir=/usr/lib;\ + cd ..;\ + done touch build-stamp clean: unpatch dh_testdir dh_testroot rm -f build-stamp - -$(MAKE) distclean + for version in ${PYTHONS}; do\ + rm -rf build-$$version;\ + done rm -f config.log dh_clean @@ -59,8 +65,11 @@ dh_testroot dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ - libdir=/usr/lib + + for version in ${PYTHONS}; do\ + $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp \ + libdir=/usr/lib;\ + done binary-indep: build install @@ -77,6 +86,7 @@ dh_strip dh_compress dh_fixperms + dh_pysupport dh_python dh_makeshlibs -plibhk-classes13 dh_installdeb reverted: --- hk-classes-0.8.1a/debian/python2.3-hk-classes.install +++ hk-classes-0.8.1a.orig/debian/python2.3-hk-classes.install @@ -1 +0,0 @@ -usr/lib/python* diff -u hk-classes-0.8.1a/debian/patches/00list hk-classes-0.8.1a/debian/patches/00list --- hk-classes-0.8.1a/debian/patches/00list +++ hk-classes-0.8.1a/debian/patches/00list @@ -5,0 +6,2 @@ +./01_outoftree.dpatch +./01_setup.py.dpatch diff -u hk-classes-0.8.1a/debian/patches/01_python_Makefile.am.dpatch hk-classes-0.8.1a/debian/patches/01_python_Makefile.am.dpatch --- hk-classes-0.8.1a/debian/patches/01_python_Makefile.am.dpatch +++ hk-classes-0.8.1a/debian/patches/01_python_Makefile.am.dpatch @@ -11,7 +11,7 @@ @@ -1,5 +1,5 @@ all: clean - python setup.py build -+ python2.3 setup.py build ++ ln -s ../../python/hk_classes_wrap.cxx . ; ln -s ../../python/hk_classes.py . ; python$(PYTHON_VERSION) setup.py build clean: /bin/rm -f -R ./build/* @@ -20,10 +20,10 @@ install-data-hook: if test -z "$(DESTDIR)"; then \ - python setup.py install ; \ -+ python2.3 setup.py install --root $(prefix)/../; \ ++ python$(PYTHON_VERSION) setup.py install --root $(prefix)/../; \ else \ - python setup.py install --root $(DESTDIR) ; \ -+ python2.3 setup.py install --root $(DESTDIR) ; \ ++ python$(PYTHON_VERSION) setup.py install --root $(DESTDIR) ; \ fi /bin/rm -f -R ./build/* diff -u hk-classes-0.8.1a/debian/patches/01_python_Makefile.in.dpatch hk-classes-0.8.1a/debian/patches/01_python_Makefile.in.dpatch --- hk-classes-0.8.1a/debian/patches/01_python_Makefile.in.dpatch +++ hk-classes-0.8.1a/debian/patches/01_python_Makefile.in.dpatch @@ -13,7 +13,7 @@ all: clean - python setup.py build -+ python2.3 setup.py build ++ ln -s ../../python/hk_classes_wrap.cxx . ; ln -s ../../python/hk_classes.py . ; python$(PYTHON_VERSION) setup.py build clean: /bin/rm -f -R ./build/* @@ -22,10 +22,10 @@ install-data-hook: if test -z "$(DESTDIR)"; then \ - python setup.py install ; \ -+ python2.3 setup.py install --root $(prefix)/../ --no-compile; \ ++ python$(PYTHON_VERSION) setup.py install --root $(prefix)/../ --no-compile; \ else \ - python setup.py install --root $(DESTDIR) ; \ -+ python2.3 setup.py install --root $(DESTDIR) --no-compile; \ ++ python$(PYTHON_VERSION) setup.py install --root $(DESTDIR) --no-compile; \ fi /bin/rm -f -R ./build/* only in patch2: unchanged: --- hk-classes-0.8.1a.orig/hk_mdbclasses/Makefile.in +++ hk-classes-0.8.1a/hk_mdbclasses/Makefile.in @@ -69,7 +69,7 @@ write.lo stats.lo map.lo props.lo worktable.lo options.lo \ iconv.lo libhk_mdbdriver_la_OBJECTS = $(am_libhk_mdbdriver_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I../hk_classes -I ./mdbtools depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ only in patch2: unchanged: --- hk-classes-0.8.1a.orig/debian/pycompat +++ hk-classes-0.8.1a/debian/pycompat @@ -0,0 +1 @@ +2 only in patch2: unchanged: --- hk-classes-0.8.1a.orig/debian/patches/01_outoftree.dpatch +++ hk-classes-0.8.1a/debian/patches/01_outoftree.dpatch @@ -0,0 +1,219 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_hk_mdbclasses_outoftree.dpatch by Steinar H. Gunderson <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make hk_mdbclasses support out-of-tree builds. + [EMAIL PROTECTED]@ + +--- hk-classes-0.8.1a.orig/hk_mdbclasses/Makefile.am 2006-09-12 15:42:59.000000000 +0200 ++++ hk-classes-0.8.1a/hk_mdbclasses/Makefile.am 2006-09-12 15:43:31.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes -I ./mdbtools ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(top_srcdir)/hk_mdbclasses -I$(srcdir)/mdbtools + + AM_CPPFLAGS=$(GLIB_CFLAGS) + +--- hk-classes-0.8.1a.orig/hk_mdbclasses/Makefile.in 2006-09-12 15:43:40.000000000 +0200 ++++ hk-classes-0.8.1a/hk_mdbclasses/Makefile.in 2006-09-12 15:43:58.000000000 +0200 +@@ -230,7 +230,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes -I ./mdbtools ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(top_srcdir)/hk_mdbclasses -I$(srcdir)/mdbtools + AM_CPPFLAGS = $(GLIB_CFLAGS) + AM_CXXFLAGS = -Wall + libhk_mdbdriver_la_LDFLAGS = -version-info 0:0:0 $(GLIB_LIBADD) $(GLIB_LDFLAGS) +--- hk-classes-0.8.1a.orig/hk_mysqlclasses/Makefile.am 2006-04-13 20:02:06.000000000 +0200 ++++ hk-classes-0.8.1a/hk_mysqlclasses/Makefile.am 2006-09-12 16:41:32.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + + AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + +--- hk-classes-0.8.1a.orig/hk_mysqlclasses/Makefile.in 2006-04-23 17:06:48.000000000 +0200 ++++ hk-classes-0.8.1a/hk_mysqlclasses/Makefile.in 2006-09-12 16:41:49.000000000 +0200 +@@ -218,7 +218,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + libhk_mysqldriver_la_LDFLAGS = -version-info 3:4:0 [EMAIL PROTECTED]@ + libhk_mysqldriver_la_LIBADD = -lmysqlclient ../hk_classes/libhk_classes.la +--- hk-classes-0.8.1a/hk_paradoxclasses/Makefile.am 2006-04-13 20:02:07.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_paradoxclasses/Makefile.am 2006-09-12 16:48:41.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes -I./pxlib ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(srcdir)/pxlib + + AM_CPPFLAGS= + +--- hk-classes-0.8.1a/hk_paradoxclasses/Makefile.in 2006-04-23 17:06:48.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_paradoxclasses/Makefile.in 2006-09-12 16:48:50.000000000 +0200 +@@ -228,7 +228,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes -I./pxlib ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(srcdir)/pxlib + AM_CPPFLAGS = + AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + libhk_paradoxdriver_la_LDFLAGS = -version-info 0:0:0 +diff -ur hk-classes-0.8.1a/hk_firebirdclasses/Makefile.am hk-classes-0.8.1a.new/hk_firebirdclasses/Makefile.am +--- hk-classes-0.8.1a/hk_firebirdclasses/Makefile.am 2006-04-13 20:02:06.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_firebirdclasses/Makefile.am 2006-09-12 16:53:59.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + + AM_CPPFLAGS=-W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + +diff -ur hk-classes-0.8.1a/hk_firebirdclasses/Makefile.in hk-classes-0.8.1a.new/hk_firebirdclasses/Makefile.in +--- hk-classes-0.8.1a/hk_firebirdclasses/Makefile.in 2006-04-23 17:06:47.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_firebirdclasses/Makefile.in 2006-09-12 16:54:09.000000000 +0200 +@@ -220,7 +220,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + AM_CPPFLAGS = -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + AM_CXXFLAGS = -Wall + libhk_firebirddriver_la_LDFLAGS = -version-info 0:0:0 [EMAIL PROTECTED]@ +diff -ur hk-classes-0.8.1a/hk_odbcclasses/Makefile.am hk-classes-0.8.1a.new/hk_odbcclasses/Makefile.am +--- hk-classes-0.8.1a/hk_odbcclasses/Makefile.am 2006-04-13 20:02:06.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_odbcclasses/Makefile.am 2006-09-12 16:54:40.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + + libhk_odbcdriver_la_LDFLAGS = -version-info 0:0:0 [EMAIL PROTECTED]@ +diff -ur hk-classes-0.8.1a/hk_odbcclasses/Makefile.in hk-classes-0.8.1a.new/hk_odbcclasses/Makefile.in +--- hk-classes-0.8.1a/hk_odbcclasses/Makefile.in 2006-04-23 17:06:48.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_odbcclasses/Makefile.in 2006-09-12 16:54:50.000000000 +0200 +@@ -217,7 +217,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + libhk_odbcdriver_la_LDFLAGS = -version-info 0:0:0 [EMAIL PROTECTED]@ + libhk_odbcdriver_la_LIBADD = [EMAIL PROTECTED]@ ../hk_classes/libhk_classes.la +diff -ur hk-classes-0.8.1a/hk_postgresclasses/Makefile.am hk-classes-0.8.1a.new/hk_postgresclasses/Makefile.am +--- hk-classes-0.8.1a/hk_postgresclasses/Makefile.am 2006-04-13 20:02:07.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_postgresclasses/Makefile.am 2006-09-12 16:53:15.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + + AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + +--- hk-classes-0.8.1a/hk_postgresclasses/Makefile.in 2006-04-23 17:06:49.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_postgresclasses/Makefile.in 2006-09-12 16:53:23.000000000 +0200 +@@ -220,7 +220,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + libhk_postgresdriver_la_LDFLAGS = -version-info 0:1:0 [EMAIL PROTECTED]@ + libhk_postgresdriver_la_LIBADD = -lpq ../hk_classes/libhk_classes.la +diff -ur hk-classes-0.8.1a/hk_sqlite3classes/Makefile.am hk-classes-0.8.1a.new/hk_sqlite3classes/Makefile.am +--- hk-classes-0.8.1a/hk_sqlite3classes/Makefile.am 2006-04-13 20:02:07.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_sqlite3classes/Makefile.am 2006-09-12 16:55:11.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes -I ./sqlite ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(srcdir)/sqlite + + AM_CXXFLAGS= -Wall -DNO_TCL=1 -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + AM_CFLAGS= -DNO_TCL=1 +diff -ur hk-classes-0.8.1a/hk_sqlite3classes/Makefile.in hk-classes-0.8.1a.new/hk_sqlite3classes/Makefile.in +--- hk-classes-0.8.1a/hk_sqlite3classes/Makefile.in 2006-04-23 17:06:50.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_sqlite3classes/Makefile.in 2006-09-12 16:55:21.000000000 +0200 +@@ -234,7 +234,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes -I ./sqlite ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(srcdir)/sqlite + AM_CXXFLAGS = -Wall -DNO_TCL=1 -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + AM_CFLAGS = -DNO_TCL=1 + libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0 +diff -ur hk-classes-0.8.1a/hk_sqliteclasses/Makefile.am hk-classes-0.8.1a.new/hk_sqliteclasses/Makefile.am +--- hk-classes-0.8.1a/hk_sqliteclasses/Makefile.am 2006-04-13 20:02:07.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_sqliteclasses/Makefile.am 2006-09-12 16:55:36.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes -I./sqlite ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(srcdir)/sqlite + + AM_CXXFLAGS= -Wall -DNO_TCL=1 -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + AM_CFLAGS= -DNO_TCL=1 +diff -ur hk-classes-0.8.1a/hk_sqliteclasses/Makefile.in hk-classes-0.8.1a.new/hk_sqliteclasses/Makefile.in +--- hk-classes-0.8.1a/hk_sqliteclasses/Makefile.in 2006-04-23 17:06:51.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_sqliteclasses/Makefile.in 2006-09-12 16:55:44.000000000 +0200 +@@ -232,7 +232,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes -I./sqlite ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes -I$(srcdir)/sqlite + AM_CXXFLAGS = -Wall -DNO_TCL=1 -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + AM_CFLAGS = -DNO_TCL=1 + libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 +diff -ur hk-classes-0.8.1a/hk_xbaseclasses/Makefile.am hk-classes-0.8.1a.new/hk_xbaseclasses/Makefile.am +--- hk-classes-0.8.1a/hk_xbaseclasses/Makefile.am 2006-04-13 20:02:07.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_xbaseclasses/Makefile.am 2006-09-12 16:56:10.000000000 +0200 +@@ -1,5 +1,5 @@ + [EMAIL PROTECTED]@/drivers +-INCLUDES= -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + + AM_CPPFLAGS= + +diff -ur hk-classes-0.8.1a/hk_xbaseclasses/Makefile.in hk-classes-0.8.1a.new/hk_xbaseclasses/Makefile.in +--- hk-classes-0.8.1a/hk_xbaseclasses/Makefile.in 2006-04-23 17:06:51.000000000 +0200 ++++ hk-classes-0.8.1a.new/hk_xbaseclasses/Makefile.in 2006-09-12 16:56:21.000000000 +0200 +@@ -218,7 +218,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes [EMAIL PROTECTED]@ ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes [EMAIL PROTECTED]@ + AM_CPPFLAGS = + AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 [EMAIL PROTECTED]@ +--- hk-classes-0.8.1a/utilities/Makefile.am 2006-09-12 17:04:37.000000000 +0200 ++++ hk-classes-0.8.1a.new/utilities/Makefile.am 2006-04-13 20:02:08.000000000 +0200 +@@ -1,4 +1,4 @@ +-INCLUDES= -I../hk_classes ++INCLUDES= -I$(top_builddir) -I$(top_srcdir)/hk_classes + + bin_PROGRAMS = hk_actionquery hk_dbcopy hk_exportcsv hk_exporthtml hk_exportxml \ + hk_importcsv hk_report +diff -ur hk-classes-0.8.1a/utilities/Makefile.in hk-classes-0.8.1a.new/utilities/Makefile.in +--- hk-classes-0.8.1a/utilities/Makefile.in 2006-09-12 17:04:46.000000000 +0200 ++++ hk-classes-0.8.1a.new/utilities/Makefile.in 2006-09-12 17:04:04.000000000 +0200 +@@ -235,7 +235,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-INCLUDES = -I../hk_classes ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/hk_classes + AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings + hk_report_LDADD = ../hk_classes/libhk_classes.la -ldl + hk_report_SOURCES = hk_reportutility.cpp only in patch2: unchanged: --- hk-classes-0.8.1a.orig/debian/patches/01_setup.py.dpatch +++ hk-classes-0.8.1a/debian/patches/01_setup.py.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_setup.py.dpatch by Steinar H. Gunderson <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Small hack to make setup.py work out-of-tree. + [EMAIL PROTECTED]@ + +--- hk-classes-0.8.1a.orig/python/setup.py.in 2004-03-27 23:39:00.000000000 +0100 ++++ hk-classes-0.8.1a/python/setup.py.in 2006-09-12 20:37:34.000000000 +0200 +@@ -39,7 +39,7 @@ + hk_classesmodule= Extension('_hk_classes', + define_macros = [ ('MAJOR_VERSION','1'), + ('MINOR_VERSION','0')], +- include_dirs= ['../hk_classes'], ++ include_dirs= ['../../hk_classes'], + libraries = ['hk_classes'], + library_dirs = ['../hk_classes/.libs'], + runtime_library_dirs = ['@HK_CLASSESDIR@'], only in patch2: unchanged: --- hk-classes-0.8.1a.orig/debian/python-hk-classes.install +++ hk-classes-0.8.1a/debian/python-hk-classes.install @@ -0,0 +1 @@ +usr/lib/python*