diff -Nru aolserver4-nspostgres-4.5+20110709/debian/changelog aolserver4-nspostgres-4.5+20110709/debian/changelog --- aolserver4-nspostgres-4.5+20110709/debian/changelog 2014-04-07 07:51:43.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/changelog 2014-04-30 04:59:16.000000000 +0000 @@ -1,12 +1,9 @@ -aolserver4-nspostgres (4.5+20110709-1ubuntu1) trusty; urgency=low +aolserver4-nspostgres (4.5+20110709-2) unstable; urgency=medium - * Fixed FTBFS from using deprecated structure access of - Tcl_interp (LP: #1303405) - - nspostgres.c: replaces direct access of result field in - Tlc_interp structure with API functions Tcl_GetStringResult - and Tcl_SetString. + * New Tcl 8.6 could require some special definitions to work with legacy + code. (closes: #743074, #746168) - -- Sebastian Carneiro Sat, 05 Apr 2014 00:13:22 -0300 + -- Francesco Paolo Lovergine Mon, 28 Apr 2014 08:47:05 +0200 aolserver4-nspostgres (4.5+20110709-1) unstable; urgency=low @@ -20,12 +17,6 @@ -- Francesco Paolo Lovergine Wed, 08 Jan 2014 14:28:03 +0100 -aolserver4-nspostgres (4.5-3build1) precise; urgency=low - - * No-change rebuild for aolserver4-core ABI transition. - - -- Ilya Barygin Sun, 13 Nov 2011 11:57:18 +0400 - aolserver4-nspostgres (4.5-3) unstable; urgency=low [ Francesco Paolo Lovergine ] diff -Nru aolserver4-nspostgres-4.5+20110709/debian/control aolserver4-nspostgres-4.5+20110709/debian/control --- aolserver4-nspostgres-4.5+20110709/debian/control 2014-04-07 07:51:43.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/control 2014-04-30 04:59:16.000000000 +0000 @@ -1,8 +1,7 @@ Source: aolserver4-nspostgres Section: web Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Francesco Paolo Lovergine +Maintainer: Francesco Paolo Lovergine Build-Depends: debhelper (>= 9), aolserver4-dev (>= 4.5.1), libpq-dev Standards-Version: 3.9.5 Homepage: http://www.aolserver.com/ diff -Nru aolserver4-nspostgres-4.5+20110709/debian/Makefile.debian aolserver4-nspostgres-4.5+20110709/debian/Makefile.debian --- aolserver4-nspostgres-4.5+20110709/debian/Makefile.debian 2014-04-07 07:51:23.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/Makefile.debian 2014-04-30 04:59:16.000000000 +0000 @@ -116,6 +116,7 @@ endif CFLAGS += -DBIND_EMULATION -I$(PGINC) +CFLAGS += -DUSE_INTERP_RESULT # # ACS users should set ACS=1 diff -Nru aolserver4-nspostgres-4.5+20110709/debian/patches/deprecated-tclinterp-result-access aolserver4-nspostgres-4.5+20110709/debian/patches/deprecated-tclinterp-result-access --- aolserver4-nspostgres-4.5+20110709/debian/patches/deprecated-tclinterp-result-access 2014-04-07 07:51:43.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/patches/deprecated-tclinterp-result-access 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -Description: Uses API functions to access result in Tcl_interp. - Replaces deprecated direct access of field result in Tcl_interp structure - with Tcl_GetStringResult / Tcl_SetResult fixing FTBFS. -Author: Sebastian Carneiro -Bug: -Bug-Debian: https://bugs.debian.org/743074 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303405 -Forwarded: yes -Last-Update: 2014-04-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: fix-for-ftbfs/nspostgres.c -=================================================================== ---- fix-for-ftbfs.orig/nspostgres.c 2014-04-06 00:32:53.467854019 -0300 -+++ fix-for-ftbfs/nspostgres.c 2014-04-06 00:35:35.420657098 -0300 -@@ -31,6 +31,7 @@ - - #include "nspostgres.h" - #include -+#include - - DllExport int Ns_ModuleVersion = 1; - -@@ -1760,6 +1761,8 @@ - return TCL_ERROR; - } - -+ char * interp_result = Tcl_GetStringResult(interp); -+ - if (!strcmp(argv[1], "db")) { - Tcl_SetResult(interp, (char *) PQdb(nspgConn->conn), TCL_STATIC); - } else if (!strcmp(argv[1], "host")) { -@@ -1769,15 +1772,15 @@ - } else if (!strcmp(argv[1], "port")) { - Tcl_SetResult(interp, (char *) PQport(nspgConn->conn), TCL_STATIC); - } else if (!strcmp(argv[1], "number")) { -- sprintf(interp->result, "%u", nspgConn->cNum); -+ sprintf(interp_result, "%u", nspgConn->cNum); - } else if (!strcmp(argv[1], "error")) { - Tcl_SetResult(interp, (char *) PQerrorMessage(nspgConn->conn), - TCL_STATIC); - } else if (!strcmp(argv[1], "status")) { - if (PQstatus(nspgConn->conn) == CONNECTION_OK) { -- interp->result = "ok"; -+ Tcl_SetResult(interp, "ok", TCL_VOLATILE); - } else { -- interp->result = "bad"; -+ Tcl_SetResult(interp, "bad", TCL_VOLATILE); - } - } else if (!strcmp(argv[1], "ntuples")) { - char string[16]; -@@ -1982,7 +1985,8 @@ - argv[0], " ", argv[1], " dbId table\"", NULL); - goto bailout; - } -- sprintf (interp->result, "%d", tinfo->ncolumns); -+ char * interp_result = Tcl_GetStringResult(interp); -+ sprintf (interp_result, "%d", tinfo->ncolumns); - - } - else if (!strcmp(argv[1], "exists")) diff -Nru aolserver4-nspostgres-4.5+20110709/debian/patches/series aolserver4-nspostgres-4.5+20110709/debian/patches/series --- aolserver4-nspostgres-4.5+20110709/debian/patches/series 2014-04-07 07:51:43.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -deprecated-tclinterp-result-access diff -Nru aolserver4-nspostgres-4.5+20110709/debian/rules aolserver4-nspostgres-4.5+20110709/debian/rules --- aolserver4-nspostgres-4.5+20110709/debian/rules 2014-04-07 07:51:43.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/rules 2014-04-30 04:59:16.000000000 +0000 @@ -28,7 +28,7 @@ build-stamp: configure-stamp dh_testdir - CFLAGS="$(CFLAGS)" $(MAKE) -f debian/Makefile.debian POSTGRES=PG_CONFIG PG_CONFIG=/usr/bin/pg_config ACS=1 + CFLAGS="$(CFLAGS)" $(MAKE) -f debian/Makefile.debian POSTGRES=PG_CONFIG PG_CONFIG=/usr/bin/pg_config ACS=1 touch build-stamp diff -Nru aolserver4-nspostgres-4.5+20110709/debian/source/format aolserver4-nspostgres-4.5+20110709/debian/source/format --- aolserver4-nspostgres-4.5+20110709/debian/source/format 2014-04-07 07:51:43.000000000 +0000 +++ aolserver4-nspostgres-4.5+20110709/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt)