Update of /cvs/debian-openoffice/oo-deb/debian In directory gluck:/tmp/cvs-serv11914
Modified Files: Tag: OPENOFFICE_ORG_1_1_1 changelog control control.in rules Log Message: - mention system-unixodbc, enable it - remove libhnj-dev from Build-Conflicts: since we Build-Depend: on libaltlinuxhyph-dev anyhow which Conflicts with libhnj-dev Index: control.in =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v retrieving revision 1.114.4.10 retrieving revision 1.114.4.11 diff -u -d -r1.114.4.10 -r1.114.4.11 --- control.in 8 Mar 2004 17:07:28 -0000 1.114.4.10 +++ control.in 17 Mar 2004 22:16:37 -0000 1.114.4.11 @@ -3,8 +3,8 @@ 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 | libdb++-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, libxrender-dev | xlibs-de v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1) -Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3) +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 | libdb++-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, libxrender-dev | xlibs-de v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev +Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3) Standards-Version: 3.5.6 Package: openoffice.org Index: changelog =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v retrieving revision 1.262.4.26 retrieving revision 1.262.4.27 diff -u -d -r1.262.4.26 -r1.262.4.27 --- changelog 17 Mar 2004 15:54:47 -0000 1.262.4.26 +++ changelog 17 Mar 2004 22:16:37 -0000 1.262.4.27 @@ -3,8 +3,15 @@ * New patches: - icu-build-no-extras: do not build extras/ in icu, works around ld errors which occurs here (see #210608)... [RE] + - system-unixodbc: use system unixODBC headers [RE] + * Modified patches: + - config-switches.diff: implement --with-system-unixodbc-headers [RE] + * debian/rules: + - --with-system-unixodbc-headers [RE] + * debian/control.in: + - add unixodbc-dev to Build-Depends: [RE] - -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 17 Mar 2004 16:37:30 +0100 + -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 17 Mar 2004 22:42:45 +0100 openoffice.org (1.1.0+cvs20040312-1) experimental; urgency=low Index: control =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v retrieving revision 1.147.4.13 retrieving revision 1.147.4.14 diff -u -d -r1.147.4.13 -r1.147.4.14 --- control 8 Mar 2004 17:07:27 -0000 1.147.4.13 +++ control 17 Mar 2004 22:16:37 -0000 1.147.4.14 @@ -3,8 +3,8 @@ 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 | libdb++-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, libxrender-dev | xlibs-de v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1) -Build-Conflicts: libhnj-dev, g++-3.3 (= 1:3.3.3-0pre3) +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 | libdb++-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, libxrender-dev | xlibs-de v (<< 4.3.0-1), render-dev | xlibs-dev (<< 4.3.0-1), unixodbc-dev +Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3) Standards-Version: 3.5.6 Package: openoffice.org Index: rules =================================================================== RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v retrieving revision 1.182.4.12 retrieving revision 1.182.4.13 diff -u -d -r1.182.4.12 -r1.182.4.13 --- rules 14 Mar 2004 02:31:25 -0000 1.182.4.12 +++ rules 17 Mar 2004 22:16:37 -0000 1.182.4.13 @@ -56,7 +56,8 @@ --with-system-curl \ --with-system-myspell \ --with-system-altlinuxhyph \ - --with-system-x11-extensions-headers + --with-system-x11-extensions-headers \ + --with-system-unixodbc-headers # If DEB_BUILD_OPTIONS contains jdkhome=/absolute/path/to/jdk, build with the # JDK at /absolute/path/to/jdk. @@ -401,6 +402,7 @@ rm -f berkeleydb/prj/d.lst rm -f extensions/prj/build.lst rm -f vcl/prj/build.lst + rm -f connctivity/prj/build.lst for i in xmlhelp/source/com/sun/star/help/*.java.in; do \ rm -f `basename $$i .in`; \ done