./packages/openofficeorg/3.0/experimental r1213: OOO300_m2
------------------------------------------------------------
revno: 1213
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-08-10 12:50:25 -0300
message:
OOO300_m2
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-08-08 21:52:02 +0000
+++ b/changelog 2008-08-10 15:50:25 +0000
@@ -1,12 +1,12 @@
-openoffice.org (1:3.0.0~ooo300m1-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~ooo300m2-0.1pre) experimental; urgency=low
- * OpenOffice.org 3.0 release branch milestone 1 (OOO300_m1)
+ * OpenOffice.org 3.0 release branch milestone 2 (OOO300_m2)
- 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.
* ooo-build:
- - update (r13495)
+ - update (r13507)
- src: get OOO300 GSIs from ftp.linux.cz
* debian/rules:
- Add SYSTEM_LUCENE conditional, disable it yet as liblucene2-java is
@@ -18,10 +18,12 @@
(closes: #491623)
- build against kde4
- update JAVA_RUNTIME_DEPENDS; add cacao-oj6-jre as alternative, bump
- java2-runtime to java5-runtime
+ java2-runtime to java5-runtime as we now stricly need a 1.5-capable
+ JRE
- don't run ldconfig in ure package, thanks lintian
- add Replaces: for above help fix, ended up in -common in beta2-1
- update get-orig-source
+ - remove xalan/xerces conditionals, add saxon ones
* debian/rules, debian/control.help.in: recommend
liblucene2-java/openoffice.org-java-common. We don't depend on it as we
don't want to make the help depend on Java (lucene is needed for "search"
@@ -52,7 +54,7 @@
openoffice.org-headless.lintian-overrides: libvclplug_svp is now in
-coreXY upstream. Follow.
- -- Rene Engelhard <rene@debian.org> Fri, 08 Aug 2008 23:47:16 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 09 Aug 2008 23:01:35 -0300
openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-08-08 21:52:02 +0000
+++ b/control 2008-08-10 15:50:25 +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-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) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , 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] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libxalan2-java (>= 2.6.0-1) [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) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , 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-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
=== modified file 'rules'
--- a/rules 2008-08-07 20:04:18 +0000
+++ b/rules 2008-08-10 15:50:25 +0000
@@ -559,9 +559,7 @@
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
GCJ_DBTOOL = gcj-dbtool-$(GCJ_VERSION)
- SYSTEM_XALAN=y
- SYSTEM_XERCES=y
- SYSTEM_XML_APIS=y
+ SYSTEM_SAXON=y
ifneq "$(ETCH_BACKPORT)" "y"
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
else
@@ -587,27 +585,10 @@
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
- ifeq "$(SYSTEM_XERCES)" "y"
- CONFIGURE_FLAGS += --with-system-xerces
- BUILD_DEPS += , libxerces2-java [$(OOO_JAVA_ARCHS)]
- JAVA_COMMON_JAVA_DEPENDS+= , libxerces2-java
- ifneq "$(ETCH_BACKPORT)" "y"
- JAVA_GCJ_DEPENDS += , libxerces2-java-gcj
- endif
- endif
- ifeq "$(SYSTEM_XALAN)" "y"
- CONFIGURE_FLAGS += --with-system-xalan
- BUILD_DEPS += , libxalan2-java (>= 2.6.0-1) [$(OOO_JAVA_ARCHS)]
- JAVA_COMMON_JAVA_DEPENDS+= , libxalan2-java (>= 2.6.0-1)
- # force using system xml-apis.jar
- SYSTEM_XML_APIS=y
- ifneq "$(ETCH_BACKPORT)" "y"
- JAVA_GCJ_DEPENDS += , libxalan2-java-gcj
- endif
- endif
- ifeq "$(SYSTEM_XML_APIS)" "y"
- CONFIGURE_FLAGS += --with-system-xml-apis
- # xml-apis.jar is already a link in xalan, see above
+ ifeq "$(SYSTEM_SAXON)" "y"
+ CONFIGURE_FLAGS += --with-system-saxon --with-saxon-jar=/usr/share/java/saxonb.jar
+ BUILD_DEPS += , libsaxonb-java [$(OOO_JAVA_ARCHS)]
+ JAVA_COMMON_JAVA_DEPENDS+= , libsaxonb-java
endif
ifeq "$(DIST)" "Debian"
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
@@ -2698,17 +2679,9 @@
ifeq "$(ENABLE_JAVA)" "y"
# symlink jars we use externally
- ifeq "$(SYSTEM_XALAN)" "y"
- ln -sf /usr/share/java/xalan2.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/xalan.jar
- endif
- ifeq "$(SYSTEM_XML_APIS)" "y"
- ln -sf /usr/share/java/xml-apis.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/xml-apis.jar
- endif
- ifeq "$(SYSTEM_XERCES)" "y"
- ln -sf /usr/share/java/xercesImpl.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/xercesImpl.jar
+ ifeq "$(SYSTEM_SAXON)" "y"
+ ln -sf /usr/share/java/saxonb.jar \
+ $(PKGDIR)-java-common/$(OODIR)/program/classes/saxon9.jar
endif
ifeq "$(USE_SYSTEM_BSH)" "y"
ln -sf /usr/share/java/bsh.jar \
@@ -3260,7 +3233,6 @@
wget http://download.go-oo.org/$(MWS)/$(TAG)-writer.tar.bz2 && \
wget http://download.go-oo.org/$(MWS)/$(TAG)-swext.tar.bz2 && \
tar xfvj $(TAG)-libs_extern_sys.tar.bz2 && \
- rm -rf $(TAG)-libs_extern_sys/xalan && \
for i in da_DK en_GB nl_NL ru_RU; do \
rm $(TAG)-libs_extern_sys/dictionaries/$$i/hyph_$${i}.dic; \
done && \
Reply to: