← Back to branch summary

~ubuntu-branches/ubuntu/vivid/psqlodbc/vivid

~ubuntu-branches/ubuntu/vivid/psqlodbc/vivid

Viewing all changes in revision 18.

Committer: Package Import Robot
Author(s): Martin Pitt
Date: 2013-10-24 07:21:55 UTC
mfrom: (16.2.1 trusty-proposed)
Revision ID: package-import@ubuntu.com-20131024072155-wpiifm71c317fhxd

Tags: 1:09.02.0100-2ubuntu1

* Merge with Debian unstable. Remaining Ubuntu changes:
  - debian/tests: Disable iodbc test and dependency, as in Ubuntu iodbc and
    unixodbc are not installable in parallel, and iodbc is obsolete and
    should be removed at some point.

files added:
.pc/test-crlf

.pc/test-crlf/test

.pc/test-crlf/test/expected

.pc/test-crlf/test/expected/alter.out

.pc/test-crlf/test/expected/arraybinding.out

.pc/test-crlf/test/expected/boolsaschar.out

.pc/test-crlf/test/expected/connect.out

.pc/test-crlf/test/expected/cvtnulldate.out

.pc/test-crlf/test/expected/dataatexecution.out

.pc/test-crlf/test/expected/getresult.out

.pc/test-crlf/test/expected/insertreturning.out

.pc/test-crlf/test/expected/notice.out

.pc/test-crlf/test/expected/params.out

.pc/test-crlf/test/expected/prepare.out

.pc/test-crlf/test/expected/sampletables.out

.pc/test-crlf/test/expected/select.out

.pc/test-crlf/test/expected/stmthandles.out

.pc/test-crlf/test/launcher

.pc/test-crlf/test/sql

.pc/test-crlf/test/sql/sampletables.sql

.pc/test-odbcinst.ini

.pc/test-odbcinst.ini/test

.pc/test-odbcinst.ini/test/odbcinst.ini

.pc/testsuite.patch

.pc/testsuite.patch/descriptor.h

.pc/testsuite.patch/pgapi30.c

.pc/testsuite.patch/test

.pc/testsuite.patch/test/src

.pc/testsuite.patch/test/src/prepare-test.c

debian/patches

debian/patches/series

debian/patches/test-crlf

debian/patches/test-odbcinst.ini

debian/patches/testsuite.patch

test

test/Makefile

test/README.txt

test/expected

test/expected/alter.out

test/expected/arraybinding.out

test/expected/boolsaschar.out

test/expected/connect.out

test/expected/cvtnulldate.out

test/expected/dataatexecution.out

test/expected/getresult.out

test/expected/insertreturning.out

test/expected/notice.out

test/expected/params.out

test/expected/prepare.out

test/expected/sampletables.out

test/expected/select.out

test/expected/stmthandles.out

test/launcher

test/odbc.ini

test/odbcinst.ini

test/sql

test/sql/sampletables.sql

test/src

test/src/alter-test.c

test/src/arraybinding-test.c

test/src/boolsaschar-test.c

test/src/common.c

test/src/common.h

test/src/connect-test.c

test/src/cvtnulldate-test.c

test/src/dataatexecution-test.c

test/src/getresult-test.c

test/src/insertreturning-test.c

test/src/notice-test.c

test/src/params-test.c

test/src/prepare-test.c

test/src/select-test.c

test/src/stmthandles-test.c

files removed:
config/libtool.m4

config/ltoptions.m4

config/ltsugar.m4

config/ltversion.m4

config/lt~obsolete.m4

docs/faq.html

docs/howto-accesslo.html

docs/howto-accessvba.html

docs/howto-bo.html

docs/howto-ch.html

docs/howto-csharp.html

docs/howto-vb.html

docs/howto-vblo.html

docs/index.html

files modified:
.pc/applied-patches

Makefile.am

Makefile.in

aclocal.m4

bind.c

bind.h

catfunc.h

columninfo.c

columninfo.h

config/c-library.m4

config/general.m4

configure

configure.ac

connection.c

connection.h

convert.c

convert.h

debian/changelog

debian/control

debian/rules

debian/tests/buildtime

descriptor.c

descriptor.h

dlg_specific.c

dlg_specific.h

dlg_wingui.c

docs/config-opt.html

docs/config.html

docs/release.html

docs/win32-compilation.html

drvconn.c

environ.c

environ.h

execute.c

gsssvcs.c

gsssvcs.h

info.c

info30.c

inouealc.c

installer/Make.bat *

installer/MakeX64.bat

installer/README.txt

installer/lgpl.rtf

installer/modify_msi.vbs *

installer/psqlodbc.wxs

installer/psqlodbc_cpu.wxs

installer/psqlodbcm.wxs

installer/psqlodbcm_cpu.wxs

installer/upgrade.bat *

installer/upgrade_x64.bat

license.txt

loadlib.c

loadlib.h

lobj.c

lobj.h

md5.c

md5.h

misc.c

misc.h

msdtc_enlist.cpp *

multibyte.c

multibyte.h

mylog.c

odbc-drop.sql

odbc.sql

odbcapi.c

odbcapi25w.c

odbcapi30.c

odbcapi30w.c

odbcapiw.c

options.c

parse.c

pgapi30.c

pgapifunc.h

pgenlist.def

pgenlist.h

pgenlista.def

pgtypes.c

pgtypes.h

pgxalib.cpp *

pgxalib.def

psqlodbc.c

psqlodbc.def

psqlodbc.dsp

psqlodbc.h

psqlodbc.rc

psqlodbc.reg

psqlodbc.vcproj

psqlodbca.def

qresult.c

qresult.h

readme.txt

resource.h

results.c

setup.c

socket.c

socket.h

sspisvcs.c

sspisvcs.h *

statement.c

statement.h

tuple.c

tuple.h

version.h

win32.mak

win64.mak *

win_setup.h

win_unicode.c

xalibname.c

Show diffs side-by-side

added added

removed removed

.pc/applied-patches

.pc/test-crlf/test/

.pc/test-crlf/test/expected/

.pc/test-crlf/test/expected/alter.out

.pc/test-crlf/test/expected/arraybinding.out

.pc/test-crlf/test/expected/boolsaschar.out

.pc/test-crlf/test/expected/connect.out

.pc/test-crlf/test/expected/cvtnulldate.out

.pc/test-crlf/test/expected/dataatexecution.out

.pc/test-crlf/test/expected/getresult.out

.pc/test-crlf/test/expected/insertreturning.out

.pc/test-crlf/test/expected/notice.out

.pc/test-crlf/test/expected/params.out

.pc/test-crlf/test/expected/prepare.out

.pc/test-crlf/test/expected/sampletables.out

.pc/test-crlf/test/expected/select.out

.pc/test-crlf/test/expected/stmthandles.out

.pc/test-crlf/test/launcher

.pc/test-crlf/test/sql/

.pc/test-crlf/test/sql/sampletables.sql

.pc/test-odbcinst.ini/

.pc/test-odbcinst.ini/test/

.pc/test-odbcinst.ini/test/odbcinst.ini

.pc/testsuite.patch/

.pc/testsuite.patch/descriptor.h

.pc/testsuite.patch/pgapi30.c

.pc/testsuite.patch/test/

.pc/testsuite.patch/test/src/

.pc/testsuite.patch/test/src/prepare-test.c

config/c-library.m4

config/general.m4

config/libtool.m4

config/ltoptions.m4

config/ltsugar.m4

config/ltversion.m4

config/lt~obsolete.m4

debian/changelog

debian/patches/

debian/patches/series

debian/patches/test-crlf

debian/patches/test-odbcinst.ini

debian/patches/testsuite.patch

debian/tests/buildtime

docs/config-opt.html

docs/config.html

docs/howto-accesslo.html

docs/howto-accessvba.html

docs/howto-bo.html

docs/howto-ch.html

docs/howto-csharp.html

docs/howto-vb.html

docs/howto-vblo.html

docs/index.html

docs/release.html

docs/win32-compilation.html

installer/Make.bat

installer/MakeX64.bat

installer/README.txt

installer/lgpl.rtf

installer/modify_msi.vbs

installer/psqlodbc.wxs

installer/psqlodbc_cpu.wxs

installer/psqlodbcm.wxs

installer/psqlodbcm_cpu.wxs

installer/upgrade.bat

installer/upgrade_x64.bat

msdtc_enlist.cpp

psqlodbc.vcproj

test/README.txt

test/expected/alter.out

test/expected/arraybinding.out

test/expected/boolsaschar.out

test/expected/connect.out

test/expected/cvtnulldate.out

test/expected/dataatexecution.out

test/expected/getresult.out

test/expected/insertreturning.out

test/expected/notice.out

test/expected/params.out

test/expected/prepare.out

test/expected/sampletables.out

test/expected/select.out

test/expected/stmthandles.out

test/odbcinst.ini

test/sql/sampletables.sql

test/src/alter-test.c

test/src/arraybinding-test.c

test/src/boolsaschar-test.c

test/src/common.c

test/src/common.h

test/src/connect-test.c

test/src/cvtnulldate-test.c

test/src/dataatexecution-test.c

test/src/getresult-test.c

test/src/insertreturning-test.c

test/src/notice-test.c

test/src/params-test.c

test/src/prepare-test.c

test/src/select-test.c

test/src/stmthandles-test.c

Older »