[Pkg-tcltk-commits] r486 - in tclodbc/trunk/debian: . patches

danirus-guest at alioth.debian.org danirus-guest at alioth.debian.org
Sun Feb 3 18:28:10 UTC 2008


Author: danirus-guest
Date: 2008-02-03 18:28:10 +0000 (Sun, 03 Feb 2008)
New Revision: 486

Added:
   tclodbc/trunk/debian/patches/07-encoding.cxx.dpatch
   tclodbc/trunk/debian/patches/08-strings.cxx.dpatch
   tclodbc/trunk/debian/patches/09-tclobj.cxx.dpatch
   tclodbc/trunk/debian/patches/10-tclodbc.cxx.dpatch
Modified:
   tclodbc/trunk/debian/changelog
   tclodbc/trunk/debian/patches/00list
   tclodbc/trunk/debian/patches/04-tclodbc.hxx.dpatch
   tclodbc/trunk/debian/patches/05-statemnt.cxx.dpatch
   tclodbc/trunk/debian/patches/06-database.cxx.dpatch
   tclodbc/trunk/debian/rules
Log:
Fixes bugs #461600 and #463583, and several warning messages.

Modified: tclodbc/trunk/debian/changelog
===================================================================
--- tclodbc/trunk/debian/changelog	2008-02-02 12:50:40 UTC (rev 485)
+++ tclodbc/trunk/debian/changelog	2008-02-03 18:28:10 UTC (rev 486)
@@ -1,7 +1,8 @@
 tclodbc (2.5-5) unstable; urgency=low
 
-  * Closes: #461600 (Not using -fPIC).
-  * Closes: #463583 (unresolved symbols).
+  * Closes: #461600 (Not using -fPIC). Thanks to Kurt Roeckx.
+  * Closes: #463583 (unresolved symbols attemting to load the library).
+  * Fixes some warning messages due to deprecated string conversions.
 
  -- Daniel Rus Morales <danirus at tol-project.org>  Fri, 01 Feb 2008 17:30:40 +0100
 

Modified: tclodbc/trunk/debian/patches/00list
===================================================================
--- tclodbc/trunk/debian/patches/00list	2008-02-02 12:50:40 UTC (rev 485)
+++ tclodbc/trunk/debian/patches/00list	2008-02-03 18:28:10 UTC (rev 486)
@@ -4,3 +4,7 @@
 04-tclodbc.hxx
 05-statemnt.cxx
 06-database.cxx
+07-encoding.cxx
+08-strings.cxx
+09-tclobj.cxx
+10-tclodbc.cxx

Modified: tclodbc/trunk/debian/patches/04-tclodbc.hxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/04-tclodbc.hxx.dpatch	2008-02-02 12:50:40 UTC (rev 485)
+++ tclodbc/trunk/debian/patches/04-tclodbc.hxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -1,12 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 04-tclodbc.hxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
 ##
-## DP: Fix bug #435291.
+## DP: Fix bug #435291 and warning messages due to deprecated char conversions
 
 @DPATCH@
 diff -u upstrm/tclodbc.hxx debsrc/tclodbc.hxx
 --- upstrm/tclodbc.hxx	2007-04-12 12:11:03.000000000 +0200
-+++ debsrc/tclodbc.hxx	2007-08-07 17:18:44.000000000 +0200
++++ debsrc/tclodbc.hxx	2008-02-02 12:58:14.000000000 +0100
 @@ -190,9 +190,9 @@
  // A struct for storing necessary data for retrieving sql results
  struct ResultBuffer
@@ -33,3 +33,86 @@
      SWORD   fSourceType;
  };
  
+@@ -471,35 +471,35 @@
+ // COMMON STRINGS AND STRINGTABLES
+ //
+ 
+-extern char* strVersion;
+-extern char* strMemoryAllocationFailed;
+-extern char* strInvalidHandle;
+-extern char* strOK;
+-extern char* strTables;
+-extern char* strColumns;
+-extern char* strIndexes;
+-extern char* strPrimarykeys;
+-extern char* strTypeinfo;
+-extern char* strEval;
+-extern char* strRead;
+-extern char* strGet;
+-extern char* strSet;
+-extern char* strAutocommit;
+-extern char* strWrongArgs;
+-extern char* strUsage;
+-extern char* strCmdNotAvailable;
+-extern char* strEmpty;
+-
+-extern char* strConcurrency;
+-extern char* strMaxrows;
+-extern char* strTimeout;
+-extern char* strMaxlenght;
+-extern char* strRowsetsize;
+-extern char* strCursortype;
++extern const char* strVersion;
++extern const char* strMemoryAllocationFailed;
++extern const char* strInvalidHandle;
++extern const char* strOK;
++extern const char* strTables;
++extern const char* strColumns;
++extern const char* strIndexes;
++extern const char* strPrimarykeys;
++extern const char* strTypeinfo;
++extern const char* strEval;
++extern const char* strRead;
++extern const char* strGet;
++extern const char* strSet;
++extern const char* strAutocommit;
++extern const char* strWrongArgs;
++extern const char* strUsage;
++extern const char* strCmdNotAvailable;
++extern const char* strEmpty;
++
++extern const char* strConcurrency;
++extern const char* strMaxrows;
++extern const char* strTimeout;
++extern const char* strMaxlenght;
++extern const char* strRowsetsize;
++extern const char* strCursortype;
+ 
+-extern char* strInvalidOption;
++extern const char* strInvalidOption;
+ 
+-extern char* strOldSyntax;
++extern const char* strOldSyntax;
+ 
+ extern NumStr sqlType [];
+ extern NumStr attrDef [];
+@@ -520,16 +520,16 @@
+ 
+ TclObj SqlErr (HENV env, HDBC dbc, HSTMT stmt);
+ short StrToNum (char *str, NumStr array[], 
+-                char* errMsg = strInvalidOption,
++                char* errMsg = (char*) strInvalidOption,
+                 BOOLEAN allowNumeric = TRUE);
+ TclObj NumToStr (short num, NumStr array[]);
+ 
+ inline short SqlType (char *strType) {
+-    return StrToNum(strType, sqlType, "Invalid sql type: ");
++  return StrToNum(strType, sqlType, (char*) "Invalid sql type: ");
+ };
+ 
+ inline short AttrDef (char *strDef) {
+-    return StrToNum(strDef, attrDef, "Invalid attribute: ");
++  return StrToNum(strDef, attrDef, (char*) "Invalid attribute: ");
+ };
+ 
+ inline short ConfigOp (char *strDef) {

Modified: tclodbc/trunk/debian/patches/05-statemnt.cxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/05-statemnt.cxx.dpatch	2008-02-02 12:50:40 UTC (rev 485)
+++ tclodbc/trunk/debian/patches/05-statemnt.cxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -1,12 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 05-statemnt.cxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
 ##
-## DP: Fix bug #435291.
+## DP: Fix bug #435291 and warning messages due to deprecated char conversions
 
 @DPATCH@
 diff -u upstrm/statemnt.cxx debsrc/statemnt.cxx
 --- upstrm/statemnt.cxx	2007-04-12 12:11:03.000000000 +0200
-+++ debsrc/statemnt.cxx	2007-08-07 17:13:58.000000000 +0200
++++ debsrc/statemnt.cxx	2008-02-02 12:59:59.000000000 +0100
 @@ -50,8 +50,10 @@
  #include "tclodbc.hxx"
  
@@ -29,6 +29,50 @@
  
      if (!pDb) {
          THROWSTR("Connection closed. Cannot execute.");
+@@ -95,7 +97,7 @@
+                 THROWSTR(strWrongArgs);
+ 	    }
+             Tcl_DeleteCommandFromToken(interp, tclCommand);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case COLUMNS:
+@@ -111,7 +113,7 @@
+                 THROWSTR("wrong # args, should be execute [args]");
+ 	    }
+             Execute(interp, objc-2, objv+2);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case MORERESULTS: {
+@@ -184,7 +186,7 @@
+ 	    }
+             SetOption(Tcl_GetStringFromObj(objv[2], NULL), 
+ 			          Tcl_GetStringFromObj(objv[3], NULL));
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case GET:
+@@ -197,14 +199,14 @@
+             if (objc < 3 || objc > 4)
+                 THROWSTR("wrong # args, should be eval proc [args]")
+             Eval(interp, TclObj(objv[2]), objc-3, objv+3);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case READ:
+             if (objc < 3 || objc > 4)
+                 THROWSTR("wrong # args, should be read array [args]")
+             Read(interp, TclObj(objv[2]), objc-3, objv+3);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case ROWCOUNT:
 @@ -358,9 +360,9 @@
  		result.appendElement(row);
  	    }

Modified: tclodbc/trunk/debian/patches/06-database.cxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/06-database.cxx.dpatch	2008-02-02 12:50:40 UTC (rev 485)
+++ tclodbc/trunk/debian/patches/06-database.cxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -1,12 +1,12 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 06-database.cxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
 ##
-## DP: Fix two warnings.
+## DP: Fix several warning messages
 
 @DPATCH@
 diff -u upstrm/database.cxx debsrc/database.cxx
 --- upstrm/database.cxx	2007-04-12 12:11:03.000000000 +0200
-+++ debsrc/database.cxx	2007-08-07 15:39:45.000000000 +0200
++++ debsrc/database.cxx	2008-02-02 12:59:24.000000000 +0100
 @@ -79,9 +79,9 @@
  }
  
@@ -32,3 +32,66 @@
  #ifdef INCLUDE_EXTENSIONS
      RETCODE rc;
      unsigned char szConnStrOut[256];
+@@ -215,7 +216,7 @@
+                 THROWSTR(strWrongArgs);
+ 	    }
+             Tcl_DeleteCommandFromToken(interp, tclCommand);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case TABLES:
+@@ -261,7 +262,7 @@
+                 THROWSTR(strWrongArgs);
+ 	    }
+             Transact(SQL_COMMIT);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case ROLLBACK:
+@@ -269,7 +270,7 @@
+                 THROWSTR(strWrongArgs);
+ 	    }
+             Transact(SQL_ROLLBACK);
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case SET:
+@@ -279,7 +280,7 @@
+             SetOption(interp,
+                       Tcl_GetStringFromObj(objv[2], NULL), 
+ 			          Tcl_GetString(objv[3]));
+-            Tcl_SetResult(interp, strOK, TCL_STATIC);
++            Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             break;
+ 
+         case GET:
+@@ -304,7 +305,7 @@
+                 } 
+ 
+                 stmt.Eval(interp, proc, objc-4, objv+4);
+-                Tcl_SetResult(interp, strOK, TCL_STATIC);
++                Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             }
+             break;
+ 
+@@ -323,7 +324,7 @@
+                 } 
+ 
+                 stmt.Read(interp, arraySpec, objc-4, objv+4);
+-                Tcl_SetResult(interp, strOK, TCL_STATIC);
++                Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+             }
+             break;
+ 
+@@ -581,7 +582,7 @@
+     attributes.Encode(NULL);
+ 
+     if (SQLConfigDataSource(NULL, operation, driver, attributes.EncodedValue())) {
+-        Tcl_SetResult(interp, strOK, TCL_STATIC);
++        Tcl_SetResult(interp, (char*) strOK, TCL_STATIC);
+         return TCL_OK;
+     } else {
+         THROWSTR("datasource configuration failed");

Added: tclodbc/trunk/debian/patches/07-encoding.cxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/07-encoding.cxx.dpatch	                        (rev 0)
+++ tclodbc/trunk/debian/patches/07-encoding.cxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-encoding.cxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
+##
+## DP: Fix warning messages due to deprecated char conversions
+
+ at DPATCH@
+diff -u upstrm/encoding.cxx debsrc/encoding.cxx
+--- upstrm/encoding.cxx	2007-04-12 12:11:03.000000000 +0200
++++ debsrc/encoding.cxx	2008-02-02 13:00:35.000000000 +0100
+@@ -108,13 +108,13 @@
+ 
+ int SetTclodbcEncodedString(Tcl_Interp *interp, Tcl_Obj *p) {
+     if (interp)
+-        Tcl_SetResult(interp, "Not supported", TCL_STATIC);
++        Tcl_SetResult(interp, (char*) "Not supported", TCL_STATIC);
+ 
+     return TCL_ERROR;
+ }
+ 
+ Tcl_ObjType TclodbcEncodedString = {
+-    "TclodbcEncodedString", 
++    (char*) "TclodbcEncodedString", 
+     FreeTclodbcEncodedString, 
+     DuplicateTclodbcEncodedString, 
+     UpdateTclodbcEncodedString, 


Property changes on: tclodbc/trunk/debian/patches/07-encoding.cxx.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: tclodbc/trunk/debian/patches/08-strings.cxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/08-strings.cxx.dpatch	                        (rev 0)
+++ tclodbc/trunk/debian/patches/08-strings.cxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -0,0 +1,366 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-strings.cxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
+##
+## DP: Fix warning messages due to deprecated char conversions
+
+ at DPATCH@
+diff -u upstrm/strings.cxx debsrc/strings.cxx
+--- upstrm/strings.cxx	2007-04-12 12:11:03.000000000 +0200
++++ debsrc/strings.cxx	2008-02-02 12:51:39.000000000 +0100
+@@ -50,24 +50,24 @@
+ #include "tclodbc.hxx"
+ 
+ // standard strings
+-char* strVersion = "tclodbc " PACKAGE_VERSION " (c) Roy Nurmi 1998, 2002";
+-char* strMemoryAllocationFailed = "Memory allocation failed";
+-char* strInvalidHandle		= "Invalid handle";
+-char* strOK			= "OK";
+-char* strTables			= "tables";
+-char* strColumns		= "columns";
+-char* strIndexes		= "indexes";
+-char* strPrimarykeys		= "primarykeys";
+-char* strTypeinfo		= "typeinfo";
+-char* strEval			= "eval";
+-char* strRead			= "read";
+-char* strGet			= "get";
+-char* strSet			= "set";
+-char* strAutocommit		= "autocommit";
+-char* strCommit			= "commit";
+-char* strRollback		= "rollback";
+-char* strWrongArgs		= "wrong # args";
+-char* strUsage = 
++const char* strVersion = "tclodbc " PACKAGE_VERSION " (c) Roy Nurmi 1998, 2002";
++const char* strMemoryAllocationFailed = "Memory allocation failed";
++const char* strInvalidHandle		= "Invalid handle";
++const char* strOK			= "OK";
++const char* strTables			= "tables";
++const char* strColumns		= "columns";
++const char* strIndexes		= "indexes";
++const char* strPrimarykeys		= "primarykeys";
++const char* strTypeinfo		= "typeinfo";
++const char* strEval			= "eval";
++const char* strRead			= "read";
++const char* strGet			= "get";
++const char* strSet			= "set";
++const char* strAutocommit		= "autocommit";
++const char* strCommit			= "commit";
++const char* strRollback		= "rollback";
++const char* strWrongArgs		= "wrong # args";
++const char* strUsage = 
+ "Usage:\n"
+ "  database [connect] id datasourcename userid password\n"
+ "  database [connect] id connectionstring\n"
+@@ -75,31 +75,31 @@
+ "  database datasources\n"
+ "  database drivers\n"
+ "  database version\n";
+-char* strCmdNotAvailable	= "command not available";
+-char* strEmpty			= "";
+-char* strDisconnect		= "disconnect";
+-char* strRun			= "run";
+-char* strDrop			= "drop";
+-char* strExecute		= "execute";
+-char* strMoreResults		= "moreresults";
+-char* strFetch			= "fetch";
+-
+-char* strConcurrency		= "concurrency";
+-char* strMaxrows		= "maxrows";
+-char* strTimeout		= "timeout";
+-char* strMaxlenght		= "maxlenght"; // stupid spelling mistake before 2.2, retained for compatibility
+-char* strMaxlength		= "maxlength";
+-char* strRowsetsize		= "rowsetsize";
+-char* strCursortype		= "cursortype";
+-char* strNoscan			= "noscan";
+-char* strEncoding		= "encoding";
+-char* strStatement		= "statement";
+-char* strRowCount		= "rowcount";
+-char* strAsyncEnable		= "async";
++const char* strCmdNotAvailable	= "command not available";
++const char* strEmpty			= "";
++const char* strDisconnect		= "disconnect";
++const char* strRun			= "run";
++const char* strDrop			= "drop";
++const char* strExecute		= "execute";
++const char* strMoreResults		= "moreresults";
++const char* strFetch			= "fetch";
++
++const char* strConcurrency		= "concurrency";
++const char* strMaxrows		= "maxrows";
++const char* strTimeout		= "timeout";
++const char* strMaxlenght		= "maxlenght"; // stupid spelling mistake before 2.2, retained for compatibility
++const char* strMaxlength		= "maxlength";
++const char* strRowsetsize		= "rowsetsize";
++const char* strCursortype		= "cursortype";
++const char* strNoscan			= "noscan";
++const char* strEncoding		= "encoding";
++const char* strStatement		= "statement";
++const char* strRowCount		= "rowcount";
++const char* strAsyncEnable		= "async";
+ 
+-char* strInvalidOption		= "Invalid option: ";
++const char* strInvalidOption		= "Invalid option: ";
+ 
+-char* strOldSyntax = "This is old syntax which has been removed from tclodbc 2.1. Check documentation for replacement";
++const char* strOldSyntax = "This is old syntax which has been removed from tclodbc 2.1. Check documentation for replacement";
+ 
+ // IMPORTANT NOTE
+ 
+@@ -111,65 +111,65 @@
+ 
+ NumStr sqlType [] = {
+     {19,		NULL	       },
+-    {SQL_BIGINT,	"BIGINT"       },
+-    {SQL_BINARY,	"BINARY"       },
+-    {SQL_BIT,		"BIT"	       },
+-    {SQL_CHAR,		"CHAR"	       },
+-    {SQL_DATE,		"DATE"	       },
+-    {SQL_DECIMAL,	"DECIMAL"      },
+-    {SQL_DOUBLE,	"DOUBLE"       },
+-    {SQL_FLOAT,		"FLOAT"	       },
+-    {SQL_INTEGER,	"INTEGER"      },
+-    {SQL_LONGVARBINARY,	"LONGVARBINARY"},
+-    {SQL_LONGVARCHAR,	"LONGVARCHAR"  },
+-    {SQL_NUMERIC,	"NUMERIC"      },
+-    {SQL_REAL,		"REAL"	       },
+-    {SQL_SMALLINT,	"SMALLINT"     },
+-    {SQL_TIME,		"TIME"	       },
+-    {SQL_TIMESTAMP,	"TIMESTAMP"    },
+-    {SQL_TINYINT,	"TINYINT"      },
+-    {SQL_VARBINARY,	"VARBINARY"    },
+-    {SQL_VARCHAR,	"VARCHAR"      }
++    {SQL_BIGINT,	(char*) "BIGINT"       },
++    {SQL_BINARY,	(char*) "BINARY"       },
++    {SQL_BIT,		(char*) "BIT"	       },
++    {SQL_CHAR,		(char*) "CHAR"	       },
++    {SQL_DATE,		(char*) "DATE"	       },
++    {SQL_DECIMAL,	(char*) "DECIMAL"      },
++    {SQL_DOUBLE,	(char*) "DOUBLE"       },
++    {SQL_FLOAT,		(char*) "FLOAT"	       },
++    {SQL_INTEGER,	(char*) "INTEGER"      },
++    {SQL_LONGVARBINARY,	(char*) "LONGVARBINARY"},
++    {SQL_LONGVARCHAR,	(char*) "LONGVARCHAR"  },
++    {SQL_NUMERIC,	(char*) "NUMERIC"      },
++    {SQL_REAL,		(char*) "REAL"	       },
++    {SQL_SMALLINT,	(char*) "SMALLINT"     },
++    {SQL_TIME,		(char*) "TIME"	       },
++    {SQL_TIMESTAMP,	(char*) "TIMESTAMP"    },
++    {SQL_TINYINT,	(char*) "TINYINT"      },
++    {SQL_VARBINARY,	(char*) "VARBINARY"    },
++    {SQL_VARCHAR,	(char*) "VARCHAR"      }
+ };
+ 
+ NumStr attrDef [] = {
+     {12,			NULL		},
+-    {SQL_COLUMN_DISPLAY_SIZE,	"displaysize"	},
+-    {SQL_COLUMN_LABEL,		"label"		},
+-    {SQL_COLUMN_NAME,		"name"		},
+-    {SQL_COLUMN_NULLABLE,	"nullable"	},
+-    {SQL_COLUMN_OWNER_NAME,	"owner"		},
+-    {SQL_COLUMN_PRECISION,	"precision"	},
+-    {SQL_COLUMN_QUALIFIER_NAME,	"qualifiername" },
+-    {SQL_COLUMN_SCALE,		"scale"		},
+-    {SQL_COLUMN_TABLE_NAME,	"tablename"	},
+-    {SQL_COLUMN_TYPE,		"type"		},
+-    {SQL_COLUMN_TYPE_NAME,	"typename"	},
+-    {SQL_COLUMN_UPDATABLE,	"updatable"	},
++    {SQL_COLUMN_DISPLAY_SIZE,	(char*) "displaysize"	},
++    {SQL_COLUMN_LABEL,		(char*) "label"		},
++    {SQL_COLUMN_NAME,		(char*) "name"		},
++    {SQL_COLUMN_NULLABLE,	(char*) "nullable"	},
++    {SQL_COLUMN_OWNER_NAME,	(char*) "owner"		},
++    {SQL_COLUMN_PRECISION,	(char*) "precision"	},
++    {SQL_COLUMN_QUALIFIER_NAME,	(char*) "qualifiername" },
++    {SQL_COLUMN_SCALE,		(char*) "scale"		},
++    {SQL_COLUMN_TABLE_NAME,	(char*) "tablename"	},
++    {SQL_COLUMN_TYPE,		(char*) "type"		},
++    {SQL_COLUMN_TYPE_NAME,	(char*) "typename"	},
++    {SQL_COLUMN_UPDATABLE,	(char*) "updatable"	},
+ };
+ 
+ NumStr stmtOp [] = {
+     {9,				NULL		},
+-    {SQL_ASYNC_ENABLE,		strAsyncEnable	},
+-    {SQL_CONCURRENCY,		strConcurrency	},
+-    {SQL_CURSOR_TYPE,		strCursortype	},
+-    {SQL_MAX_LENGTH,		strMaxlenght	}, // incorrectly spelled here, retained for compatibility
+-    {SQL_MAX_LENGTH,		strMaxlength	},
+-    {SQL_MAX_ROWS,		strMaxrows	},
+-    {SQL_NOSCAN,		strNoscan	},
+-    {SQL_ROWSET_SIZE,		strRowsetsize	},
+-    {SQL_QUERY_TIMEOUT,		strTimeout	}
++    {SQL_ASYNC_ENABLE,		(char*) strAsyncEnable	},
++    {SQL_CONCURRENCY,		(char*) strConcurrency	},
++    {SQL_CURSOR_TYPE,		(char*) strCursortype	},
++    {SQL_MAX_LENGTH,		(char*) strMaxlenght	}, // incorrectly spelled here, retained for compatibility
++    {SQL_MAX_LENGTH,		(char*) strMaxlength	},
++    {SQL_MAX_ROWS,		(char*) strMaxrows	},
++    {SQL_NOSCAN,		(char*) strNoscan	},
++    {SQL_ROWSET_SIZE,		(char*) strRowsetsize	},
++    {SQL_QUERY_TIMEOUT,		(char*) strTimeout	}
+ };
+ 
+ NumStr configOp [] = {
+ #ifdef INCLUDE_EXTENSIONS
+     {6,			       NULL	       },
+-    {ODBC_ADD_DSN,	       "add_dsn"       },
+-    {ODBC_ADD_SYS_DSN,	       "add_sys_dsn"   },
+-    {ODBC_CONFIG_DSN,	       "config_dsn"    },
+-    {ODBC_CONFIG_SYS_DSN,      "config_sys_dsn"},
+-    {ODBC_REMOVE_DSN,	       "remove_dsn"    },
+-    {ODBC_REMOVE_SYS_DSN,      "remove_sys_dsn"}
++    {ODBC_ADD_DSN,	       (char*) "add_dsn"       },
++    {ODBC_ADD_SYS_DSN,	       (char*) "add_sys_dsn"   },
++    {ODBC_CONFIG_DSN,	       (char*) "config_dsn"    },
++    {ODBC_CONFIG_SYS_DSN,      (char*) "config_sys_dsn"},
++    {ODBC_REMOVE_DSN,	       (char*) "remove_dsn"    },
++    {ODBC_REMOVE_SYS_DSN,      (char*) "remove_sys_dsn"}
+ #else
+     {0,			       NULL	       }
+ #endif
+@@ -177,88 +177,88 @@
+ 
+ NumStr connectOp [] = {
+     {11,			NULL		},
+-    {SQL_ASYNC_ENABLE,		strAsyncEnable	},
+-    {SQL_AUTOCOMMIT,		strAutocommit	},
+-    {SQL_CONCURRENCY,		strConcurrency	},
+-    {SQL_CURSOR_TYPE,		strCursortype	},
+-    {TCLODBC_ENCODING,		strEncoding	},
+-    {SQL_MAX_LENGTH,		strMaxlenght	}, // incorrectly spelled here, retained for compatibility
+-    {SQL_MAX_LENGTH,		strMaxlength	},
+-    {SQL_MAX_ROWS,		strMaxrows	},
+-    {SQL_NOSCAN,		strNoscan	},
+-    {SQL_ROWSET_SIZE,		strRowsetsize	},
+-    {SQL_QUERY_TIMEOUT,		strTimeout	}
++    {SQL_ASYNC_ENABLE,		(char*) strAsyncEnable	},
++    {SQL_AUTOCOMMIT,		(char*) strAutocommit	},
++    {SQL_CONCURRENCY,		(char*) strConcurrency	},
++    {SQL_CURSOR_TYPE,		(char*) strCursortype	},
++    {TCLODBC_ENCODING,		(char*) strEncoding	},
++    {SQL_MAX_LENGTH,		(char*) strMaxlenght	}, // incorrectly spelled here, retained for compatibility
++    {SQL_MAX_LENGTH,		(char*) strMaxlength	},
++    {SQL_MAX_ROWS,		(char*) strMaxrows	},
++    {SQL_NOSCAN,		(char*) strNoscan	},
++    {SQL_ROWSET_SIZE,		(char*) strRowsetsize	},
++    {SQL_QUERY_TIMEOUT,		(char*) strTimeout	}
+ };
+ 
+ NumStr booleanOp [] = {
+     {8,				NULL		},
+-    {0,				"0"		},
+-    {1,				"1"		},
+-    {0,				"false"		},
+-    {0,				"no"		},
+-    {0,				"off"		},
+-    {1,				"on"		},
+-    {1,				"true"		},
+-    {1,				"yes"		}
++    {0,				(char*) "0"		},
++    {1,				(char*) "1"		},
++    {0,				(char*) "false"		},
++    {0,				(char*) "no"		},
++    {0,				(char*) "off"		},
++    {1,				(char*) "on"		},
++    {1,				(char*) "true"		},
++    {1,				(char*) "yes"		}
+ };
+ 
+ NumStr concurrencyOp [] = {
+     {4,				NULL	     },
+-    {SQL_CONCUR_LOCK,		"lock"	     },
+-    {SQL_CONCUR_READ_ONLY,	"readonly"   },
+-    {SQL_CONCUR_ROWVER,		"rowver"     },
+-    {SQL_CONCUR_VALUES,		"values"     }
++    {SQL_CONCUR_LOCK,		(char*) "lock"	     },
++    {SQL_CONCUR_READ_ONLY,	(char*) "readonly"   },
++    {SQL_CONCUR_ROWVER,		(char*) "rowver"     },
++    {SQL_CONCUR_VALUES,		(char*) "values"     }
+ };
+ 
+ NumStr cursorOp [] = {
+     {4,				NULL		},
+-    {SQL_CURSOR_DYNAMIC,	"dynamic"	},
+-    {SQL_CURSOR_FORWARD_ONLY,	"forwardonly"	},
+-    {SQL_CURSOR_KEYSET_DRIVEN,	"keysetdriven"	},
+-    {SQL_CURSOR_STATIC,		"static"	}
++    {SQL_CURSOR_DYNAMIC,	(char*) "dynamic"	},
++    {SQL_CURSOR_FORWARD_ONLY,	(char*) "forwardonly"	},
++    {SQL_CURSOR_KEYSET_DRIVEN,	(char*) "keysetdriven"	},
++    {SQL_CURSOR_STATIC,		(char*) "static"	}
+ };
+ 
+ NumStr databaseOptions [] = {
+     {5,				NULL	     },
+-    {TclDatabase::CONFIGURE,	"configure"   },
+-    {TclDatabase::CONNECT,	"connect"     },
+-    {TclDatabase::DATASOURCES,	"datasources" },
+-    {TclDatabase::DRIVERS,	"drivers"	},
+-    {TclDatabase::VERSION,	"version"	}
++    {TclDatabase::CONFIGURE,	(char*) "configure"   },
++    {TclDatabase::CONNECT,	(char*) "connect"     },
++    {TclDatabase::DATASOURCES,	(char*) "datasources" },
++    {TclDatabase::DRIVERS,	(char*) "drivers"	},
++    {TclDatabase::VERSION,	(char*) "version"	}
+ };
+ 
+ NumStr databaseCmds [] = {
+     {15,			NULL	      },
+-    {TclDatabase::AUTOCOMMIT,	strAutocommit },
+-    {TclDatabase::COLUMNS,	strColumns    },
+-    {TclDatabase::COMMIT,	strCommit     },
+-    {TclDatabase::DISCONNECT,	strDisconnect },
+-    {TclDatabase::EVAL,		strEval	      },
+-    {TclDatabase::GET,		strGet	      },
+-    {TclDatabase::INDEXES,	strIndexes    },
+-    {TclDatabase::PRIMARYKEYS,	strPrimarykeys},
+-    {TclDatabase::READ,		strRead	      },
+-    {TclDatabase::ROLLBACK,	strRollback   },
+-    {TclDatabase::STATEMENT,	"s"	      }, // shortcut
+-    {TclDatabase::SET,		strSet	      },
+-    {TclDatabase::STATEMENT,	strStatement  },
+-    {TclDatabase::TABLES,	strTables     },
+-    {TclDatabase::TYPEINFO,	strTypeinfo   }
++    {TclDatabase::AUTOCOMMIT,	(char*) strAutocommit },
++    {TclDatabase::COLUMNS,	(char*) strColumns    },
++    {TclDatabase::COMMIT,	(char*) strCommit     },
++    {TclDatabase::DISCONNECT,	(char*) strDisconnect },
++    {TclDatabase::EVAL,		(char*) strEval	      },
++    {TclDatabase::GET,		(char*) strGet	      },
++    {TclDatabase::INDEXES,	(char*) strIndexes    },
++    {TclDatabase::PRIMARYKEYS,	(char*) strPrimarykeys},
++    {TclDatabase::READ,		(char*) strRead	      },
++    {TclDatabase::ROLLBACK,	(char*) strRollback   },
++    {TclDatabase::STATEMENT,	(char*) "s"	      }, // shortcut
++    {TclDatabase::SET,		(char*) strSet	      },
++    {TclDatabase::STATEMENT,	(char*) strStatement  },
++    {TclDatabase::TABLES,	(char*) strTables     },
++    {TclDatabase::TYPEINFO,	(char*) strTypeinfo   }
+ };
+ 
+ NumStr statementCmds [] = {
+     {11,			NULL	    },
+-    {TclStatement::COLUMNS,	strColumns  },
+-    {TclStatement::DROP,	strDrop	    },
+-    {TclStatement::EVAL,	strEval	    },
+-    {TclStatement::EXECUTE,	strExecute  },
+-    {TclStatement::FETCH,	strFetch    },
+-    {TclStatement::GET,		strGet	    },
+-    {TclStatement::MORERESULTS, strMoreResults },
+-    {TclStatement::READ,	strRead	    },
+-    {TclStatement::ROWCOUNT,	strRowCount },
+-    {TclStatement::RUN,		strRun	    },
+-    {TclStatement::SET,		strSet	    }
++    {TclStatement::COLUMNS,	(char*) strColumns  },
++    {TclStatement::DROP,	(char*) strDrop	    },
++    {TclStatement::EVAL,	(char*) strEval	    },
++    {TclStatement::EXECUTE,	(char*) strExecute  },
++    {TclStatement::FETCH,	(char*) strFetch    },
++    {TclStatement::GET,		(char*) strGet	    },
++    {TclStatement::MORERESULTS, (char*) strMoreResults },
++    {TclStatement::READ,	(char*) strRead	    },
++    {TclStatement::ROWCOUNT,	(char*) strRowCount },
++    {TclStatement::RUN,		(char*) strRun	    },
++    {TclStatement::SET,		(char*) strSet	    }
+ };
+ 
+ #ifdef _DEBUG


Property changes on: tclodbc/trunk/debian/patches/08-strings.cxx.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: tclodbc/trunk/debian/patches/09-tclobj.cxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/09-tclobj.cxx.dpatch	                        (rev 0)
+++ tclodbc/trunk/debian/patches/09-tclobj.cxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-tclobj.cxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
+##
+## DP: Fix warning messages due to deprecated char conversions
+
+ at DPATCH@
+diff -u upstrm/tclobj.cxx debsrc/tclobj.cxx
+--- upstrm/tclobj.cxx	2007-04-12 12:11:03.000000000 +0200
++++ debsrc/tclobj.cxx	2008-02-02 12:39:39.000000000 +0100
+@@ -52,7 +52,7 @@
+ #endif
+ 
+ extern char* strMemoryAllocationFailed;
+-char* strFunctionSequenceError = "Function sequence error in tclodbc.";
++const char* strFunctionSequenceError = "Function sequence error in tclodbc.";
+ 
+ TclObj::TclObj(const char* s, int len) : p (NULL)
+ {
+@@ -249,7 +249,7 @@
+         return Tcl_DStringValue(&p->s);
+ #endif
+     } else {
+-	return "";
++      return (char*) "";
+     }
+ }
+ 


Property changes on: tclodbc/trunk/debian/patches/09-tclobj.cxx.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: tclodbc/trunk/debian/patches/10-tclodbc.cxx.dpatch
===================================================================
--- tclodbc/trunk/debian/patches/10-tclodbc.cxx.dpatch	                        (rev 0)
+++ tclodbc/trunk/debian/patches/10-tclodbc.cxx.dpatch	2008-02-03 18:28:10 UTC (rev 486)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-tclodbc.cxx.dpatch by Daniel Rus Morales <danirus at tol-project.org>
+##
+## DP: Fix warning messages due to deprecated char conversions
+
+ at DPATCH@
+diff -u upstrm/tclodbc.cxx debsrc/tclodbc.cxx
+--- upstrm/tclodbc.cxx	2007-04-12 12:11:03.000000000 +0200
++++ debsrc/tclodbc.cxx	2008-02-02 12:58:04.000000000 +0100
+@@ -235,7 +235,7 @@
+     try {
+         if (objc == 1) {
+             // return usage
+-            Tcl_SetResult(interp, strUsage, TCL_STATIC);
++	  Tcl_SetResult(interp, (char*) strUsage, TCL_STATIC);
+             return TCL_OK;
+         }
+ 
+@@ -258,7 +258,7 @@
+ 
+ 	    case TclDatabase::VERSION:
+ 		// return version information
+-		Tcl_SetResult(interp, strVersion, TCL_STATIC);
++	      Tcl_SetResult(interp, (char*) strVersion, TCL_STATIC);
+ 		return TCL_OK;
+ 
+ 	    case TclDatabase::CONNECT:
+@@ -392,7 +392,7 @@
+     // allocate environment handle if not yet allocated
+     if (!env && SQLAllocEnv(&env) == SQL_ERROR) {
+ 	if (env == SQL_NULL_HENV) {
+-	    Tcl_SetResult(interp, strMemoryAllocationFailed, TCL_STATIC);
++	  Tcl_SetResult(interp, (char*) strMemoryAllocationFailed, TCL_STATIC);
+ 	} else {
+ 	    Tcl_SetObjResult(interp,
+ 		    SqlErr(env, SQL_NULL_HDBC, SQL_NULL_HSTMT));


Property changes on: tclodbc/trunk/debian/patches/10-tclodbc.cxx.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: tclodbc/trunk/debian/rules
===================================================================
--- tclodbc/trunk/debian/rules	2008-02-02 12:50:40 UTC (rev 485)
+++ tclodbc/trunk/debian/rules	2008-02-03 18:28:10 UTC (rev 486)
@@ -5,9 +5,6 @@
 
 include /usr/share/dpatch/dpatch.make
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 CFLAGS = -Wall -fPIC -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -22,13 +19,7 @@
 	mv -f aclocal.m4 aclocal.m4.orig
 	aclocal -I . -I tclconfig
 	autoconf
-	CC=g++ ./configure \ 
-		--host=$(DEB_HOST_GNU_TYPE) \ 
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--with-tcl=/usr/lib \
-		--with-tclinclude=/usr/include/tcl \
-		CFLAGS="$(CFLAGS)"
+	CC=g++ ./configure --prefix=/usr --with-tcl=/usr/lib --with-tclinclude=/usr/include/tcl CFLAGS="$(CFLAGS)"
 	mv -f configure.orig configure
 	mv -f aclocal.m4.orig aclocal.m4
 




More information about the Pkg-tcltk-commits mailing list