./packages/openofficeorg/3.3.0/experimental r2090: update ooo-build to 873f1abc092a8be9303c8e27e7b8471e29a34ce6
------------------------------------------------------------
revno: 2090
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-09-14 20:29:48 +0200
message:
update ooo-build to 873f1abc092a8be9303c8e27e7b8471e29a34ce6
removed:
patches/SA40775.diff
patches/disable-EMFPlus-needing-patch.diff
modified:
changelog
control
patches/series
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-08-24 21:32:12 +0000
+++ b/changelog 2010-09-14 18:29:48 +0000
@@ -1,17 +1,17 @@
-openoffice.org (1:3.3.0~beta-1) UNRELEASED; urgency=low
+openoffice.org (1:3.3.0~ooo330m7-1) UNRELEASED; urgency=low
- * OpenOffice.org 3.3.0 release branch milestone 3 (aka 3.3 beta)
+ * OpenOffice.org 3.3.0 release branch milestone 7
- fixes hebrew text in sheet tabs when using system fonts
(closes: #433231)
* ooo-build:
- back to master
- - use git (for now) again: 28d2a4e7af25256f2919b81d6fe03426ab2c7454
+ - use git (for now) again: 873f1abc092a8be9303c8e27e7b8471e29a34ce6
+ - use new ooo-build build insfrastructure
* debian/control.in:
* debian/rules:
- add and rework target(s) for new external sources handling upstream
- - temporarily disable mono
- updates for 3.3 and its various configuration changes
- move oo-*ldap.xcd.sample to /usr/share/openoffice.org-common/examples
- unpack extensions to /usr/lib/openoffice/share/extensions instead of
@@ -21,6 +21,8 @@
to /usr/share/java/basisX.Y/program/classes. Keep the symlinks there
- change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded
as otherwise libjpipe.so is not found...
+ - remove WITH_SPLIT option, upstream vanilla tarballs not supported by
+ new ooo-build build anymore
* debian/control.in, debian/rules: adapt for "Test Cleanup". Build-depend
on libcppunit-dev and junit4. Remove xvfb.
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
=== modified file 'control'
--- a/control 2010-08-24 11:40:27 +0000
+++ b/control 2010-09-14 18:29:48 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , l
ibpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , tcsh , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
sd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha a
md64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc p
owerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-de
v , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-p
lugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , l
ibpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , tcsh , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
sd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha a
md64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc p
owerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-u
tils (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390
x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
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, nvidia-glx-legacy-dev, 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), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
@@ -605,6 +605,79 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
+Package: cli-uno-bridge
+Section: cli-mono
+Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends}
+Conflicts: libuno-cil, libuno-cli-types1.1-cil
+Provides: libuno-cil
+Replaces: libuno-cil
+Description: OpenOffice.org bindings for Mono CLI
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the CLI bindings to OpenOffice.org for
+ accessing the OpenOffice.org API from Mono languages (e.g. C# and Boo)
+ .
+ Note that currently the use of Mono for add-ins & scripting inside
+ OpenOffice.org is *not* yet supported.
+
+Package: libuno-cli-basetypes1.0-cil
+Section: cli-mono
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}
+Description: OpenOffice.org bindings for Mono CLI -- base types
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains cli_basetypes.dll, which, as the name implies, provides
+ some base types.
+
+Package: libuno-cli-uretypes1.0-cil
+Section: cli-mono
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}
+Description: OpenOffice.org bindings for Mono CLI -- URE type library
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains cli_uretypes.dll, a CLI library which provides classes
+ and interfaces for components and client programs. It contains the URE types.
+
+Package: libuno-cli-oootypes1.0-cil
+Section: cli-mono
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}
+Description: OpenOffice.org bindings for Mono CLI -- OpenOffice.org type library
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains cli_oootypes.dll, a CLI library which provides classes
+ and interfaces for components and client programs. It contains the OOo types.
+
+Package: libuno-cli-cppuhelper1.0-cil
+Section: cli-mono
+Architecture: all
+Depends: ${cli:Depends}, cli-uno-bridge, ${misc:Depends}
+Description: OpenOffice.org bindings for Mono CLI -- bootstrapping library
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains cli_cppuhelper.dll, a CLI library which provides
+ bootstrapping code to bootstrap native UNO (use various UNO services
+ implemented in different languages).
+
+Package: libuno-cli-ure1.0-cil
+Section: cli-mono
+Architecture: all
+Depends: ${cli:Depends}, ${misc:Depends}
+Description: OpenOffice.org bindings for Mono CLI -- helper classes
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains cli_ure.dll, a CLI library which contains helper
+ classes for implementing UNO interfaces.
+
Package: mozilla-openoffice.org
Section: net
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
=== removed file 'patches/SA40775.diff'
--- a/patches/SA40775.diff 2010-08-24 11:40:27 +0000
+++ b/patches/SA40775.diff 1970-01-01 00:00:00 +0000
@@ -1,225 +0,0 @@
---- /dev/null 2010-08-16 13:41:41.277183513 +0200
-+++ openoffice.org-3.3.0/ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454/patches/dev300/SA40775.diff 2010-08-17 18:54:25.000000000 +0200
-@@ -0,0 +1,204 @@
-+diff -r 5b1ceed28385 sd/source/filter/ppt/propread.cxx
-+--- sd/source/filter/ppt/propread.cxx Fri Aug 06 14:53:07 2010 +0200
-++++ sd/source/filter/ppt/propread.cxx Mon Aug 09 14:04:21 2010 +0200
-+@@ -29,6 +29,7 @@
-+ #include "precompiled_sd.hxx"
-+ #include <propread.hxx>
-+ #include <tools/bigint.hxx>
-++#include "tools/debug.hxx"
-+ #include "rtl/tencinfo.h"
-+ #include "rtl/textenc.h"
-+
-+@@ -90,6 +91,17 @@
-+
-+ // -----------------------------------------------------------------------
-+
-++static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize)
-++{
-++ nSize -= 1; //Drop NULL terminator
-++
-++ //If it won't fit in a string, clip it to the max size that does
-++ if (nSize > STRING_MAXLEN)
-++ nSize = STRING_MAXLEN;
-++
-++ return nSize;
-++}
-++
-+ BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign )
-+ {
-+ sal_uInt32 i, nItemSize, nType, nItemPos;
-+@@ -108,36 +120,43 @@
-+ {
-+ case VT_LPSTR :
-+ {
-+- if ( (sal_uInt16)nItemSize )
-++ if ( nItemSize )
-+ {
-+- sal_Char* pString = new sal_Char[ (sal_uInt16)nItemSize ];
-+- if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
-++ try
-+ {
-+- nItemSize >>= 1;
-+- if ( (sal_uInt16)nItemSize > 1 )
-++ sal_Char* pString = new sal_Char[ nItemSize ];
-++ if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
-+ {
-+- sal_Unicode* pWString = (sal_Unicode*)pString;
-+- for ( i = 0; i < (sal_uInt16)nItemSize; i++ )
-+- *this >> pWString[ i ];
-+- rString = String( pWString, (sal_uInt16)nItemSize - 1 );
-+- }
-+- else
-+- rString = String();
-+- bRetValue = sal_True;
-+- }
-+- else
-+- {
-+- SvMemoryStream::Read( pString, (sal_uInt16)nItemSize );
-+- if ( pString[ (sal_uInt16)nItemSize - 1 ] == 0 )
-+- {
-+- if ( (sal_uInt16)nItemSize > 1 )
-+- rString = String( ByteString( pString ), mnTextEnc );
-++ nItemSize >>= 1;
-++ if ( nItemSize > 1 )
-++ {
-++ sal_Unicode* pWString = (sal_Unicode*)pString;
-++ for ( i = 0; i < nItemSize; i++ )
-++ *this >> pWString[ i ];
-++ rString = String( pWString, lcl_getMaxSafeStrLen(nItemSize) );
-++ }
-+ else
-+ rString = String();
-+ bRetValue = sal_True;
-+ }
-++ else
-++ {
-++ SvMemoryStream::Read( pString, nItemSize );
-++ if ( pString[ nItemSize - 1 ] == 0 )
-++ {
-++ if ( nItemSize > 1 )
-++ rString = String( ByteString( pString ), mnTextEnc );
-++ else
-++ rString = String();
-++ bRetValue = sal_True;
-++ }
-++ }
-++ delete[] pString;
-+ }
-+- delete[] pString;
-++ catch( const std::bad_alloc& )
-++ {
-++ DBG_ERROR( "sd PropItem::Read bad alloc" );
-++ }
-+ }
-+ if ( bAlign )
-+ SeekRel( ( 4 - ( nItemSize & 3 ) ) & 3 ); // dword align
-+@@ -148,18 +167,25 @@
-+ {
-+ if ( nItemSize )
-+ {
-+- sal_Unicode* pString = new sal_Unicode[ (sal_uInt16)nItemSize ];
-+- for ( i = 0; i < (sal_uInt16)nItemSize; i++ )
-+- *this >> pString[ i ];
-+- if ( pString[ i - 1 ] == 0 )
-++ try
-+ {
-+- if ( (sal_uInt16)nItemSize > 1 )
-+- rString = String( pString, (sal_uInt16)nItemSize - 1 );
-+- else
-+- rString = String();
-+- bRetValue = sal_True;
-++ sal_Unicode* pString = new sal_Unicode[ nItemSize ];
-++ for ( i = 0; i < nItemSize; i++ )
-++ *this >> pString[ i ];
-++ if ( pString[ i - 1 ] == 0 )
-++ {
-++ if ( (sal_uInt16)nItemSize > 1 )
-++ rString = String( pString, lcl_getMaxSafeStrLen(nItemSize) );
-++ else
-++ rString = String();
-++ bRetValue = sal_True;
-++ }
-++ delete[] pString;
-+ }
-+- delete[] pString;
-++ catch( const std::bad_alloc& )
-++ {
-++ DBG_ERROR( "sd PropItem::Read bad alloc" );
-++ }
-+ }
-+ if ( bAlign && ( nItemSize & 1 ) )
-+ SeekRel( 2 ); // dword align
-+@@ -349,24 +375,31 @@
-+ for ( sal_uInt32 i = 0; i < nDictCount; i++ )
-+ {
-+ aStream >> nId >> nSize;
-+- if ( (sal_uInt16)nSize )
-++ if ( nSize )
-+ {
-+ String aString;
-+ nPos = aStream.Tell();
-+- sal_Char* pString = new sal_Char[ (sal_uInt16)nSize ];
-+- aStream.Read( pString, (sal_uInt16)nSize );
-+- if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
-++ try
-+ {
-+- nSize >>= 1;
-+- aStream.Seek( nPos );
-+- sal_Unicode* pWString = (sal_Unicode*)pString;
-+- for ( i = 0; i < (sal_uInt16)nSize; i++ )
-+- aStream >> pWString[ i ];
-+- aString = String( pWString, (sal_uInt16)nSize - 1 );
-++ sal_Char* pString = new sal_Char[ nSize ];
-++ aStream.Read( pString, nSize );
-++ if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
-++ {
-++ nSize >>= 1;
-++ aStream.Seek( nPos );
-++ sal_Unicode* pWString = (sal_Unicode*)pString;
-++ for ( i = 0; i < nSize; i++ )
-++ aStream >> pWString[ i ];
-++ aString = String( pWString, lcl_getMaxSafeStrLen(nSize) );
-++ }
-++ else
-++ aString = String( ByteString( pString, lcl_getMaxSafeStrLen(nSize) ), mnTextEnc );
-++ delete[] pString;
-+ }
-+- else
-+- aString = String( ByteString( pString, (sal_uInt16)nSize - 1 ), mnTextEnc );
-+- delete[] pString;
-++ catch( const std::bad_alloc& )
-++ {
-++ DBG_ERROR( "sd Section::GetDictionary bad alloc" );
-++ }
-+ if ( !aString.Len() )
-+ break;
-+ aDict.AddProperty( nId, aString );
-+@@ -502,6 +502,11 @@
-+ }
-+ if ( nPropSize )
-+ {
-++ if ( nPropSize > nStrmSize )
-++ {
-++ nPropCount = 0;
-++ break;
-++ }
-+ pStrm->Seek( nPropOfs + nSecOfs );
-+ // make sure we don't overflow the section size
-+ if( nPropSize > nSecSize - nSecOfs )
-+diff -r 5b1ceed28385 tools/source/generic/poly.cxx
-+--- tools/source/generic/poly.cxx Fri Aug 06 14:53:07 2010 +0200
-++++ tools/source/generic/poly.cxx Mon Aug 09 14:04:21 2010 +0200
-+@@ -243,6 +243,11 @@
-+ void ImplPolygon::ImplSplit( USHORT nPos, USHORT nSpace, ImplPolygon* pInitPoly )
-+ {
-+ const ULONG nSpaceSize = nSpace * sizeof( Point );
-++
-++ //Can't fit this in :-(, throw ?
-++ if (mnPoints + nSpace > USHRT_MAX)
-++ return;
-++
-+ const USHORT nNewSize = mnPoints + nSpace;
-+
-+ if( nPos >= mnPoints )
-+
---- openoffice.org-3.3.0/ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454/patches/dev300/apply 2010-08-17 18:59:01.000000000 +0200
-+++ openoffice.org-3.3.0/ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454/patches/dev300/apply 2010-08-17 18:59:19.000000000 +0200
-@@ -19,7 +19,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
- PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
- FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
- CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
-- Toolbars, MySQL, BorderTypes, WriterNavigation
-+ Toolbars, MySQL, BorderTypes, WriterNavigation, Security
-
- LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
- FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
-@@ -3736,3 +3736,6 @@ oox-pptx-import-fix-customshapes-and-groups.diff, n#621739, rodo
- [ GSoC2010 ]
-
- # Patches from GSoC 2010 students.
-+
-+[ Security ]
-+SA40775.diff
=== removed file 'patches/disable-EMFPlus-needing-patch.diff'
--- a/patches/disable-EMFPlus-needing-patch.diff 2010-08-24 07:57:51 +0000
+++ b/patches/disable-EMFPlus-needing-patch.diff 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 4775581..cb830f8 100644
---- openoffice.org-3.3.0~beta/ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454/patches/dev300/apply
-+++ openoffice.org-3.3.0~beta/ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454/patches/dev300/apply
-@@ -3622,6 +3622,8 @@ slideshow-sound.diff, n#515553, rodo
- vcl-gtk-process-events-on-exit.diff, rodo
- sfx2-add-to-recently-used-after-save.diff, rodo
-
-+# FIXME: No idea whether this is supposed to be in EMFPlus directly
-+[ Fixes and EMFPlus ]
- svtools-wmf-clipperf.diff, n#535304, thorsten
-
- [ Fixes ]
=== modified file 'patches/series'
--- a/patches/series 2010-08-24 12:57:11 +0000
+++ b/patches/series 2010-09-14 18:29:48 +0000
@@ -2,6 +2,4 @@
#reduce-height-on-dialogs-for-netbooks.diff
regcomp-fix-spelling.diff
shift-translations.diff
-SA40775.diff
-disable-EMFPlus-needing-patch.diff
autogen.sh.diff
=== modified file 'rules'
--- a/rules 2010-09-09 12:10:55 +0000
+++ b/rules 2010-09-14 18:29:48 +0000
@@ -68,12 +68,11 @@
unexport LS_COLORS
MWS=OOO330
-#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m3
+MILESTONE=m7
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-#TAG=$(MWS)_$(MILESTONE)
+GIT_TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-3
-OOO_BUILD_VERSION=28d2a4e7af25256f2919b81d6fe03426ab2c7454
+OOO_BUILD_VERSION=873f1abc092a8be9303c8e27e7b8471e29a34ce6
OOO_BUILD_TAG=
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
@@ -138,7 +137,7 @@
JDK=gcj-jdk
endif
endif
-ENABLE_MONO=n
+ENABLE_MONO=y
MONO2=y
ifeq "$(MONO2)" "y"
MONO_MINVER= (>= 2.4.2.3)
@@ -276,9 +275,6 @@
PACKAGE_NPSOPLUGIN=y
endif
PACKAGE_BASE=y
-# "new" source split? This is to be n when to use
-# Suns tarballs.
-WITH_SPLIT=y
ENABLE_GRAPHITE=y
USE_SYSTEM_GRAPHITE=y
ALLOC=system
@@ -318,12 +314,9 @@
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--enable-hids \
--with-system-dicts \
- --with-additional-sections="$(ADDITIONAL_SECTIONS)" \
- --without-git
+ --with-additional-sections="$(ADDITIONAL_SECTIONS)"
-ifneq "$(WITH_SPLIT)" "y"
- CONFIGURE_FLAGS += --without-split
-endif
+#CONFIGURE_FLAGS += --with-git
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -1629,11 +1622,7 @@
rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
rm -f download.list
-ifeq "$(WITH_SPLIT)" "y"
rm -f $(OOO_BUILD_TREE)/src/$(TAG)*
-else
- rm -f $(OOO_BUILD_TREE)/src/OOo*_src*
-endif
rm -f $(OOO_BUILD_TREE)/src/GSI*
for i in ext-sources-$(OOO_BUILD_TREE)/*; do \
@@ -1945,7 +1934,7 @@
endif
cp -a ext-sources-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
- cp -a sources/* $(OOO_BUILD_TREE)/src
+ cp -a archive-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
ifneq ($(GCC_VERSION),)
ifneq ($(GCC_VERSION),snapshot)
=== modified file 'source/components'
--- a/source/components 2010-08-23 18:32:32 +0000
+++ b/source/components 2010-09-14 18:29:48 +0000
@@ -1,4 +1,5 @@
ext-sources
-ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454
-ext-sources-ooo-build-28d2a4e7af25256f2919b81d6fe03426ab2c7454
+archive-ooo-build-873f1abc092a8be9303c8e27e7b8471e29a34ce6
+ooo-build-873f1abc092a8be9303c8e27e7b8471e29a34ce6
+ext-sources-ooo-build-873f1abc092a8be9303c8e27e7b8471e29a34ce6
translation-updates-20100529
Reply to: