------------------------------------------------------------ revno: 1231 committer: Rene Engelhard <[EMAIL PROTECTED]> branch nick: debian timestamp: Fri 2008-08-22 18:43:46 +0200 message: disable kk and mono again, merge 2.4.1-7, -1 renamed: openoffice.org-report-builder.lintian-overrides => openoffice.org-report-builder-bin.lintian-overrides modified: changelog control rules ------------------------------------------------------------ revno: 1022.1.152 committer: Rene Engelhard <[EMAIL PROTECTED]> branch nick: debian timestamp: Thu 2008-08-21 01:56:10 +0200 message: move file renamed: openoffice.org-report-builder.overrides.lintian => openoffice.org-report-builder-bin.overrides.lintian ------------------------------------------------------------ revno: 1022.1.153 committer: Rene Engelhard <[EMAIL PROTECTED]> branch nick: debian timestamp: Fri 2008-08-22 17:58:09 +0200 message: -7 modified: changelog control rules
=== modified file 'changelog' --- a/changelog 2008-08-20 17:45:39 +0000 +++ b/changelog 2008-08-22 16:43:46 +0000 @@ -1,22 +1,21 @@ -openoffice.org (1:3.0.0~ooo300m3-0.1pre) experimental; urgency=low +openoffice.org (1:3.0.0~ooo300m3-1) experimental; urgency=low * OpenOffice.org 3.0 release branch milestone 3 (OOO300_m3) - deleting cell contents while spellchecking window is open does now not crash in calc anymore in some circumstances (but the text is not editable) (closes: #490549) - package-ooo: fix install to make help land properly in -help-xx. + * merge 1:2.4.1-7 * ooo-build: - - update (r13640) + - update (r13651) - src: get OOO300 GSIs from ftp.linux.cz * debian/rules: - Add SYSTEM_LUCENE conditional, disable it yet as liblucene2-java is in contrib - Add SYSTEM_REDLAND conditional - reenable the SDK - - enable mn (Mongolian) and kk (Kazahk); build all languages again - (except hu which is broken and just contains svs translation) - - remove obsolete [$(OOO_ARCHS)] qualifier from python-dev builddep - (closes: #491623) + - enable mn (Mongolian); build all languages again (except hu which is + broken and just contains Swedish right now) - build against kde4 - update JAVA_RUNTIME_DEPENDS; add cacao-oj6-jre as alternative, bump java2-runtime to java5-runtime as we now stricly need a 1.5-capable @@ -29,8 +28,6 @@ - build with OpenJDK - add conditional to decide whether to build with Suns Solver or Koheis as ooo-build supports it. Use Suns solver for now - - put hsqldb.jar also to -base with internal hsqldb so that we don't - get file differences between sids package and backports. - add build-dep on libpoppler-dev (>= 0.8.0) as there's now a patch making "xpdfwrapper" build against poppler. yay. * debian/rules, debian/control.help.in: recommend @@ -48,32 +45,49 @@ restructuring inside OOo. Don't make ure contain/depend on cli*dll as that would make all OOo packages depend on mono and people might not want/need it - - Section: libs to fix override disparity. - Install more (upstream-generated) .config and policy* files for the mono bridge - make cli-uno-bridge conflict against the old libuno-cli-types1.1-cil * debian/control.in: - - Standards-Version: 3.8.0 (already following it) - fix -andromedas Replaces: - Homepage: http://www.go-oo.org, thanks Renato Yamane - move bsh from Depends to Suggests at -java-common + * debian/control.ure.in: + - uno-libs3-dbg is Priority: extra + * openoffice.org-presentation-minimizer.prerm.in: fix removal + * debian/rules, debian/control.in, + openoffice.org-headless.lintian-overrides: libvclplug_svp is now in + -coreXY upstream. Follow. + + -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 21 Aug 2008 21:09:34 +0200 + +openoffice.org (1:2.4.1-7) unstable; urgency=medium + + * ooo-build: + - update to debian-2-4-1 branch + * debian/control.mono.in: + - Section: libs to fix override disparity + * merge from experimental/3.0: + - debian/control.in: + + remove xutils build-dep, nas was using xmkmf and it's long gone here + * debian/control.in: + - Standards-Version: 3.8.0 (already following it) - For upgrades from bpo packages add a Replaces on openoffice.org-java-common to -base because of hsqldb, see below. (closes: #494512) - * debian/control.ure.in: - - uno-libs3-dbg is Priority: extra * debian/copyright: - wrap "Debian package authors:" line to please lintian - * openoffice.org-presentation-minimizer.prerm.in: fix removal - * debian/rules, debian/control.in, - openoffice.org-headless.lintian-overrides: libvclplug_svp is now in - -coreXY upstream. Follow. + * debian/rules: + - remove obsolete [$(OOO_ARCHS)] qualifier from python-dev builddep + (closes: #491623) + - put hsqldb.jar also to -base with internal hsqldb so that we don't + get file differences between sids package and backports. * debian/rules, debian/control.reportdesign.in: - split librpt* out into a -report-builder-bin package. Newer versions of the SRB also often work with older librpt*/OOo, but that would not work with the current packaging due to shlibdeps. - -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 20 Aug 2008 19:27:10 +0200 + -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 20 Aug 2008 16:14:21 +0200 openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
=== modified file 'control' --- a/control 2008-08-20 17:45:39 +0000 +++ b/control 2008-08-22 16:43:46 +0000 @@ -3,7 +3,7 @@ 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), 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-1) [powerpc], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:3.4.3-2) , kdepimlibs5-dev , libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) +Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1) [powerpc], 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, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:3.4.3-2) , kdepimlibs5-dev , libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) 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), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64] Standards-Version: 3.8.0 XS-Python-Version: current @@ -1400,33 +1400,6 @@ install extra dictionaries/hyphenation patterns/thesauri independently of the language packs. -Package: openoffice.org-l10n-kk -Architecture: all -Depends: locales | belocs-locales-data | locales-all -Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-kk -Provides: openoffice.org-l10n-${help-l10n-virtual-version}, openoffice.org2-l10n-kk -Suggests: hunspell-dictionary-kk | myspell-dictionary-kk, openoffice.org-hyphenation-kk, openoffice.org2-thesaurus-kk, openoffice.org-help-kk -Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>= ${base-version}.1), openoffice.org2-l10n-kk -Replaces: openoffice.org2-l10n-kk -Description: Kazahk language package for OpenOffice.org - OpenOffice.org is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains the localization of OpenOffice.org in - Kazahk. - It contains the user interface, the templates and the autotext features. - (please note that not all this is available for all possible languages). - You can switch user interface language using the locales system. - . - Spelling dictionaries, hyphenation patterns, thesauri and help are not - included in this package. There are some available in separate packages - (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*, - openoffice.org-help-*) - . - If you just want to be able to spellcheck etc. in other languages, you can - install extra dictionaries/hyphenation patterns/thesauri independently of - the language packs. - Package: openoffice.org-l10n-km Architecture: all Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all @@ -3086,79 +3059,6 @@ . This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK. -Package: cli-uno-bridge -Section: libs -Architecture: i386 sparc 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} -Conflicts: libuno-cil, libuno-cli-types1.1-cil -Provides: libuno-cil -Replaces: libuno-cil -Description: CLI binding for OpenOffice.org - 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: libs -Architecture: all -Depends: ${cli:Depends} -Description: CLI-UNO bridge - 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: libs -Architecture: all -Depends: ${cli:Depends} -Description: CLI-UNO bridge - 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: libs -Architecture: all -Depends: ${cli:Depends} -Description: CLI-UNO bridge - office 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: libs -Architecture: all -Depends: ${cli:Depends}, cli-uno-bridge -Description: CLI-UNO Bridge - 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: libs -Architecture: all -Depends: ${cli:Depends} -Description: CLI-UNO Bridge - 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: openoffice.org-qa-tools Section: devel Priority: extra === renamed file 'openoffice.org-report-builder.lintian-overrides' => 'openoffice.org-report-builder-bin.lintian-overrides' === modified file 'rules' --- a/rules 2008-08-20 19:09:05 +0000 +++ b/rules 2008-08-22 16:43:46 +0000 @@ -97,7 +97,7 @@ BUILD_ONLY_EN_US=n ENABLE_JAVA=y JDK=openjdk -ENABLE_MONO=y +ENABLE_MONO=n MONO_MINVER= (>= 1.2.3) USE_SYSTEM_HUNSPELL=y HUNSPELL_MIN_VER= (>= 1.1.5-2) @@ -506,7 +506,7 @@ #ISOS=$(shell ooo-build/bin/openoffice-xlate-lang -i all') ISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \ en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr it ja \ - ka kk km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \ + ka km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \ pa-IN pl pt pt-BR ro ru rw sk sl sr ss st sv \ ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu #HELPISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all') @@ -515,7 +515,7 @@ #LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all') LANGPACKISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \ en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr it ja \ - ka kk km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \ + ka km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \ pa-IN pl pt pt-BR ro ru rw sk sl sr ss st sv \ ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu endif