Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv391/debian
Modified Files: Tag: OPENOFFICE_ORG_1_1_1 control Log Message: run debian/rules control *grumble* s/java:/java-/ at openoffice.org-bin for the substvar Index: control =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v retrieving revision 1.147.4.2 retrieving revision 1.147.4.3 diff -u -d -r1.147.4.2 -r1.147.4.3 --- control 27 Jan 2004 00:04:06 -0000 1.147.4.2 +++ control 27 Jan 2004 00:24:38 -0000 1.147.4.3 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org> Uploaders: Chris Halls <[EMAIL PROTECTED]>, Jan-Hendrik Palic <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]> -Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb3++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev +Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>= 4.0.9) | debhelper (= 4.0.2.openoffice), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip, zip, g++-3.3 (>= 1:3.3.1-1) | g++-3.0 [!powerpc], autoconf, sharutils, libgtk2.0-dev, pkg-config, libpng12-dev | libpng2-dev, libjpeg62-dev, libtiff3g-dev, libart-2.0-dev (>= 2.3.13), xsltproc (>= 1.0.30), imagemagick, xutils, libfontconfig1-dev | g++-3.0 [!powerpc], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], gimp-perl | gimp1.2-perl, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake, libfreetype6-dev | g++-3.0 [!powerpc], libdb4.1++-dev, libaudio-dev | nas-dev, xlibs-pic (>= 4.2.1-6) | xlibs-static-pic | g++-3.0 [!powerpc], xlibs-dev | libx11-dev, xlibs-dev | libsm-dev, xlibs-dev | libxt-dev, xlibs-dev | libxext-dev, xlibs-dev | libice-dev, libsane-dev, libcurl2-dev | libcurl-dev, libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev Build-Conflicts: libhnj-dev Standards-Version: 3.5.6 @@ -41,7 +41,7 @@ Package: openoffice.org-bin Architecture: i386 powerpc s390 sparc -Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)${java:additional-depends} +Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)${java-additional-depends} Conflicts: openoffice.org1.1-bin Replaces: openoffice.org1.1-bin, openoffice.org-gnome Provides: openoffice.org1.1-bin