------------------------------------------------------------
revno: 762
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2007-06-28 11:42:00 +0200
message:
add (Build-)Conflicts against broken libcairo2 and remove hack, install
xmerge javadoc
added:
openoffice.org-dev-doc.doc-base.xmerge-javadoc
modified:
changelog
control
control.in
control.sdk.in
rules
=== added file 'openoffice.org-dev-doc.doc-base.xmerge-javadoc'
--- a/openoffice.org-dev-doc.doc-base.xmerge-javadoc 1970-01-01 00:00:00
+0000
+++ b/openoffice.org-dev-doc.doc-base.xmerge-javadoc 2007-06-28 09:42:00
+0000
@@ -0,0 +1,7 @@
+Document: xmerge-javadoc
+Title: OpenOffice.org XMerge API Javadoc
+Author: Sun Microsystems, Inc.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/openoffice.org-dev/docs/xmerge/index.html
=== modified file 'changelog'
--- a/changelog 2007-06-27 14:57:27 +0000
+++ b/changelog 2007-06-28 09:42:00 +0000
@@ -13,11 +13,11 @@
run smoketest per default
- remove some ifeq "$(ETCH_BACKPORT)" "y" conditionals, one to go...
- make -gcj depend on bsh-gcj
- - add export SAL_IGNOREXERRORS=1 to soffice to hack around (hiding)
- b0rkage with cairo 1.4.8 (closes: #430135), thanks Caolan McNamara
- for the tip.
+ - add (Build-)Conflicts against libcairo2 (= 1.4.8-1) (closes: #430135),
+ cairo 1.4.10 is fixed
+ - install xmerge javadoc into -dev-doc
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 27 Jun 2007 16:53:00 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 28 Jun 2007 11:41:38 +0200
openoffice.org (2.2.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-06-26 15:48:53 +0000
+++ b/control 2007-06-28 09:42:00 +0000
@@ -4,6 +4,7 @@
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) [i386 powerpc sparc
amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc
amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc
amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64],
sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64],
xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc
amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc],
zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc
amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc
amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc
amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc
amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc
sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64],
libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386
powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev
[i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64],
libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc
amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc
sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386
powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386
powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386
powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64],
x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386
powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] ,
libcurl3-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386
powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386
powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64],
xbase-clients [i386 powerpc sparc amd64], xfonts-base [i386 powerpc sparc
amd64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>=
1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc
sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>=
2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64]
, mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64],
libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64],
mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64],
mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] ,
libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev
(>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport5.1-dev (>= 5.0.99rc2-5)
[i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc
sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386
powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64],
libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2)
[i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc
amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>=
5.5.0.10-2) [i386 powerpc sparc amd64] , libufsparse-dev [i386 powerpc sparc
amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev
[i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
+Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -99,7 +100,7 @@
Architecture: i386 powerpc sparc amd64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, debconf (>= 1.2.0) | debconf-2.0,
${mozilla-nss-depends}
Recommends: nfs-common
-Conflicts: openoffice.org-thesaurus, ooqstart-gnome, oooqs-kde,
openoffice.org-unbundled, openoffice.org-l10n-1.9.108,
openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121,
openoffice.org-1.9.125, oooqs-kde (<< 2.0.3-7), ooqstart-gnome (<= 0.8.3-8),
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version})
+Conflicts: openoffice.org-thesaurus, ooqstart-gnome, oooqs-kde,
openoffice.org-unbundled, openoffice.org-l10n-1.9.108,
openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121,
openoffice.org-1.9.125, oooqs-kde (<< 2.0.3-7), ooqstart-gnome (<= 0.8.3-8),
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
2.0.3+2.0.4m180), openoffice.org-calc (<< 2.2.1~oof680m15-2)
Description: OpenOffice.org office suite architecture dependent files
@@ -3155,6 +3156,8 @@
* IDL reference
* C++/Java/Basic examples
.
+ It also contains the Javadoc of the XMerge API.
+ .
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
=== modified file 'control.in'
--- a/control.in 2007-06-06 07:41:25 +0000
+++ b/control.in 2007-06-28 09:42:00 +0000
@@ -49,6 +49,7 @@
unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
libdb4.4-dev [%OOO_ARCHS%]
%BUILD_DEPS%
+Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -221,7 +222,8 @@
openoffice.orgVER-evolution (<< ${Source-Version}),
openoffice.orgVER-filter-so52 (<< ${Source-Version}),
openoffice.orgVER-officebean (<< ${Source-Version}),
- openoffice.orgVER-dev (<< ${Source-Version})
+ openoffice.orgVER-dev (<< ${Source-Version}),
+ libcairo2 (= 1.4.8-1)
Provides: openoffice.orgVER-bundled,
openoffice.org2-core,
openoffice.org-java,
=== modified file 'control.sdk.in'
--- a/control.sdk.in 2007-01-21 23:49:22 +0000
+++ b/control.sdk.in 2007-06-28 09:42:00 +0000
@@ -50,6 +50,8 @@
* IDL reference
* C++/Java/Basic examples
.
+ It also contains the Javadoc of the XMerge API.
+ .
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
=== modified file 'rules'
--- a/rules 2007-06-27 14:57:27 +0000
+++ b/rules 2007-06-28 09:42:00 +0000
@@ -1161,7 +1161,6 @@
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
export TEMP=$(CURDIR)/oosmoketest; \
- export SAL_IGNOREXERRORS=1; \
if [ -n "$$DISPLAY" ]; then \
../solenv/bin/build.pl; \
else \
@@ -2038,6 +2037,14 @@
for i in `find . -type f | xargs`; do \
perl -pi -e
's,file:$(CURDIR)/ooo-build/build/(current|$(TAG))/odk/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g'
$$i; \
done
+
+ifeq "$(ENABLE_JAVA)" "y"
+ rm -rf $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge
+ mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge
+ # install XMerge SDK javadoc
+ cp -r $(BUILD_TREE)/xmerge/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/class/javadoc/* \
+ $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev/docs/xmerge
+endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -2334,9 +2341,6 @@
perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OODIR)/program/soffice
endif
- # hack around breakage with cairo 1.4.8
- perl -pi -e 's/|\# execute soffice binary|\# hack for
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=243811, Debian
#430135\nSAL_IGNOREXERRORS=1\nexport SAL_IGNOREXERRORS\n\n\# execute soffice
binary|' $(PKGDIR)-common/$(OODIR)/program/soffice
-
for i in $(ARCH_INDEP_DEP_PACKAGES); do \
install -D -m644 debian/presubj \
debian/$$i/usr/share/bug/$$i/presubj; \
