Commit 7a97b4fc authored by Vivien Malerba's avatar Vivien Malerba

Moved to V6 building

parent 0bb31b3f
m4_define(major, 5)
m4_define(minor, 2)
m4_define(micro, 2)
m4_define(minor, 99)
m4_define(micro, 0)
m4_define([gda_stable],
m4_if(m4_eval(minor % 2), [0], [yes], [no]))
AC_CONFIG_MACRO_DIR([m4])
......@@ -31,7 +31,7 @@ AC_SUBST(GDA_VERSION, major.minor.micro)
# ABI version:
# Careful. Changing these will break ABI, because it is used for the library name and header install path:
# This allows us to do a 3.2 version that is ABI-compatible with 3.0, but with API additions.
AC_SUBST(GDA_ABI_MAJOR_VERSION, 5)
AC_SUBST(GDA_ABI_MAJOR_VERSION, 6)
AC_SUBST(GDA_ABI_MINOR_VERSION, 0)
#AC_SUBST(GDA_MICRO_VERSION, micro)
LIBGDA_ABI_VERSION=$GDA_ABI_MAJOR_VERSION.$GDA_ABI_MINOR_VERSION
......@@ -130,6 +130,7 @@ AC_SEARCH_LIBS([strerror],[cposix])
AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_C_O
AM_PROG_AR
AC_HEADER_STDC
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
......@@ -940,10 +941,10 @@ AC_SUBST(COREDEPS_LIBS)
AC_CONFIG_FILES([
Makefile
libgda.spec
libgda-5.0.pc
libgda-ui-5.0.pc
libgda-report-5.0.pc
libgda-xslt-5.0.pc
libgda-6.0.pc
libgda-ui-6.0.pc
libgda-report-6.0.pc
libgda-xslt-6.0.pc
po/Makefile.in
libgda/Makefile
libgda/libgda.h
......@@ -957,41 +958,41 @@ libgda/sqlite/virtual/libgda-virtual.h
libgda/sqlite/virtual/Makefile
libgda/thread-wrapper/Makefile
libgda/data/Makefile
libgda/data/libgdadata-5.0.pc
libgda/data/libgdadata-6.0.pc
providers/Makefile
providers/reuseable/Makefile
providers/reuseable/postgres/Makefile
providers/reuseable/mysql/Makefile
providers/bdb/Makefile
providers/bdb/libgda-bdb-5.0.pc
providers/bdb/libgda-bdb-6.0.pc
providers/bdbsql/Makefile
providers/bdbsql/libgda-bdbsql-5.0.pc
providers/bdbsql/libgda-bdbsql-6.0.pc
providers/mdb/Makefile
providers/mdb/libmdb-src/Makefile
providers/mdb/libgda-mdb-5.0.pc
providers/mdb/libgda-mdb-6.0.pc
providers/mysql/Makefile
providers/mysql/libgda-mysql-5.0.pc
providers/mysql/libgda-mysql-6.0.pc
providers/oracle/Makefile
providers/oracle/libgda-oracle-5.0.pc
providers/oracle/libgda-oracle-6.0.pc
providers/postgres/Makefile
providers/postgres/libgda-postgres-5.0.pc
providers/postgres/libgda-postgres-6.0.pc
providers/firebird/Makefile
providers/firebird/libgda-firebird-5.0.pc
providers/firebird/libgda-firebird-6.0.pc
providers/sqlite/Makefile
providers/sqlite/libgda-sqlite-5.0.pc
providers/sqlite/libgda-sqlite-6.0.pc
providers/jdbc/Makefile
providers/jdbc/libgda-jdbc-5.0.pc
providers/jdbc/libgda-jdbc-6.0.pc
providers/ldap/Makefile
providers/ldap/libgda-ldap-5.0.pc
providers/ldap/libgda-ldap-6.0.pc
providers/web/Makefile
providers/web/libgda-web-5.0.pc
providers/web/libgda-web-6.0.pc
providers/skel-implementation/Makefile
providers/skel-implementation/capi/Makefile
providers/skel-implementation/capi/libgda-capi-5.0.pc
providers/skel-implementation/capi/libgda-capi-6.0.pc
providers/skel-implementation/models/Makefile
providers/skel-implementation/models/libgda-models-5.0.pc
providers/skel-implementation/models/libgda-models-6.0.pc
providers/sqlcipher/Makefile
providers/sqlcipher/libgda-sqlcipher-5.0.pc
providers/sqlcipher/libgda-sqlcipher-6.0.pc
libgda-report/Makefile
libgda-report/engine/Makefile
libgda-report/DocBook/Makefile
......@@ -1011,7 +1012,7 @@ libgda-ui/glade/Makefile
control-center/Makefile
control-center/data/Makefile
tools/Makefile
tools/gda-sql-5.0.1:tools/gda-sql.1.in
tools/gda-sql-6.0.1:tools/gda-sql.1.in
tools/cmdtool/Makefile
tools/help/Makefile
tools/help/C/Makefile
......@@ -1057,17 +1058,17 @@ mv ${srcdir}/doc/C/version.xml.tmp ${srcdir}/doc/C/version.xml
cp doc/C/builddate.xml ${srcdir}/doc/C/builddate.xml.tmp
mv ${srcdir}/doc/C/builddate.xml.tmp ${srcdir}/doc/C/builddate.xml
cp ${srcdir}/doc/C/libgda-sections.txt doc/C/libgda-5.0-sections.txt
echo "" >> doc/C/libgda-5.0-sections.txt
cat ${srcdir}/doc/C/libgda-ui-sections.txt >> doc/C/libgda-5.0-sections.txt
cp doc/C/libgda-5.0-sections.txt ${srcdir}/doc/C/libgda-5.0-sections.txt.tmp
mv ${srcdir}/doc/C/libgda-5.0-sections.txt.tmp ${srcdir}/doc/C/libgda-5.0-sections.txt
cp ${srcdir}/doc/C/libgda-sections.txt doc/C/libgda-6.0-sections.txt
echo "" >> doc/C/libgda-6.0-sections.txt
cat ${srcdir}/doc/C/libgda-ui-sections.txt >> doc/C/libgda-6.0-sections.txt
cp doc/C/libgda-6.0-sections.txt ${srcdir}/doc/C/libgda-6.0-sections.txt.tmp
mv ${srcdir}/doc/C/libgda-6.0-sections.txt.tmp ${srcdir}/doc/C/libgda-6.0-sections.txt
cp doc/C/libgda.types doc/C/libgda-5.0.types
cp doc/C/libgda.types doc/C/libgda-6.0.types
if test x$have_ui != xno
then
echo "" >> doc/C/libgda-5.0.types
cat ${srcdir}/doc/C/libgda-ui.types >> doc/C/libgda-5.0.types
echo "" >> doc/C/libgda-6.0.types
cat ${srcdir}/doc/C/libgda-ui.types >> doc/C/libgda-6.0.types
fi
......
gda-control-center-5.0
gda-control-center-5.*.desktop
gda-control-center-6.0
gda-control-center-6.*.desktop
bin_PROGRAMS=gda-control-center-5.0
bin_PROGRAMS=gda-control-center-6.0
SUBDIRS = data
......@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-DGDA_ABI_VERSION=\""$(GDA_ABI_VERSION)"\"
# rename gdaui-dsn-editor as dsn-properties-editor
gda_control_center_5_0_SOURCES=\
gda_control_center_6_0_SOURCES=\
gdaui-login-dialog.c \
gdaui-login-dialog.h \
gdaui-bar.c \
......@@ -35,7 +35,7 @@ gda_control_center_5_0_SOURCES=\
if PLATFORM_WIN32
EXTRALDFLAGS=-mwindows
gda_control_center_5_0_SOURCES += control-center-res.rc
gda_control_center_6_0_SOURCES += control-center-res.rc
else
EXTRALDFLAGS=
endif
......@@ -46,21 +46,21 @@ endif
control-center-res.o: control-center-res.rc
$(WINDRES) $^ -o $@
gda_control_center_5_0_LDFLAGS = $(EXTRALDFLAGS)
gda_control_center_5_0_LDADD=\
gda_control_center_6_0_LDFLAGS = $(EXTRALDFLAGS)
gda_control_center_6_0_LDADD=\
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
$(top_builddir)/libgda/libgda-6.0.la \
$(top_builddir)/libgda-ui/libgda-ui-6.0.la \
$(COREDEPS_LIBS) $(GTK_LIBS)
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
Desktop_in_files = gda-control-center-5.0.desktop.in
Desktop_in_files = gda-control-center-6.0.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
# icons
iconsdir=$(datadir)/libgda-5.0/pixmaps
iconsdir=$(datadir)/libgda-6.0/pixmaps
icons_DATA= \
gda-control-center.png \
gda-control-center-newcnc.png
......
......@@ -33,12 +33,12 @@ update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
for theme in $(public_icons_themes); do \
$(gtk_update_icon_cache) $(datadir)/libgda-5.0/icons/$$theme; \
$(gtk_update_icon_cache) $(datadir)/libgda-6.0/icons/$$theme; \
done; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
for theme in $(public_icons_themes); do \
echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-5.0/icons/$$theme"; \
echo "*** $(gtk_update_icon_cache) $(datadir)/libgda-6.0/icons/$$theme"; \
done; \
fi
......@@ -56,8 +56,8 @@ install-icons:
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
mkdir -p $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
mkdir -p $(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT; \
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
uninstall-icons:
......@@ -73,7 +73,7 @@ uninstall-icons:
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
rm -f $(DESTDIR)$(datadir)/libgda-5.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
rm -f $(DESTDIR)$(datadir)/libgda-6.0/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
install-data-local: install-icons update-icon-cache
......
......@@ -2,7 +2,7 @@
_Name=Database access control center
_Comment=Configure your database access environment
Icon=gda-control-center
Exec=gda-control-center-5.0
Exec=gda-control-center-6.0
Terminal=false
Type=Application
Categories=Settings;DesktopSettings;
......
# Default global configuration file
configdir = $(sysconfdir)/libgda-5.0
configdir = $(sysconfdir)/libgda-6.0
config_DATA = config sales_test.db
EXTRA_DIST = \
......
......@@ -2,32 +2,32 @@ html
xml
html-build.stamp
html.stamp
libgda-5.0-decl-list.txt
libgda-5.0-decl.txt
libgda-5.0-undocumented.txt
libgda-5.0-unused.txt
libgda-5.0.args
libgda-5.0.hierarchy
libgda-5.0.signals
libgda-6.0-decl-list.txt
libgda-6.0-decl.txt
libgda-6.0-undocumented.txt
libgda-6.0-unused.txt
libgda-6.0.args
libgda-6.0.hierarchy
libgda-6.0.signals
scan-build.stamp
sgml-build.stamp
sgml.stamp
tmpl-build.stamp
tmpl.stamp
.libs
libgda-5.0.prerequisites
libgda-5.0-decl.txt.bak
libgda-5.0.interfaces
libgda-5.0-decl-list.txt.bak
libgda-6.0.prerequisites
libgda-6.0-decl.txt.bak
libgda-6.0.interfaces
libgda-6.0-decl-list.txt.bak
libgda.types
libgda-5.0.types
libgda-5.0-overrides.txt
libgda-5.0-doc.pdf
libgda-6.0.types
libgda-6.0-overrides.txt
libgda-6.0-doc.pdf
pdf-build.stamp
libgda-5.0-undeclared.txt
libgda-5.0-unused.sgml
libgda-6.0-undeclared.txt
libgda-6.0-unused.sgml
version.xml
builddate.xml
*.bak
libgda-5.0-sections.txt
libgda-6.0-sections.txt
setup-build.stamp
......@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = 1.6
# The name of the module.
DOC_MODULE=libgda-5.0
DOC_MODULE=libgda-6.0
# The top-level SGML file.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
......@@ -40,14 +40,14 @@ GTKDOC_CFLAGS = -I$(top_srcdir) \
$(COREDEPS_CFLAGS) \
-DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"
GTKDOC_LIBS = $(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-report/libgda-report-5.0.la \
GTKDOC_LIBS = $(top_builddir)/libgda/libgda-6.0.la \
$(top_builddir)/libgda-report/libgda-report-6.0.la \
$(COREDEPS_LIBS)
if HAVE_UI
GTKDOC_CFLAGS += $(GTK_CFLAGS)
GTKDOC_LIBS += $(GTK_LIBS) \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la
$(top_builddir)/libgda-ui/libgda-ui-6.0.la
endif
# Extra options to supply to gtkdoc-mkdb
......@@ -94,7 +94,7 @@ EXTRA_DIST += examples/full_example.c installation.xml limitations.xml migration
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
DISTCLEANFILES = $(DOC_MODULE)-doc.pdf libgda-5.0.types libgda-5.0-sections.txt
DISTCLEANFILES = $(DOC_MODULE)-doc.pdf libgda-6.0.types libgda-6.0-sections.txt
DOC_STAMPS += pdf-build.stamp
CLEANFILES += $(DOC_STAMPS)
......
......@@ -107,7 +107,7 @@ DSN parameters | DB_NAME: Database name. The name of a database to connect to (s
CONNECT_TIMEOUT: Connection timeout. Maximum wait for connection, in seconds. Zero or not specified means wait indefinitely. It is not
Authentication | USERNAME (string),
PASSWORD (string)
File | /local/extra/lib/libgda-5.0/providers/libgda-postgres.so
File | /local/extra/lib/libgda-6.0/providers/libgda-postgres.so
(5 rows)
</programlisting>
</para></listitem>
......
......@@ -58,7 +58,7 @@ main (int argc, char **argv)
<para>
&LIBGDA; allows data sources (DSN) to be defined and referred to by a unique name which contains all the
required information to actually open a connection (except the name and password if they are required);
see the <link linkend="libgda-5.0-Configuration">Configuration section</link> for more information about
see the <link linkend="libgda-6.0-Configuration">Configuration section</link> for more information about
how to manage data sources. Of
course it's still possible to open a connection without having defined a DSN, in which case a <emphasis>connection
string</emphasis> is used to specify all the parameters required to open a connection. For more information
......
......@@ -41,7 +41,7 @@ else {
<sect1>
<title>Define a data source (DSN)</title>
<para>
The <link linkend="libgda-5.0-Configuration">Configuration section</link> details how to manage data sources
The <link linkend="libgda-6.0-Configuration">Configuration section</link> details how to manage data sources
definitions. To define a data source, one needs to create and fill a
<link linkend="GdaDsnInfo">GdaDsnInfo</link> structure, and use the
<link linkend="gda-config-define-dsn">gda_config_define_dsn()</link> function.
......
......@@ -120,8 +120,8 @@
to use the <command>pkg-config</command> command.
</para>
<programlisting>
<systemitem class="prompt">$ </systemitem>gcc -c full_example.c `pkg-config --cflags libgda-5.0`
<systemitem class="prompt">$ </systemitem>gcc -o full_example `pkg-config --libs libgda-5.0` full_example.o
<systemitem class="prompt">$ </systemitem>gcc -c full_example.c `pkg-config --cflags libgda-6.0`
<systemitem class="prompt">$ </systemitem>gcc -o full_example `pkg-config --libs libgda-6.0` full_example.o
</programlisting>
<para>
or more simply:
......@@ -187,8 +187,8 @@
To access a database, it must have a database provider (if &LIBGDA; does not
support the type of database to access, make a bug report in
<ulink url="http://bugzilla.gnome.org/">bugzilla</ulink>), and that database provider
must be compiled an installed: the <command>gda-list-config-5.0</command> or
<command>gda-sql-5.0 -L</command> commands will
must be compiled an installed: the <command>gda-list-config-6.0</command> or
<command>gda-sql-6.0 -L</command> commands will
show a list of the installed and configured database providers.
</para>
<para>
......@@ -210,7 +210,7 @@
(which
is created the first time &LIBGDA; is used within an application. System wide DSN are defined in the
<filename>&lt;prefix&gt;/etc/libgda/config</filename>. Rather than editing that
file manually, it is possible to use the <command>gda-control-center-5.0</command> tool
file manually, it is possible to use the <command>gda-control-center-6.0</command> tool
(part of &LIBGDA;).
Note: if the <filename>$HOME/.libgda/config</filename> already exists from a previous use
of &LIBGDA;, then that file is used instead of
......
......@@ -13,10 +13,10 @@
<!ENTITY GDA "<acronym>GDA</acronym>">
<!ENTITY LDAP "<acronym>LDAP</acronym>">
<!ENTITY SQL "<acronym>SQL</acronym>">
<!ENTITY gda-list-server-op "<command>gda-list-server-op-5.0</command>">
<!ENTITY gda-list-config "<command>gda-list-config-5.0</command>">
<!ENTITY gda-list-server-op "<command>gda-list-server-op-6.0</command>">
<!ENTITY gda-list-config "<command>gda-list-config-6.0</command>">
<!ENTITY gda-sql "<command>gda-sql</command>">
<!ENTITY gda-test-connection "<command>gda-test-connection-5.0</command>">
<!ENTITY gda-test-connection "<command>gda-test-connection-6.0</command>">
<!ENTITY GdaVala '<emphasis><ulink url="gda-vala/index.html">Gda Vala Extensions</ulink></emphasis>'>
<!ENTITY GI '<emphasis><ulink url="http://live.gnome.org/GObjectIntrospection">GObject Introspection</ulink></emphasis>'>
]>
......@@ -1214,7 +1214,7 @@ c0>
DSN, and one for the "PostgreSQL://DB_NAME=sales" connection string, and shows the usage of the ".c" command
to list the opened connections:
<programlisting>
[prompt]> gda-sql-5.0 pgsales PostgreSQL://DB_NAME=sales
[prompt]> gda-sql-6.0 pgsales PostgreSQL://DB_NAME=sales
Welcome to the GDA SQL console, version 3.99.3
Type: .copyright to show usage and distribution terms
......@@ -1240,7 +1240,7 @@ c1>
<para>
Here is another sample session showing how to use variables in statements:
<programlisting><![CDATA[
[prompt]> gda-sql-5.0 -p SQLite -c "DB_DIR=.;DB_NAME=sales_test"
[prompt]> gda-sql-6.0 -p SQLite -c "DB_DIR=.;DB_NAME=sales_test"
Welcome to the GDA SQL console, version 3.1.2
Type: \copyright to show usage and distribution terms
......@@ -1278,11 +1278,11 @@ c0> ]]>
<para>
An example output will be:
<programlisting>
[prompt]> gda-list-config-5.0
[prompt]> gda-list-config-6.0
=== Installed providers ===
Provider: SQLite
Description: Provider for SQLite databases
Location: /usr/lib/libgda-5.0/providers/libgda-sqlite.so
Location: /usr/lib/libgda-6.0/providers/libgda-sqlite.so
Data source's parameters (Name / Type / Description):
DB_NAME / gchararray / Database name
DB_DIR / gchararray / Directory
......@@ -1290,7 +1290,7 @@ Data source's parameters (Name / Type / Description):
Provider: Berkeley-DB
Description: Provider for Berkeley databases
Location: /usr/lib/libgda-5.0/providers/libgda-bdb.so
Location: /usr/lib/libgda-6.0/providers/libgda-bdb.so
Data source's parameters (Name / Type / Description):
FILE / gchararray / Database file
DATABASE / gchararray / Database name
......@@ -1330,8 +1330,8 @@ Data source: Sales
<para>
For example listing all the possible operations (for all the providers) is:
<programlisting>
[prompt]> gda-list-server-op-5.0 -l
Using XML descriptions in /usr/share/libgda-5.0
[prompt]> gda-list-server-op-6.0 -l
Using XML descriptions in /usr/share/libgda-6.0
Existing operation types:
CREATE_DB
DROP_DB
......@@ -1346,8 +1346,8 @@ DROP_INDEX
Listing all the operations supported by the SQLite provider (notice that the SQLite provider does not support the
DROP_COLUMN operation as SQLite does not support it):
<programlisting>
[prompt]> gda-list-server-op-5.0 -l -p SQLite
Using XML descriptions in /usr/share/libgda-5.0
[prompt]> gda-list-server-op-6.0 -l -p SQLite
Using XML descriptions in /usr/share/libgda-6.0
For provider SQLite
Existing operation types for provider 'SQLite':
CREATE_DB
......@@ -1361,8 +1361,8 @@ DROP_INDEX
</programlisting>
Listing all the possible parameters for the MySQL provider and for the DROP_COLUMN operation:
<programlisting><![CDATA[
[prompt]> gda-list-server-op-5.0 -o DROP_COLUMN -p MySQL
Using XML descriptions in /usr/share/libgda-5.0
[prompt]> gda-list-server-op-6.0 -o DROP_COLUMN -p MySQL
Using XML descriptions in /usr/share/libgda-6.0
For provider MySQL
Description for type: DROP_COLUMN
<?xml version="1.0"?>
......@@ -1374,8 +1374,8 @@ Description for type: DROP_COLUMN
</programlisting>
Listing all the possible parameters for the all the installed providers and for the DROP_COLUMN operation:
<programlisting><![CDATA[
[prompt]> gda-list-server-op-5.0 -o DROP_COLUMN
Using XML descriptions in /usr/share/libgda-5.0
[prompt]> gda-list-server-op-6.0 -o DROP_COLUMN
Using XML descriptions in /usr/share/libgda-6.0
Description for type: DROP_COLUMN
<?xml version="1.0"?>
<server_op>
......
......@@ -67,21 +67,21 @@
| |-- trml2pdf.py
| `-- utils.py
|-- etc
| `-- libgda-5.0
| `-- libgda-6.0
| |-- config
| `-- sales_test.db
|-- lib
| |-- libgda-5.0.so -> libgda-5.0.so.4.1.0
| |-- libgda-5.0.so.4 -> libgda-5.0.so.4.1.0
| |-- libgda-5.0.so.4.1.0
| |-- libgda-report-5.0.so -> libgda-report-5.0.so.4.1.0
| |-- libgda-report-5.0.so.4 -> libgda-report-5.0.so.4.1.0
| |-- libgda-report-5.0.so.4.1.0
| |-- libgda-xslt-5.0.so -> libgda-xslt-5.0.so.4.1.0
| |-- libgda-xslt-5.0.so.4 -> libgda-xslt-5.0.so.4.1.0
| |-- libgda-xslt-5.0.so.4.1.0
| |-- libgda-6.0.so -> libgda-6.0.so.4.1.0
| |-- libgda-6.0.so.4 -> libgda-6.0.so.4.1.0
| |-- libgda-6.0.so.4.1.0
| |-- libgda-report-6.0.so -> libgda-report-6.0.so.4.1.0
| |-- libgda-report-6.0.so.4 -> libgda-report-6.0.so.4.1.0
| |-- libgda-report-6.0.so.4.1.0
| |-- libgda-xslt-6.0.so -> libgda-xslt-6.0.so.4.1.0
| |-- libgda-xslt-6.0.so.4 -> libgda-xslt-6.0.so.4.1.0
| |-- libgda-xslt-6.0.so.4.1.0
`-- share
`-- libgda-5.0
`-- libgda-6.0
|-- dtd
| |-- libgda-array.dtd
| |-- libgda-paramlist.dtd
......@@ -108,10 +108,10 @@
<programlisting>
|-- share
| `-- gir-1.0
| `-- Gda-5.0.gir
| `-- Gda-6.0.gir
`-- lib
`-- girepository-1.0
`-- Gda-5.0.typelib
`-- Gda-6.0.typelib
</programlisting>
</para>
</sect1>
......@@ -129,12 +129,12 @@
<programlisting>
.
`-- bin
|-- gda-list-config -> gda-list-config-5.0
|-- gda-list-config-5.0
|-- gda-list-jdbc-providers-5.0
|-- gda-list-server-op -> gda-list-server-op-5.0
|-- gda-list-server-op-5.0
`-- gda-test-connection-5.0
|-- gda-list-config -> gda-list-config-6.0
|-- gda-list-config-6.0
|-- gda-list-jdbc-providers-6.0
|-- gda-list-server-op -> gda-list-server-op-6.0
|-- gda-list-server-op-6.0
`-- gda-test-connection-6.0
</programlisting>
</para>
<para>
......@@ -147,14 +147,14 @@
<programlisting>
.
|-- bin
| `-- gda-sql-5.0
| `-- gda-sql-6.0
`-- share
|-- gnome
| `-- help
| `-- gda-sql
| |-- C
| `[···]
|-- libgda-5.0
|-- libgda-6.0
| `-- web
| |-- cnc.js
| |-- gda-print.css
......@@ -167,8 +167,8 @@
| `-- mouseirb_2.js
`-- man
`-- man1
|-- gda-sql-5.0.1
`-- gda-sql.1 -> gda-sql-5.0.1
|-- gda-sql-6.0.1
`-- gda-sql.1 -> gda-sql-6.0.1
</programlisting>
</para>
<para>
......@@ -194,13 +194,13 @@
<programlisting>
.
|-- lib
| |-- libgda-5.0
| |-- libgda-6.0
| | `-- providers
| | `-- libgda-postgres.so
| `-- pkgconfig
| `-- libgda-postgres-5.0.pc
| `-- libgda-postgres-6.0.pc
`-- share
`-- libgda-5.0
`-- libgda-6.0
|-- postgres_specs_add_column.xml
|-- postgres_specs_create_db.xml
|-- postgres_specs_create_index.xml
......@@ -237,14 +237,14 @@
<programlisting>
.
|-- lib
| |-- libgda-5.0
| |-- libgda-6.0
| | `-- providers
| | |-- gdaprovider-5.0.jar
| | |-- gdaprovider-6.0.jar
| | `-- libgda-jdbc.so
| `-- pkgconfig
| `-- libgda-jdbc-5.0.pc
| `-- libgda-jdbc-6.0.pc
`-- share
`-- libgda-5.0
`-- libgda-6.0
|-- jdbc_specs_create_table.xml
`-- jdbc_specs_dsn.xml
</programlisting>
......@@ -262,20 +262,20 @@
the static libraries.
<programlisting>
|-- include
| `-- libgda-5.0
| `-- libgda-6.0
| [... except the libgdaui/ directory ...]
`-- lib
|-- libgda-5.0
|-- libgda-5.0.a
|-- libgda-5.0.la
|-- libgda-report-5.0.a
|-- libgda-report-5.0.la
|-- libgda-xslt-5.0.a
|-- libgda-xslt-5.0.la
|-- libgda-6.0
|-- libgda-6.0.a
|-- libgda-6.0.la
|-- libgda-report-6.0.a
|-- libgda-report-6.0.la
|-- libgda-xslt-6.0.a
|-- libgda-xslt-6.0.la
`-- pkgconfig
|-- libgda-5.0.pc
|-- libgda-report-5.0.pc
`-- libgda-xslt-5.0.pc
|-- libgda-6.0.pc
|-- libgda-report-6.0.pc
`-- libgda-xslt-6.0.pc
</programlisting>
</para>
</sect1>
......
......@@ -58,7 +58,7 @@
<programlisting>
.
|-- lib
| |-- libgda-5.0
| |-- libgda-6.0
| | |-- plugins
| | | |-- gdaui-entry-filesel-spec.xml
| | | |-- gdaui-entry-password.xml
......@@ -66,11 +66,11 @@
| | | |-- gdaui-entry-pict-spec_string.xml
| | | |-- gdaui-entry-text-spec.xml
| | | `-- libgdaui-plugins.so
| |-- libgdaui-5.0.so -> libgdaui-5.0.so.4.1.0
| |-- libgdaui-5.0.so.4 -> libgdaui-5.0.so.4.1.0
| `-- libgdaui-5.0.so.4.1.0
| |-- libgda-ui-6.0.so -> libgda-ui-6.0.so.4.1.0
| |-- libgda-ui-6.0.so.4 -> libgda-ui-6.0.so.4.1.0
| `-- libgda-ui-6.0.so.4.1.0
`-- share
`-- libgda-5.0
`-- libgda-6.0
|-- language-specs
| `-- gda-sql.lang
|-- server_operation.glade
......@@ -91,10 +91,10 @@
<programlisting>
|-- share
| `-- gir-1.0
| `-- Gdaui-5.0.gir
| `-- Gdaui-6.0.gir
`-- lib
`-- girepository-1.0
`-- Gdaui-5.0.typelib
`-- Gdaui-6.0.typelib
</programlisting>
</para>
</sect1>
......@@ -108,11 +108,11 @@
<programlisting>
.
|-- bin
| `-- gda-control-center-5.0
| `-- gda-control-center-6.0
`-- share
|-- applications
| `-- gda-control-center-5.0.desktop
|-- libgda-5.0
| `-- gda-control-center-6.0.desktop
|-- libgda-6.0
| `-- pixmaps
| `-- gdaui-generic.png
`-- pixmaps
......@@ -130,10 +130,10 @@
<programlisting>
.
|-- bin
| `-- gda-browser-5.0
| `-- gda-browser-6.0
`-- share
|-- applications
| `-- gda-browser-5.0.desktop
| `-- gda-browser-6.0.desktop
|-- gnome
| `-- help
| `-- gda-browser
......@@ -156,18 +156,18 @@
<programlisting>
.
|-- bin
| `-- gdaui-demo-5.0
| `-- gdaui-demo-6.0
|-- include
| `-- libgda-5.0
| `-- libgda-6.0
| `-- libgdaui
| [...]
`-- lib
| |-- libgdaui-5.0.a
| |-- libgdaui-5.0.la
| |-- libgda-ui-6.0.a
| |-- libgda-ui-6.0.la
| `-- pkgconfig
| `-- libgdaui-5.0.pc
| `-- libgdaui-6.0.pc
`-- share
`-- libgda-5.0
`-- libgda-6.0
`-- demo
[...]
</programlisting>
......
......@@ -258,7 +258,7 @@
<para>
To create an encrypted database, you can use the <application>gda-sql</application> and when prompted