diff -u sqliteodbc-0.80/debian/changelog sqliteodbc-0.80/debian/changelog --- sqliteodbc-0.80/debian/changelog +++ sqliteodbc-0.80/debian/changelog @@ -1,3 +1,10 @@ +sqliteodbc (0.80-1ubuntu1) karmic; urgency=low + + * GCC 4.4 fix, architecture specific issue using a char * as fake va_list + (LP: #438450). + + -- David Sugar Mon, 28 Sep 2009 19:50:15 -0400 + sqliteodbc (0.80-1) unstable; urgency=low * New upstream release (Closes: #516367) diff -u sqliteodbc-0.80/debian/rules sqliteodbc-0.80/debian/rules --- sqliteodbc-0.80/debian/rules +++ sqliteodbc-0.80/debian/rules @@ -6,0 +7,2 @@ +include /usr/share/cdbs/1/rules/dpatch.mk + diff -u sqliteodbc-0.80/debian/control sqliteodbc-0.80/debian/control --- sqliteodbc-0.80/debian/control +++ sqliteodbc-0.80/debian/control @@ -1,8 +1,8 @@ Source: sqliteodbc Priority: optional Maintainer: Sam Clegg -Build-Depends: debhelper (>= 5), autotools-dev, cdbs, libsqlite-dev, unixodbc-dev, libsqlite3-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), autotools-dev, cdbs, libsqlite-dev, unixodbc-dev, libsqlite3-dev, dpatch +Standards-Version: 3.8.3 Section: libs Package: libsqliteodbc only in patch2: unchanged: --- sqliteodbc-0.80.orig/debian/README.source +++ sqliteodbc-0.80/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. only in patch2: unchanged: --- sqliteodbc-0.80.orig/debian/patches/10_fix_sqliteodbc_gcc-4.4.dpatch +++ sqliteodbc-0.80/debian/patches/10_fix_sqliteodbc_gcc-4.4.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_sqliteodbc_gcc-4.4.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for compiling old sqllite0 odbc driver code on gcc 4.4 or later. +## DP: This is based on assumption that char * could be transformable to a +## DP: va_list, which was improper, and on gcc 4.4 does not work for all +## DP: architectures anymore anyway. + +@DPATCH@ +diff -urNad sqliteodbc-0.80~/sqliteodbc.c sqliteodbc-0.80/sqliteodbc.c +--- sqliteodbc-0.80~/sqliteodbc.c 2009-01-20 04:22:22.000000000 -0500 ++++ sqliteodbc-0.80/sqliteodbc.c 2009-09-28 19:35:02.422532138 -0400 +@@ -39,6 +39,10 @@ + #endif + #endif + ++#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 3)) ++#define CANT_PASS_VALIST_AS_CHARPTR 1 ++#endif ++ + #ifdef _WIN64 + #define CANT_PASS_VALIST_AS_CHARPTR + #endif only in patch2: unchanged: --- sqliteodbc-0.80.orig/debian/patches/00list +++ sqliteodbc-0.80/debian/patches/00list @@ -0,0 +1 @@ +10_fix_sqliteodbc_gcc-4.4