[Pkg-voip-commits] r3970 - in gnugk/trunk/debian: . patches

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-08-10 06:38:51 +0000 (Fri, 10 Aug 2007)
New Revision: 3970

Added:
   gnugk/trunk/debian/patches/new_firebird_api.dpatch
Modified:
   gnugk/trunk/debian/changelog
   gnugk/trunk/debian/patches/00list
Log:
* Backport fix for new Firebird API from CVS revision 1.5.2.1. (Fixes at
  least part of the FTBFS on i386 and amd64)

Modified: gnugk/trunk/debian/changelog
===================================================================
--- gnugk/trunk/debian/changelog	2007-08-09 23:29:48 UTC (rev 3969)
+++ gnugk/trunk/debian/changelog	2007-08-10 06:38:51 UTC (rev 3970)
@@ -1,13 +1,18 @@
 gnugk (2:2.2.6-1) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * (NOT RELEASED YET) New upstream release
     - Authentication does not work in certain circumstances (Closes:
     #381092)
   * Ack NMU, Thanks Arjan (Closes: #408360)
   * Update debian/watch
 
- -- Mark Purcell <msp at debian.org>  Sat, 28 Jul 2007 10:35:46 +0100
+  [ Kilian Krause ]
+  * Backport fix for new Firebird API from CVS revision 1.5.2.1. (Fixes at
+    least part of the FTBFS on i386 and amd64)
 
+ -- Kilian Krause <kilian at debian.org>  Fri, 10 Aug 2007 08:38:28 +0200
+
 gnugk (2:2.2.5-3.1) unstable; urgency=high
 
   * Non-maintainer upload.

Modified: gnugk/trunk/debian/patches/00list
===================================================================
--- gnugk/trunk/debian/patches/00list	2007-08-09 23:29:48 UTC (rev 3969)
+++ gnugk/trunk/debian/patches/00list	2007-08-10 06:38:51 UTC (rev 3970)
@@ -0,0 +1 @@
+new_firebird_api

Added: gnugk/trunk/debian/patches/new_firebird_api.dpatch
===================================================================
--- gnugk/trunk/debian/patches/new_firebird_api.dpatch	                        (rev 0)
+++ gnugk/trunk/debian/patches/new_firebird_api.dpatch	2007-08-10 06:38:51 UTC (rev 3970)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## new_firebird_api.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport from upstream 2.2.7 version. CVS revision 1.5.2.1.
+
+ at DPATCH@
+diff -urNad gnugk-2.2.6~/gksql_firebird.cxx gnugk-2.2.6/gksql_firebird.cxx
+--- gnugk-2.2.6~/gksql_firebird.cxx	2007-03-13 19:39:43.000000000 +0100
++++ gnugk-2.2.6/gksql_firebird.cxx	2007-08-10 08:36:36.966520914 +0200
+@@ -547,7 +547,7 @@
+ 	
+ 	ISC_STATUS status[20];
+ 	isc_db_handle conn = NULL;
+-	std::string dbname = m_database;
++	std::string dbname((const char*)m_database);
+ 	
+ 	if (!m_host) {
+ 		dbname.insert(0, ":");


Property changes on: gnugk/trunk/debian/patches/new_firebird_api.dpatch
___________________________________________________________________
Name: svn:executable
   + *