------------------------------------------------------------
revno: 1398
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2009-01-28 16:18:01 +0100
message:
actually we need to wiat for rptfix04 really as we rely on reportbuilder...
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.63
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Tue 2009-01-27 23:21:06 +0100
message:
-1
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2009-01-27 07:27:24 +0000
+++ b/changelog 2009-01-28 15:18:01 +0000
@@ -7,7 +7,7 @@
- About box now fixes en-US tense and adds missing comma (closes: #470521)
- fixes bridges for SELinux (hopefully closes: #440105)
* ooo-build:
- - back on trunk (r15151)
+ - back on trunk (r15209)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -22,6 +22,7 @@
Hardcode --without-writer2latex
- add conditional for enabling graphite, now that ooo-build has a surrected
--enable-graphite again (and upstream a cws for it)
+ - temporarily disable the Report Builder extension until rptfix04
- move install of make install-installed file from cp -a to dh_install;
this also moves hid.lst to -qa-tools
- explicitely specify --with-stlport in USE_STLPORT=y case as
@@ -32,9 +33,9 @@
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
jvmfwk soon will stop displaying JVMs < 1.5.0
- -- Rene Engelhard <[email protected]> Sun, 25 Jan 2009 23:23:10 +0100
+ -- Rene Engelhard <[email protected]> Wed, 28 Jan 2009 16:17:28 +0100
-openoffice.org (1:3.0.1-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.1-1) experimental; urgency=low
* OpenOffice.org 3.0.1 final (except for Windows identical with rc2)
* ooo-build
=== modified file 'control'
--- a/control 2009-01-26 23:34:06 +0000
+++ b/control 2009-01-28 15:18:01 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
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, fastjar, xsltproc, imagemagick, 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 ppc64] , gij [i386 sparc mips mipsel s390 armel
amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390
armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] ,
ant (>= 1.6.5) [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] ,
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-devel (>= 2.0.1) [i386 sparc amd64 ia64],
libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386
sparc amd64 ia64], cli-common-dev (>= 0.5.7) [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 (>= 4.0) ,
libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , 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.13-3), lp-solve (>=
5.5.0.13-3) , libsuitesparse-dev (>> 1:3.2.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
+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, fastjar, xsltproc, imagemagick, 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 ppc64] , gij [i386 sparc mips mipsel s390 armel
amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390
armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] ,
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-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386
sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64],
cli-common-dev (>= 0.5.7) [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 (>= 4.0) ,
libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , 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.13-3), lp-solve (>=
5.5.0.13-3) , libsuitesparse-dev (>> 1:3.2.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
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], xulrunner-dev
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -3221,6 +3221,52 @@
This package contains a Mozilla/Netscape compatible plugin which can handle
all OOo documents.
+Package: openoffice.org-wiki-publisher
+Section: misc
+Priority: optional
+Architecture: all
+Depends: ${mediawiki-jar-depends}, openoffice.org-core (>= 1:2.4.0-6),
openoffice.org-java-common (>> 1:2.4.0), ${java-runtime-depends}
+Enhances: openoffice.org-writer
+Suggests: mediawiki
+Description: OpenOffice.org Wiki Publisher extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains an extension to create/edit/publish MediaWiki
+ articles with OpenOffice.org
+Homepage: http://extensions.services.openoffice.org/project/wikipublisher
+
+Package: openoffice.org-report-builder
+Section: misc
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>=
${base-version}), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends}
+Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Replaces: openoffice.org-reportdesigner
+Provides: openoffice.org-reportdesigner
+Enhances: openoffice.org-base
+Description: OpenOffice.org Report Builder extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the report builder extension:
+ "Create with the Sun Report Builder stylish, smart-looking database reports.
+ The flexible report editor can define group and page headers as well as
+ group and page footers and even calculation fields are available to
+ accomplish complex database reports."
+Homepage: http://extensions.services.openoffice.org/project/reportdesign
+
+Package: openoffice.org-report-builder-bin
+Section: misc
+Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-base (>= 2.3.0~src680m225)
+Replaces: openoffice.org-report-builder
+Description: OpenOffice.org Report Builder extension - support libraries
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains some architecture-dependent support libraries
+ (librpt*.so) for the report builder extension.
+
Package: openoffice.org-presentation-minimizer
Section: misc
Priority: optional
@@ -3240,6 +3286,33 @@
quality as presentations designed for print."
Homepage:
http://extensions.services.openoffice.org/project/PresentationMinimizer
+Package: openoffice.org-presenter-console
+Section: misc
+Priority: optional
+Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Conflicts: openoffice.org-presenter-screen
+Provides: openoffice.org-presenter-screen
+Replaces: openoffice.org-presenter-screen
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6),
openoffice.org-impress (>= 1:3.0.0~bea300~dev300m6)
+Enhances: openoffice.org-impress
+Description: OpenOffice.org Presenter Console extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Presenter Console extension:
+ .
+ The Presenter Console for Impress is a feature that aids a presenter during a
+ slide show. It provides information on a second screen, that typically is not
+ visible to the audience. This includes
+ .
+ * a view to the currently displayed slide (for when the presenter faces the
+ audience and can not see the primary screen)
+ * a preview of the next slide or next effect
+ * the notes of the current slide
+ * the current time and/or the elapsed time
+ * navigation buttons for going to the previous/next slide
+Homepage: http://extensions.services.openoffice.org/project/presenter-screen
+
Package: openoffice.org-pdfimport
Section: misc
Priority: extra
=== modified file 'rules'
--- a/rules 2009-01-27 09:18:24 +0000
+++ b/rules 2009-01-28 15:18:01 +0000
@@ -180,10 +180,8 @@
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
- # do NOT disable. At least not until cws rptfix04. The rpt support libs are
needed
- # but the split for them is only done in that cws for DEV300. Otherwise
- # libpt *and* the oxt gets disabled with this.
- ENABLE_REPORTDESIGN=y
+ # can be reenabled after cws rptfix04
+ ENABLE_REPORTDESIGN=n
USE_SYSTEM_JFREEREPORT=y
ENABLE_MEDIAWIKI=y
USE_SYSTEM_APACHE_COMMONS=y
