------------------------------------------------------------ revno: 1006 committer: Rene Engelhard <[EMAIL PROTECTED]> branch nick: debian timestamp: Sat 2008-02-09 13:11:15 +0100 message: -5 changes modified: changelog control control.in control.postgresql.in control.qa.in rules
=== modified file 'changelog' --- a/changelog 2008-02-07 08:14:20 +0000 +++ b/changelog 2008-02-09 12:11:15 +0000 @@ -1,3 +1,18 @@ +openoffice.org (1:2.3.1-5) unstable; urgency=low + + * debian/control.in: + - build-depend on flex-old + - make -common conflict against openoffice.org-calc (<< 1:2.3.0) + (closes: #464544) + - build-conflict against flex (= 2.5.34-1) on amd64 + - s/python/Python/, thanks lintian. Add Homepage: field for python-uno + * debian/control.qa.in: + - add ${shlibs:Depends}, thanks lintian + * debian/control.postgresql.in: + - s/postgresql/PostgreSQL/, thanks linttian + + -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 08 Feb 2008 14:38:00 +0100 + openoffice.org (1:2.3.1-4) unstable; urgency=medium * ooo-build:
=== modified file 'control' --- a/control 2008-02-04 12:09:25 +0000 +++ b/control 2008-02-09 12:11:15 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org> Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]> -Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64], libgcj-bc [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64] -Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6) +Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex-old [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64], libgcj-bc [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64] +Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.4.34-1) [amd64] Standards-Version: 3.7.2 XS-Python-Version: current Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3.1/unstable @@ -117,7 +117,7 @@ Architecture: all Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, openoffice.org-style-andromeda Recommends: openoffice.org-style-industrial, openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-hicontrast -Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< 2.2.0-1), openoffice.org-writer (<< 2.2.0-1), openoffice.org-calc (<< 2.2.0-1), openoffice.org-impress (<< 2.2.0-1), openoffice.org-draw (<< 2.2.0-1), openoffice.org-math (<< 2.2.0-1) +Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< 2.2.0-1), openoffice.org-writer (<< 2.2.0-1), openoffice.org-calc (<< 1:2.3.0-1), openoffice.org-impress (<< 2.2.0-1), openoffice.org-draw (<< 2.2.0-1), openoffice.org-math (<< 2.2.0-1) Provides: openoffice.org2-common, openoffice.org-l10n-en-us Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1) Description: OpenOffice.org office suite architecture independent files @@ -400,13 +400,14 @@ Replaces: openoffice.org-common (<< 1.9.82) Description: Python interface for OpenOffice.org The Python-UNO bridge allows use of the standard OpenOffice.org API - with the python scripting language. It additionally allows - others to develop UNO components in python, thus python UNO components + with the Python scripting language. It additionally allows + others to develop UNO components in Python, thus Python UNO components may be run within the OpenOffice.org process and can be called from C++ or the built in StarBasic scripting language. . You can more information about Pyuno at http://udk.openoffice.org/python/python-bridge.html +Homepage: http://udk.openoffice.org/python/python-bridge.html Package: openoffice.org-officebean Architecture: i386 powerpc sparc amd64 ppc64 @@ -2914,7 +2915,7 @@ Package: openoffice.org-qa-tools Section: devel Priority: extra -Depends: openoffice.org (>> ${base-version}), openoffice.org-filter-so52, openoffice.org-java-common +Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}), openoffice.org-filter-so52, openoffice.org-java-common Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2) Replaces: openoffice.org-common (<< 2.0.4~ood680m2) @@ -3050,7 +3051,7 @@ OpenOffice.org is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . - The postgresql SDBC Driver allows to use the PostgreSQL database from + The PostgreSQL SDBC Driver allows to use the PostgreSQL database from OpenOffice.org without any wrapper layer such as ODBC or JDBC. Homepage: http://dba.openoffice.org/drivers/postgresql/ === modified file 'control.in' --- a/control.in 2008-01-28 16:34:45 +0000 +++ b/control.in 2008-02-09 12:11:15 +0000 @@ -6,7 +6,7 @@ Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [%OOO_ARCHS%], - flex [%OOO_ARCHS%], + flex-old [%OOO_ARCHS%], libpam0g-dev [%OOO_ARCHS%], libxaw7-dev [%OOO_ARCHS%], unzip [%OOO_ARCHS%], @@ -51,7 +51,7 @@ gperf [%OOO_ARCHS%], libpq-dev [%OOO_ARCHS%] %BUILD_DEPS% -Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6) +Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.4.34-1) [amd64] Standards-Version: 3.7.2 XS-Python-Version: current Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3.1/unstable @@ -267,7 +267,7 @@ openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< 2.2.0-1), openoffice.org-writer (<< 2.2.0-1), - openoffice.org-calc (<< 2.2.0-1), + openoffice.org-calc (<< 1:2.3.0-1), openoffice.org-impress (<< 2.2.0-1), openoffice.orgVER-draw (<< 2.2.0-1), openoffice.orgVER-math (<< 2.2.0-1) @@ -641,13 +641,14 @@ Replaces: openoffice.orgVER-common (<< 1.9.82) Description: Python interface for OpenOffice.org The Python-UNO bridge allows use of the standard OpenOffice.org API - with the python scripting language. It additionally allows - others to develop UNO components in python, thus python UNO components + with the Python scripting language. It additionally allows + others to develop UNO components in Python, thus Python UNO components may be run within the OpenOffice.org process and can be called from C++ or the built in StarBasic scripting language. . You can more information about Pyuno at http://udk.openoffice.org/python/python-bridge.html +Homepage: http://udk.openoffice.org/python/python-bridge.html Package: openoffice.orgVER-officebean Architecture: %OOO_JAVA_ARCHS% === modified file 'control.postgresql.in' --- a/control.postgresql.in 2007-09-06 11:16:40 +0000 +++ b/control.postgresql.in 2008-02-09 12:11:15 +0000 @@ -9,7 +9,7 @@ OpenOffice.org is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . - The postgresql SDBC Driver allows to use the PostgreSQL database from + The PostgreSQL SDBC Driver allows to use the PostgreSQL database from OpenOffice.org without any wrapper layer such as ODBC or JDBC. Homepage: http://dba.openoffice.org/drivers/postgresql/ === modified file 'control.qa.in' --- a/control.qa.in 2007-08-21 17:39:50 +0000 +++ b/control.qa.in 2008-02-09 12:11:15 +0000 @@ -1,7 +1,8 @@ Package: openoffice.orgVER-qa-tools Section: devel Priority: extra -Depends: openoffice.orgVER (>> ${base-version}), +Depends: ${shlibs:Depends}, + openoffice.orgVER (>> ${base-version}), openoffice.orgVER-filter-so52, openoffice.orgVER-java-common Recommends: openoffice.orgVER-qa-api-tests, === modified file 'rules' --- a/rules 2008-02-06 14:47:58 +0000 +++ b/rules 2008-02-09 12:11:15 +0000 @@ -2655,7 +2655,7 @@ cat debian/shlibs.override.stdlibs >> debian/shlibs.local endif # we need to do it in two steps. The new dpkg-shlibdeps doesn't find - # /usr/lib/libgcj-bc.so when specifying -l/usr/lib/gcj-4.2-81 + # /usr/lib/libgcj-bc.so when specifying -l/usr/lib/$(GCJ_JAWT_DIR) # and therefore we must not use it for -gcj. But we *do* need it # for -officebean (libjawt.so is there) LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \