diff -ruN --exclude=CVS /usr/ports/databases/libgda4.orig/Makefile /usr/ports/databases/libgda4/Makefile --- /usr/ports/databases/libgda4.orig/Makefile 2011-09-23 17:21:34.000000000 -0500 +++ /usr/ports/databases/libgda4/Makefile 2011-10-15 02:39:46.589537219 -0500 @@ -7,8 +7,8 @@ # PORTNAME= libgda4 -PORTVERSION?= 4.2.5 -PORTREVISION?= 1 +PORTVERSION?= 4.2.9 +PORTREVISION?= 0 CATEGORIES= databases gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/${PORTNAME:S/4$//}/${PORTVERSION:R} @@ -18,7 +18,7 @@ MAINTAINER?= gnome@FreeBSD.org COMMENT?= Provides uniform access to different kinds of data sources -USE_BZIP2= yes +USE_XZ= yes LIBGDA4_SLAVE?= no .if !defined(REFERENCE_PORT) @@ -26,7 +26,6 @@ BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ gcrypt.18:${PORTSDIR}/security/libgcrypt \ - soup-2.4.1:${PORTSDIR}/devel/libsoup \ json-glib-1.0.0:${PORTSDIR}/devel/json-glib RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection @@ -44,15 +43,17 @@ CPPFLAGS+= -I${LOCALBASE}/include .if ${LIBGDA4_SLAVE}=="no" -OPTIONS= UI "Build UI tools" on +OPTIONS= UI "Build UI tools" on \ + SOUP "Build the Web provider" off \ + KEYRING "Enable gnome-keyring" off .endif +.include + .if defined(WITH_UI) INSTALLS_ICONS= yes .endif -.include - #VERSION= ${PORTVERSION:R} VERSION= 4.0 PLIST_SUB= VERSION=${VERSION} @@ -68,6 +69,22 @@ PLIST_SUB+= UI="@comment " .endif +.if defined(WITH_SOUP) +CONFIGURE_ARGS+=--with-libsoup +LIB_DEPENDS+= soup-2.4:${PORTSDIR}/devel/libsoup +PLIST_SUB+= WEB="" +.else +CONFIGURE_ARGS+=--without-libsoup +PLIST_SUB+= WEB="@comment " +.endif + +.if defined(WITH_KEYRING) +CONFIGURE_ARGS+=--with-gnome-keyring +LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +.else +CONFIGURE_ARGS+=--without-gnome-keyring +.endif + MAN1= gda-sql.1 gda-sql-4.0.1 .else USE_GNOME+= libgda4 @@ -95,7 +112,7 @@ .endif .if ${LIBGDA4_SLAVE}=="firebird" -LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client +LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird25-client CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} .else CONFIGURE_ARGS+= --without-firebird @@ -127,6 +144,9 @@ @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/providers/bdb/gda-bdb-provider.c \ ${WRKSRC}/providers/bdb/gda-bdb-test.c +.if !defined(WITH_SOUP) + @${REINPLACE_CMD} -e '/^install-webdataDATA:/,/^$$/d' ${WRKSRC}/tools/Makefile.in +.endif .if ${LIBGDA4_SLAVE}!="no" #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres . for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql @@ -150,11 +170,10 @@ ${PREFIX}/etc/libgda-${VERSION}/config.default .endif -.include - .if ${LIBGDA4_SLAVE}=="jdbc" && ${OSVERSION} < 800000 BROKEN= does not compile on 7.x .endif -.include .endif + +.include diff -ruN --exclude=CVS /usr/ports/databases/libgda4.orig/distinfo /usr/ports/databases/libgda4/distinfo --- /usr/ports/databases/libgda4.orig/distinfo 2011-03-03 04:21:36.000000000 -0600 +++ /usr/ports/databases/libgda4/distinfo 2011-10-14 23:02:40.943213861 -0500 @@ -1,2 +1,2 @@ -SHA256 (gnome2/libgda-4.2.5.tar.bz2) = b98d6063469a1ba8226d94800732544be629c55132516de741c937e8bf175f13 -SIZE (gnome2/libgda-4.2.5.tar.bz2) = 15196398 +SHA256 (gnome2/libgda-4.2.9.tar.xz) = bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814 +SIZE (gnome2/libgda-4.2.9.tar.xz) = 11215344 diff -ruN --exclude=CVS /usr/ports/databases/libgda4.orig/pkg-plist /usr/ports/databases/libgda4/pkg-plist --- /usr/ports/databases/libgda4.orig/pkg-plist 2011-03-03 04:21:36.000000000 -0600 +++ /usr/ports/databases/libgda4/pkg-plist 2011-10-15 02:05:59.100464359 -0500 @@ -7,13 +7,6 @@ bin/gda-sql bin/gda-sql-%%VERSION%% bin/gda-test-connection-%%VERSION%% -bin/gda_trml2html/__init__.py -bin/gda_trml2html/trml2html.py -bin/gda_trml2html/utils.py -bin/gda_trml2pdf/__init__.py -bin/gda_trml2pdf/color.py -bin/gda_trml2pdf/trml2pdf.py -bin/gda_trml2pdf/utils.py %%UI%%bin/gdaui-demo-%%VERSION%% @unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi etc/libgda-%%VERSION%%/config.default @@ -36,6 +29,8 @@ %%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h %%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h %%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-easy.h +%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-entry-shell.h +%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-entry-wrapper.h %%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h %%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h %%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h @@ -155,9 +150,9 @@ %%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a %%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la %%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so -lib/libgda-%%VERSION%%/providers/libgda-web.a -lib/libgda-%%VERSION%%/providers/libgda-web.la -lib/libgda-%%VERSION%%/providers/libgda-web.so +%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.a +%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.la +%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.so lib/libgda-%%VERSION%%/providers/libgda-sqlite.a lib/libgda-%%VERSION%%/providers/libgda-sqlite.la lib/libgda-%%VERSION%%/providers/libgda-sqlite.so @@ -177,7 +172,7 @@ libdata/pkgconfig/libgda-report-%%VERSION%%.pc libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc %%UI%%libdata/pkgconfig/libgda-ui-%%VERSION%%.pc -libdata/pkgconfig/libgda-web-%%VERSION%%.pc +%%WEB%%libdata/pkgconfig/libgda-web-%%VERSION%%.pc libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc %%UI%%share/applications/gda-browser-%%VERSION%%.desktop %%UI%%share/applications/gda-control-center-%%VERSION%%.desktop @@ -200,6 +195,10 @@ %%UI%%share/gnome/help/gda-browser/C/figures/declaredfk-dialog.png %%UI%%share/gnome/help/gda-browser/C/figures/declaredfk.png %%UI%%share/gnome/help/gda-browser/C/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/C/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/C/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/C/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/C/figures/ldap-table-mapping.png %%UI%%share/gnome/help/gda-browser/C/figures/mainwin.png %%UI%%share/gnome/help/gda-browser/C/figures/query-exec-persp.png %%UI%%share/gnome/help/gda-browser/C/figures/schema-browser-persp.png @@ -207,14 +206,22 @@ %%UI%%share/gnome/help/gda-browser/C/figures/trans-begin.png %%UI%%share/gnome/help/gda-browser/C/figures/trans-commit.png %%UI%%share/gnome/help/gda-browser/C/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/C/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/C/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/C/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/C/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/C/figures/virtual-cnc.png %%UI%%share/gnome/help/gda-browser/C/general-ui.page %%UI%%share/gnome/help/gda-browser/C/index.page +%%UI%%share/gnome/help/gda-browser/C/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/C/ldap-connections.page %%UI%%share/gnome/help/gda-browser/C/legal.xml %%UI%%share/gnome/help/gda-browser/C/query-execution-perspective.page %%UI%%share/gnome/help/gda-browser/C/schema-browser-perspective.page %%UI%%share/gnome/help/gda-browser/C/table-insert-data.page %%UI%%share/gnome/help/gda-browser/C/transactions.page %%UI%%share/gnome/help/gda-browser/C/variables.page +%%UI%%share/gnome/help/gda-browser/C/virtual-connections.page %%UI%%share/gnome/help/gda-browser/de/actions.page %%UI%%share/gnome/help/gda-browser/de/data-manager-perspective.page %%UI%%share/gnome/help/gda-browser/de/data-manager-source-editor.page @@ -234,6 +241,10 @@ %%UI%%share/gnome/help/gda-browser/de/figures/declaredfk-dialog.png %%UI%%share/gnome/help/gda-browser/de/figures/declaredfk.png %%UI%%share/gnome/help/gda-browser/de/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/de/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/de/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/de/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/de/figures/ldap-table-mapping.png %%UI%%share/gnome/help/gda-browser/de/figures/mainwin.png %%UI%%share/gnome/help/gda-browser/de/figures/query-exec-persp.png %%UI%%share/gnome/help/gda-browser/de/figures/schema-browser-persp.png @@ -241,14 +252,68 @@ %%UI%%share/gnome/help/gda-browser/de/figures/trans-begin.png %%UI%%share/gnome/help/gda-browser/de/figures/trans-commit.png %%UI%%share/gnome/help/gda-browser/de/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/de/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/de/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/de/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/de/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/de/figures/virtual-cnc.png %%UI%%share/gnome/help/gda-browser/de/general-ui.page %%UI%%share/gnome/help/gda-browser/de/index.page +%%UI%%share/gnome/help/gda-browser/de/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/de/ldap-connections.page %%UI%%share/gnome/help/gda-browser/de/legal.xml %%UI%%share/gnome/help/gda-browser/de/query-execution-perspective.page %%UI%%share/gnome/help/gda-browser/de/schema-browser-perspective.page %%UI%%share/gnome/help/gda-browser/de/table-insert-data.page %%UI%%share/gnome/help/gda-browser/de/transactions.page %%UI%%share/gnome/help/gda-browser/de/variables.page +%%UI%%share/gnome/help/gda-browser/de/virtual-connections.page +%%UI%%share/gnome/help/gda-browser/el/actions.page +%%UI%%share/gnome/help/gda-browser/el/data-manager-perspective.page +%%UI%%share/gnome/help/gda-browser/el/data-manager-source-editor.page +%%UI%%share/gnome/help/gda-browser/el/data-manager-xml-syntax.page +%%UI%%share/gnome/help/gda-browser/el/declaredfk.page +%%UI%%share/gnome/help/gda-browser/el/diagram.page +%%UI%%share/gnome/help/gda-browser/el/features.page +%%UI%%share/gnome/help/gda-browser/el/figures/action-1.png +%%UI%%share/gnome/help/gda-browser/el/figures/action-2.png +%%UI%%share/gnome/help/gda-browser/el/figures/action-3.png +%%UI%%share/gnome/help/gda-browser/el/figures/action-4.png +%%UI%%share/gnome/help/gda-browser/el/figures/cnc_open.png +%%UI%%share/gnome/help/gda-browser/el/figures/data-man-mode.png +%%UI%%share/gnome/help/gda-browser/el/figures/data-man-persp.png +%%UI%%share/gnome/help/gda-browser/el/figures/data-man-uicompose.png +%%UI%%share/gnome/help/gda-browser/el/figures/data-man-xmlcompose.png +%%UI%%share/gnome/help/gda-browser/el/figures/declaredfk-dialog.png +%%UI%%share/gnome/help/gda-browser/el/figures/declaredfk.png +%%UI%%share/gnome/help/gda-browser/el/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/el/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/el/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/el/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/el/figures/ldap-table-mapping.png +%%UI%%share/gnome/help/gda-browser/el/figures/mainwin.png +%%UI%%share/gnome/help/gda-browser/el/figures/query-exec-persp.png +%%UI%%share/gnome/help/gda-browser/el/figures/schema-browser-persp.png +%%UI%%share/gnome/help/gda-browser/el/figures/table-insert-data.png +%%UI%%share/gnome/help/gda-browser/el/figures/trans-begin.png +%%UI%%share/gnome/help/gda-browser/el/figures/trans-commit.png +%%UI%%share/gnome/help/gda-browser/el/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/el/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/el/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/el/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/el/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/el/figures/virtual-cnc.png +%%UI%%share/gnome/help/gda-browser/el/general-ui.page +%%UI%%share/gnome/help/gda-browser/el/index.page +%%UI%%share/gnome/help/gda-browser/el/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/el/ldap-connections.page +%%UI%%share/gnome/help/gda-browser/el/legal.xml +%%UI%%share/gnome/help/gda-browser/el/query-execution-perspective.page +%%UI%%share/gnome/help/gda-browser/el/schema-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/el/table-insert-data.page +%%UI%%share/gnome/help/gda-browser/el/transactions.page +%%UI%%share/gnome/help/gda-browser/el/variables.page +%%UI%%share/gnome/help/gda-browser/el/virtual-connections.page %%UI%%share/gnome/help/gda-browser/es/actions.page %%UI%%share/gnome/help/gda-browser/es/data-manager-perspective.page %%UI%%share/gnome/help/gda-browser/es/data-manager-source-editor.page @@ -268,6 +333,10 @@ %%UI%%share/gnome/help/gda-browser/es/figures/declaredfk-dialog.png %%UI%%share/gnome/help/gda-browser/es/figures/declaredfk.png %%UI%%share/gnome/help/gda-browser/es/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/es/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/es/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/es/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/es/figures/ldap-table-mapping.png %%UI%%share/gnome/help/gda-browser/es/figures/mainwin.png %%UI%%share/gnome/help/gda-browser/es/figures/query-exec-persp.png %%UI%%share/gnome/help/gda-browser/es/figures/schema-browser-persp.png @@ -275,14 +344,68 @@ %%UI%%share/gnome/help/gda-browser/es/figures/trans-begin.png %%UI%%share/gnome/help/gda-browser/es/figures/trans-commit.png %%UI%%share/gnome/help/gda-browser/es/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/es/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/es/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/es/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/es/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/es/figures/virtual-cnc.png %%UI%%share/gnome/help/gda-browser/es/general-ui.page %%UI%%share/gnome/help/gda-browser/es/index.page +%%UI%%share/gnome/help/gda-browser/es/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/es/ldap-connections.page %%UI%%share/gnome/help/gda-browser/es/legal.xml %%UI%%share/gnome/help/gda-browser/es/query-execution-perspective.page %%UI%%share/gnome/help/gda-browser/es/schema-browser-perspective.page %%UI%%share/gnome/help/gda-browser/es/table-insert-data.page %%UI%%share/gnome/help/gda-browser/es/transactions.page %%UI%%share/gnome/help/gda-browser/es/variables.page +%%UI%%share/gnome/help/gda-browser/es/virtual-connections.page +%%UI%%share/gnome/help/gda-browser/gl/actions.page +%%UI%%share/gnome/help/gda-browser/gl/data-manager-perspective.page +%%UI%%share/gnome/help/gda-browser/gl/data-manager-source-editor.page +%%UI%%share/gnome/help/gda-browser/gl/data-manager-xml-syntax.page +%%UI%%share/gnome/help/gda-browser/gl/declaredfk.page +%%UI%%share/gnome/help/gda-browser/gl/diagram.page +%%UI%%share/gnome/help/gda-browser/gl/features.page +%%UI%%share/gnome/help/gda-browser/gl/figures/action-1.png +%%UI%%share/gnome/help/gda-browser/gl/figures/action-2.png +%%UI%%share/gnome/help/gda-browser/gl/figures/action-3.png +%%UI%%share/gnome/help/gda-browser/gl/figures/action-4.png +%%UI%%share/gnome/help/gda-browser/gl/figures/cnc_open.png +%%UI%%share/gnome/help/gda-browser/gl/figures/data-man-mode.png +%%UI%%share/gnome/help/gda-browser/gl/figures/data-man-persp.png +%%UI%%share/gnome/help/gda-browser/gl/figures/data-man-uicompose.png +%%UI%%share/gnome/help/gda-browser/gl/figures/data-man-xmlcompose.png +%%UI%%share/gnome/help/gda-browser/gl/figures/declaredfk-dialog.png +%%UI%%share/gnome/help/gda-browser/gl/figures/declaredfk.png +%%UI%%share/gnome/help/gda-browser/gl/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/gl/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/gl/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/gl/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/gl/figures/ldap-table-mapping.png +%%UI%%share/gnome/help/gda-browser/gl/figures/mainwin.png +%%UI%%share/gnome/help/gda-browser/gl/figures/query-exec-persp.png +%%UI%%share/gnome/help/gda-browser/gl/figures/schema-browser-persp.png +%%UI%%share/gnome/help/gda-browser/gl/figures/table-insert-data.png +%%UI%%share/gnome/help/gda-browser/gl/figures/trans-begin.png +%%UI%%share/gnome/help/gda-browser/gl/figures/trans-commit.png +%%UI%%share/gnome/help/gda-browser/gl/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/gl/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/gl/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/gl/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/gl/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/gl/figures/virtual-cnc.png +%%UI%%share/gnome/help/gda-browser/gl/general-ui.page +%%UI%%share/gnome/help/gda-browser/gl/index.page +%%UI%%share/gnome/help/gda-browser/gl/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/gl/ldap-connections.page +%%UI%%share/gnome/help/gda-browser/gl/legal.xml +%%UI%%share/gnome/help/gda-browser/gl/query-execution-perspective.page +%%UI%%share/gnome/help/gda-browser/gl/schema-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/gl/table-insert-data.page +%%UI%%share/gnome/help/gda-browser/gl/transactions.page +%%UI%%share/gnome/help/gda-browser/gl/variables.page +%%UI%%share/gnome/help/gda-browser/gl/virtual-connections.page %%UI%%share/gnome/help/gda-browser/sl/actions.page %%UI%%share/gnome/help/gda-browser/sl/data-manager-perspective.page %%UI%%share/gnome/help/gda-browser/sl/data-manager-source-editor.page @@ -302,6 +425,10 @@ %%UI%%share/gnome/help/gda-browser/sl/figures/declaredfk-dialog.png %%UI%%share/gnome/help/gda-browser/sl/figures/declaredfk.png %%UI%%share/gnome/help/gda-browser/sl/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-table-mapping.png %%UI%%share/gnome/help/gda-browser/sl/figures/mainwin.png %%UI%%share/gnome/help/gda-browser/sl/figures/query-exec-persp.png %%UI%%share/gnome/help/gda-browser/sl/figures/schema-browser-persp.png @@ -309,14 +436,68 @@ %%UI%%share/gnome/help/gda-browser/sl/figures/trans-begin.png %%UI%%share/gnome/help/gda-browser/sl/figures/trans-commit.png %%UI%%share/gnome/help/gda-browser/sl/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/sl/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/sl/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/sl/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/sl/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/sl/figures/virtual-cnc.png %%UI%%share/gnome/help/gda-browser/sl/general-ui.page %%UI%%share/gnome/help/gda-browser/sl/index.page +%%UI%%share/gnome/help/gda-browser/sl/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/sl/ldap-connections.page %%UI%%share/gnome/help/gda-browser/sl/legal.xml %%UI%%share/gnome/help/gda-browser/sl/query-execution-perspective.page %%UI%%share/gnome/help/gda-browser/sl/schema-browser-perspective.page %%UI%%share/gnome/help/gda-browser/sl/table-insert-data.page %%UI%%share/gnome/help/gda-browser/sl/transactions.page %%UI%%share/gnome/help/gda-browser/sl/variables.page +%%UI%%share/gnome/help/gda-browser/sl/virtual-connections.page +%%UI%%share/gnome/help/gda-browser/zh_CN/actions.page +%%UI%%share/gnome/help/gda-browser/zh_CN/data-manager-perspective.page +%%UI%%share/gnome/help/gda-browser/zh_CN/data-manager-source-editor.page +%%UI%%share/gnome/help/gda-browser/zh_CN/data-manager-xml-syntax.page +%%UI%%share/gnome/help/gda-browser/zh_CN/declaredfk.page +%%UI%%share/gnome/help/gda-browser/zh_CN/diagram.page +%%UI%%share/gnome/help/gda-browser/zh_CN/features.page +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/action-1.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/action-2.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/action-3.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/action-4.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/cnc_open.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/data-man-mode.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/data-man-persp.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/data-man-uicompose.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/data-man-xmlcompose.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/declaredfk-dialog.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/declaredfk.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/diagram.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/ldap-browser-persp.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/ldap-classes.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/ldap-search.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/ldap-table-mapping.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/mainwin.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/query-exec-persp.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/schema-browser-persp.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/table-insert-data.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/trans-begin.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/trans-commit.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/trans-rollback.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-2.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-3.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-4.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-5.png +%%UI%%share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc.png +%%UI%%share/gnome/help/gda-browser/zh_CN/general-ui.page +%%UI%%share/gnome/help/gda-browser/zh_CN/index.page +%%UI%%share/gnome/help/gda-browser/zh_CN/ldap-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/zh_CN/ldap-connections.page +%%UI%%share/gnome/help/gda-browser/zh_CN/legal.xml +%%UI%%share/gnome/help/gda-browser/zh_CN/query-execution-perspective.page +%%UI%%share/gnome/help/gda-browser/zh_CN/schema-browser-perspective.page +%%UI%%share/gnome/help/gda-browser/zh_CN/table-insert-data.page +%%UI%%share/gnome/help/gda-browser/zh_CN/transactions.page +%%UI%%share/gnome/help/gda-browser/zh_CN/variables.page +%%UI%%share/gnome/help/gda-browser/zh_CN/virtual-connections.page %%UI%%share/icons/hicolor/16x16/apps/gda-control-center.png %%UI%%share/icons/hicolor/22x22/apps/gda-control-center.png %%UI%%share/icons/hicolor/24x24/apps/gda-control-center.png @@ -347,21 +528,33 @@ share/libgda-%%VERSION%%/dtd/libgda-array.dtd share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd +share/libgda-%%VERSION%%/gda_trml2html/__init__.py +share/libgda-%%VERSION%%/gda_trml2html/trml2html.py +share/libgda-%%VERSION%%/gda_trml2html/utils.py +share/libgda-%%VERSION%%/gda_trml2pdf/__init__.py +share/libgda-%%VERSION%%/gda_trml2pdf/color.py +share/libgda-%%VERSION%%/gda_trml2pdf/trml2pdf.py +share/libgda-%%VERSION%%/gda_trml2pdf/utils.py %%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png +%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/form.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png +%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/grid.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png +%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/table-add.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png +%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/ldap-entries.png +%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/table-add.png %%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg %%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg @@ -369,16 +562,17 @@ %%UI%%share/libgda-%%VERSION%%/import_encodings.xml share/libgda-%%VERSION%%/information_schema.xml %%UI%%share/libgda-%%VERSION%%/language-specs/gda-sql.lang -share/libgda-%%VERSION%%/php/README -share/libgda-%%VERSION%%/php/gda-clean.php -share/libgda-%%VERSION%%/php/gda-config.php -share/libgda-%%VERSION%%/php/gda-exception.php -share/libgda-%%VERSION%%/php/gda-front.php -share/libgda-%%VERSION%%/php/gda-meta.php -share/libgda-%%VERSION%%/php/gda-setup.php -share/libgda-%%VERSION%%/php/gda-tester.php -share/libgda-%%VERSION%%/php/gda-utils.php -share/libgda-%%VERSION%%/php/gda-worker.php +%%WEB%%share/libgda-%%VERSION%%/php/README +%%WEB%%share/libgda-%%VERSION%%/php/gda-clean.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-config.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-exception.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-front.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-meta.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-secure-config.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-setup.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-tester.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-utils.php +%%WEB%%share/libgda-%%VERSION%%/php/gda-worker.php %%UI%%share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-action.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png @@ -392,8 +586,14 @@ %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png -%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png -%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-a.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-s.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-u.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-x.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-entry.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-group.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-organization.png +%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-person.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png %%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png @@ -419,21 +619,21 @@ share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml %%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml %%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml -share/libgda-%%VERSION%%/web_specs_auth.xml -share/libgda-%%VERSION%%/web_specs_dsn.xml -share/libgda-%%VERSION%%/web/cnc.js -share/libgda-%%VERSION%%/web/gda-print.css -share/libgda-%%VERSION%%/web/gda.css -share/libgda-%%VERSION%%/web/irb.css -share/libgda-%%VERSION%%/web/irb.js -share/libgda-%%VERSION%%/web/jquery.js -share/libgda-%%VERSION%%/web/md5.js -share/libgda-%%VERSION%%/web/mouseapp_2.js -share/libgda-%%VERSION%%/web/mouseirb_2.js +%%WEB%%share/libgda-%%VERSION%%/web_specs_auth.xml +%%WEB%%share/libgda-%%VERSION%%/web_specs_dsn.xml +%%WEB%%share/libgda-%%VERSION%%/web/cnc.js +%%WEB%%share/libgda-%%VERSION%%/web/gda-print.css +%%WEB%%share/libgda-%%VERSION%%/web/gda.css +%%WEB%%share/libgda-%%VERSION%%/web/irb.css +%%WEB%%share/libgda-%%VERSION%%/web/irb.js +%%WEB%%share/libgda-%%VERSION%%/web/jquery.js +%%WEB%%share/libgda-%%VERSION%%/web/md5.js +%%WEB%%share/libgda-%%VERSION%%/web/mouseapp_2.js +%%WEB%%share/libgda-%%VERSION%%/web/mouseirb_2.js share/locale/ar/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/az/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/libgda-%%VERSION%%.mo -share/locale/ca@valencia/LC_MESSAGES/libgda-4.0.mo +share/locale/ca@valencia/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/da/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/de/LC_MESSAGES/libgda-%%VERSION%%.mo @@ -441,6 +641,7 @@ share/locale/el/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/eo/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/es/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/fa/LC_MESSAGES/libgda-%%VERSION%%.mo @@ -481,10 +682,10 @@ share/locale/zh_HK/LC_MESSAGES/libgda-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo %%UI%%share/pixmaps/gda-browser-%%VERSION%%.png -@dirrm share/libgda-%%VERSION%%/web +%%WEB%%@dirrm share/libgda-%%VERSION%%/web %%UI%%@dirrm share/libgda-%%VERSION%%/ui %%UI%%@dirrm share/libgda-%%VERSION%%/pixmaps -@dirrm share/libgda-%%VERSION%%/php +%%WEB%%@dirrm share/libgda-%%VERSION%%/php %%UI%%@dirrm share/libgda-%%VERSION%%/language-specs %%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable/actions %%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable @@ -498,17 +699,25 @@ %%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16 %%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor %%UI%%@dirrm share/libgda-%%VERSION%%/icons +%%UI%%@dirrm share/gnome/help/gda-browser/gl/figures +%%UI%%@dirrm share/gnome/help/gda-browser/gl %%UI%%@dirrm share/gnome/help/gda-browser/sl/figures %%UI%%@dirrm share/gnome/help/gda-browser/sl +%%UI%%@dirrm share/gnome/help/gda-browser/el/figures +%%UI%%@dirrm share/gnome/help/gda-browser/el %%UI%%@dirrm share/gnome/help/gda-browser/es/figures %%UI%%@dirrm share/gnome/help/gda-browser/es %%UI%%@dirrm share/gnome/help/gda-browser/de/figures %%UI%%@dirrm share/gnome/help/gda-browser/de %%UI%%@dirrm share/gnome/help/gda-browser/C/figures %%UI%%@dirrm share/gnome/help/gda-browser/C +%%UI%%@dirrm share/gnome/help/gda-browser/zh_CN/figures +%%UI%%@dirrm share/gnome/help/gda-browser/zh_CN %%UI%%@dirrm share/gnome/help/gda-browser @dirrm share/libgda-%%VERSION%%/dtd %%UI%%@dirrm share/libgda-%%VERSION%%/demo +@dirrm share/libgda-%%VERSION%%/gda_trml2pdf +@dirrm share/libgda-%%VERSION%%/gda_trml2html @dirrm share/libgda-%%VERSION%%/ %%UI%%@dirrmtry share/applications @dirrm lib/libgda-%%VERSION%%/providers @@ -526,8 +735,6 @@ @dirrm include/libgda-%%VERSION%%/libgda @dirrm include/libgda-%%VERSION%% @dirrmtry etc/libgda-%%VERSION%% -@dirrm bin/gda_trml2pdf -@dirrm bin/gda_trml2html @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/rw/LC_MESSAGES