[Pkg-voip-commits] r3681 - in libccscript3/trunk/debian: . patches

[msp at alioth.debian.org]

Author: msp
Date: 2007-06-22 11:02:24 +0000 (Fri, 22 Jun 2007)
New Revision: 3681

Added:
   libccscript3/trunk/debian/patches/
   libccscript3/trunk/debian/patches/dbug365518.patch
Modified:
   libccscript3/trunk/debian/changelog
   libccscript3/trunk/debian/rules
Log:
* Reapply dbug326756 patch
  - FTBFS (amd64): cannot convert 'long int*' to 'SQLINTEGER*' for
  argument '2' to 'SQLRETURN SQLRowCount(void*, SQLINTEGER*)' (Closes:
  #326756)

Modified: libccscript3/trunk/debian/changelog
===================================================================
--- libccscript3/trunk/debian/changelog	2007-06-20 23:44:24 UTC (rev 3680)
+++ libccscript3/trunk/debian/changelog	2007-06-22 11:02:24 UTC (rev 3681)
@@ -1,8 +1,11 @@
-libccscript3 (1.1.6-2) UNRELEASED; urgency=low
+libccscript3 (1.1.6-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Reapply dbug326756 patch
+    - FTBFS (amd64): cannot convert 'long int*' to 'SQLINTEGER*' for
+    argument '2' to 'SQLRETURN SQLRowCount(void*, SQLINTEGER*)' (Closes:
+    #326756)
 
- -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 20:57:46 +0100
+ -- Mark Purcell <msp at debian.org>  Fri, 22 Jun 2007 12:01:38 +0100
 
 libccscript3 (1.1.6-1) unstable; urgency=low
 

Added: libccscript3/trunk/debian/patches/dbug365518.patch
===================================================================
--- libccscript3/trunk/debian/patches/dbug365518.patch	                        (rev 0)
+++ libccscript3/trunk/debian/patches/dbug365518.patch	2007-06-22 11:02:24 UTC (rev 3681)
@@ -0,0 +1,14 @@
+diff -Nur libccscript3-1.1.6/optional/odbc/thread.cpp libccscript3-1.1.6.new/optional/odbc/thread.cpp
+--- libccscript3-1.1.6/optional/odbc/thread.cpp	2007-01-12 13:36:02.000000000 +0000
++++ libccscript3-1.1.6.new/optional/odbc/thread.cpp	2007-06-22 11:58:03.000000000 +0100
+@@ -63,8 +63,8 @@
+ 	SQLCHAR stat[10];
+ 	SQLCHAR errmsg[128];
+ 	SQLSMALLINT mlen, col, cols;
+-#if ODBCVER >= 0x0300 && !defined(__ppc__)
+-	SQLINTEGER rowcnt;
++#if ODBCVER >= 0x0300
++	SQLLEN rowcnt;
+ #else
+ 	long int rowcnt;
+ #endif

Modified: libccscript3/trunk/debian/rules
===================================================================
--- libccscript3/trunk/debian/rules	2007-06-20 23:44:24 UTC (rev 3680)
+++ libccscript3/trunk/debian/rules	2007-06-22 11:02:24 UTC (rev 3681)
@@ -8,6 +8,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp