------------------------------------------------------------
revno: 963
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-01-08 14:36:46 +0100
message:
fix without-java build; update ooo-build; no ogltrans for slow(?) arm(el) and
mips(el)
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-01-07 10:46:42 +0000
+++ b/changelog 2008-01-08 13:36:46 +0000
@@ -8,7 +8,7 @@
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
* ooo-build:
- - use trunk again (r11200)
+ - use trunk again (r11216)
- use new SRC680 GSIs from ftp.linux.cz
* debian/rules, debian/scripts/vars.mips{,el}, debian/scripts/vars.arm{,el}:
(re)add conditionals and vars for new mips(el)/armel and revived arm
@@ -32,6 +32,8 @@
- fix BUILD_BINFILTERS conditional to work
- add PACKAGE_WRITER2LATEX / USE_EXTERNAL_WRITER2LATEX conditionals
- s/stlport4/stlport/
+ - fix ENABLE_JAVA=n build, build the help as it doesn't need Java anymore,
+ don't build report-builder
* debian/control.in:
- remove Provides: writer2latex from -writer, bogus (we only provide
libwriter2latex-java at all, and that with an old version). Depend
@@ -45,8 +47,11 @@
- remove, ooo-build makes this pre-registered
* debian/openoffice.org-{ogltrans,base-core}.overrides.lintian:
- override RPATH warning
+ * merge from Ubuntu:
+ - debian/rules:
+ + Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 07 Jan 2008 11:40:53 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 08 Jan 2008 14:29:27 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-07 10:46:42 +0000
+++ b/control 2008-01-08 13:36: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) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], flex [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], zip [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], autoconf [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], sharutils [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64], pkg-config [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfreetype6-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], libx11-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], libsm-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], libxt-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xsltproc [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], graphicsmagick-imagemagick-compat
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], netpbm [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], fdupes [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], xml-core [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dpkg-dev (>=
1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libgl1-mesa-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libglu1-mesa-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libdb4.5-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc
mips mipsel armel amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel
armel amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc mips mipsel
armel amd64 ppc64] , libxerces2-java [i386 powerpc sparc mips mipsel armel
amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel
armel amd64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64]
, libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64
ppc64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc mips mipsel armel amd64
ppc64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] ,
libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libnss3-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dmake (>= 1:4.11)
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , mono-mcs (>= 1.2.3)
[i386 sparc arm armel amd64], mono-gmcs (>= 1.2.3) [i386 sparc arm armel
amd64], libmono-dev (>= 1.2.3) [i386 sparc arm armel amd64], mono-utils (>=
1.2.3) [i386 sparc arm armel amd64], cli-common-dev (>= 0.4.4) [i386 sparc arm
armel amd64], mono-1.0-devel [i386 sparc arm armel amd64], mono-2.0-devel [i386
sparc arm armel amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
, libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libicu-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libxslt1-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libcairo2-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libhsqldb-java (>=
1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , bsh (>=
2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
, libsuitesparse-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel amd64
ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], flex [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], zip [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], autoconf [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64], sharutils [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64], pkg-config [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfreetype6-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64], libx11-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], libsm-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], libxt-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsndfile1-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xsltproc [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], graphicsmagick-imagemagick-compat
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64], netpbm [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64], fdupes [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64], xml-core [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dpkg-dev (>=
1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64], libglu1-mesa-dev [i386
powerpc sparc amd64 ppc64] , libcurl4-openssl-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libssl-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4)
[i386 powerpc sparc mips mipsel armel amd64 ppc64] , ant (>= 1.6.5) [i386
powerpc sparc mips mipsel armel amd64 ppc64] , libxt-java (>= 0.20050823) [i386
powerpc sparc mips mipsel armel amd64 ppc64] , libxerces2-java [i386 powerpc
sparc mips mipsel armel amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386
powerpc sparc mips mipsel armel amd64 ppc64] , mingw32 [i386 powerpc sparc mips
mipsel armel amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc
mips mipsel armel amd64 ppc64], libsac-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64], libxml-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc mips mipsel armel
amd64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64
ppc64], libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] ,
libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libnss3-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dmake (>= 1:4.11)
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , mono-mcs (>= 1.2.3)
[i386 sparc arm armel amd64], mono-gmcs (>= 1.2.3) [i386 sparc arm armel
amd64], libmono-dev (>= 1.2.3) [i386 sparc arm armel amd64], mono-utils (>=
1.2.3) [i386 sparc arm armel amd64], cli-common-dev (>= 0.4.4) [i386 sparc arm
armel amd64], mono-1.0-devel [i386 sparc arm armel amd64], mono-2.0-devel [i386
sparc arm armel amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
, libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libicu-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libxslt1-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libcairo2-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386
powerpc sparc mips mipsel arm armel amd64 ppc64] , libhsqldb-java (>=
1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , bsh (>=
2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64],
lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
, libsuitesparse-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] ,
libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel amd64
ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64]
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, libicu36-dev (<=
3.6-7), libicu-dev (<= 3.8-1), 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)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -14,7 +14,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-officebean,
${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
-Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd,
libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation,
openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts,
openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, java-gcj-compat | sun-java5-jre
| java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick,
libpaper-utils, ${gstreamer-plugins-suggests}
+Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd,
libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation,
openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts,
openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -143,7 +143,7 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}, ${writer-w2l-dep}
-Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre |
java2-runtime ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${Source-Version}), openoffice.org-java-common (<= 2.2.0-4)
Provides: openoffice.org2-writer
@@ -219,7 +219,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, java-gcj-compat | sun-java5-jre |
java2-runtime, ${base-hsqldb-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends},
${base-hsqldb-depends}, ${java-common-depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj,
openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<<
1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<<
${Source-Version}), openoffice.org-common (= 2.0.4-4)
@@ -411,7 +411,7 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc mips mipsel armel amd64 ppc64
Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin,
${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${java-runtime-depends}, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -444,7 +444,7 @@
Package: openoffice.org-filter-mobiledev
Section: misc
Architecture: all
-Depends: java-gcj-compat | sun-java5-jre | java2-runtime,
${java-common-depends}
+Depends: ${java-runtime-depends}, ${java-common-depends}
Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178),
openoffice.org-common (<< 2.0.3+2.0.4m178)
Description: Mobile Devices Filters for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3014,7 +3014,7 @@
Package: openoffice.org-ogltrans
Section: graphics
Priority: extra
-Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.4.0~m237),
openoffice.org-impress (>> 1:2.4.0~m237)
Enhances: openoffice.org-impress
Description: OpenOffice.org "OpenGL rendered transitions" extension
=== modified file 'control.in'
--- a/control.in 2008-01-06 00:09:40 +0000
+++ b/control.in 2008-01-08 13:36:46 +0000
@@ -87,7 +87,7 @@
msttcorefonts,
openoffice.orgVER-gnome | openoffice.orgVER-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser |
mozilla-browser,
- java-gcj-compat | sun-java5-jre | java2-runtime,
+ ${java-runtime-depends},
openclipart-openoffice.org,
pstoedit,
imagemagick,
@@ -317,7 +317,7 @@
${shlibs:Depends},
${writer-pyuno-dep},
${writer-w2l-dep}
-Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre |
java2-runtime ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
@@ -429,7 +429,7 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
- java-gcj-compat | sun-java5-jre | java2-runtime,
+ ${java-runtime-depends},
${base-hsqldb-depends},
${java-common-depends}
Suggests: unixodbc,
@@ -654,7 +654,7 @@
Section: misc
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
- java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin,
+ ${java-runtime-depends},
${java-common-depends}
Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1),
openoffice.org2-officebean
Provides: openoffice.org2-officebean
@@ -693,7 +693,7 @@
Package: openoffice.orgVER-filter-mobiledev
Section: misc
Architecture: all
-Depends: java-gcj-compat | sun-java5-jre | java2-runtime,
+Depends: ${java-runtime-depends},
${java-common-depends}
Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178),
openoffice.org-common (<< 2.0.3+2.0.4m178)
Description: Mobile Devices Filters for OpenOffice.org
=== modified file 'rules'
--- a/rules 2008-01-07 10:46:42 +0000
+++ b/rules 2008-01-08 13:36:46 +0000
@@ -145,7 +145,11 @@
ENABLE_OPENGL=y
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
-ENABLE_REPORTDESIGN=y
+ifeq "$(ENABLE_JAVA)" "y"
+ ENABLE_REPORTDESIGN=y
+else
+ ENABLE_REPORTDESIGN=n
+endif
PACKAGE_WRITER2LATEX=n
USE_EXTERNAL_WRITER2LATEX=y
ENABLE_SDEXT=y
@@ -229,7 +233,17 @@
OOO_STLPORT_ARCHS=$(OOO_ARCHS)
endif
-OOO_OGLTRANS_ARCHS= $(OOO_ARCHS)
+# doesn't make that much sense on arm(el) and mips(el), does it? :)
+OOO_OGLTRANS_ARCHS= i386 powerpc sparc
+ifeq "$(BUILD_AMD64)" "y"
+ OOO_OGLTRANS_ARCHS+= amd64
+endif
+ifeq "$(BUILD_PPC64)" "y"
+ OOO_OGLTRANS_ARCHS+= ppc64
+endif
+ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
+ ENABLE_OGLTRANS=n
+endif
OOO_ARCHS= i386 powerpc sparc mips mipsel arm armel
ifeq "$(BUILD_AMD64)" "y"
@@ -474,6 +488,14 @@
GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-awt
endif
endif
+ JAVA_RUNTIME_DEPENDS = java-gcj-compat
+ ifneq (,$(GCJ_JAWT_DEPENDS))
+ JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
+ endif
+ ifneq (,$(filter $(ARCH), amd64 i386))
+ JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
+ endif
+ JAVA_RUNTIME_DEPENDS += | java2-runtime
ifeq "$(ETCH_BACKPORT)" "y"
GCJ_JAWT_DIR=/usr/lib/gcj-4.1
else
@@ -524,7 +546,6 @@
else
CONFIGURE_FLAGS += --without-java
DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean
-Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
- HELPISOS=
endif
ifneq "$(MOZILLA)" ""
@@ -1167,9 +1188,11 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.ogltrans.in
endif
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_REPORTDESIGN)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.reportdesign.in
+ endif
endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
@@ -2172,10 +2195,6 @@
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
done
- # install scsolvers ChangeLog
- install -D -m644 $(SOURCE_TREE)/scsolver/ChangeLog \
-
$(PKGDIR)-calc/usr/share/doc/openoffice.org$(VER)-calc/changelog.scsolver
-
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# move rpt stuff into -report-builder
rm -rf $(PKGDIR)-report-builder
@@ -2209,7 +2228,9 @@
mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/OGLTrans.uno.so \
$(PKGDIR)-ogltrans/$(OODIR)/program
- rm -f
+ mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/share/config/soffice.cfg/simpress/
+ mv
$(PKGDIR)-impress/$(OODIR)/share/config/soffice.cfg/simpress/transitions-ogl.xml
\
+
$(PKGDIR)-ogltrans/$(OODIR)/share/config/soffice.cfg/simpress/transitions-ogl.xml
endif
for i in $(ARCH_DEP_PACKAGES); do \
@@ -2744,10 +2765,12 @@
-l$(PKGDIR)-core/$(OODIR)/program \
-l$(PKGDIR)-base/$(OODIR)/program \
$(SHLIBS_OVERRIDE)
+ifeq "$(ENABLE_JAVA)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -popenoffice.org$(VER)-officebean \
-l$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
+endif
# this is in an extension (.zip), so dh_shlibdeps doesn't get it. We
need to do
# it manually.
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
@@ -2765,7 +2788,7 @@
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
- dh_gencontrol -s -Nure -Nure-dbg \
+ dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg \
-Nopenoffice.org$(VER)-report-builder \
-Nopenoffice.org$(VER)-presentation-minimizer \
-Nopenoffice.org$(VER)-sdbc-postgresql -- \
@@ -2776,7 +2799,7 @@
-V'writer-w2l-dep=$(WRITER_W2L_DEP)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
- -V'gcj-jawt-depends=$(GCJ_JAWT_DEPENDS)' \
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
@@ -2799,7 +2822,7 @@
-v$(shell grep -A 1 "PRODUCTNAME URE"
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print
$$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_md5sums -s
- dh_builddeb -s $(BUILDDEB_OPTIONS)
+ dh_builddeb -s $(DEBHELPER_OPTIONS)
touch $@
@@ -2872,7 +2895,7 @@
dh_installxmlcatalogs -i
dh_compress -X.py -X.mk -X.sxd
dh_installdeb -i
- dh_gencontrol -i -Nlibpcvslib-perl -- \
+ dh_gencontrol -i $(DEBHELPER_OPTIONS) -Nlibpcvslib-perl -- \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
@@ -2883,11 +2906,11 @@
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(PACKAGE_PCVSLIB)" "y"
- dh_gencontrol -i -plibpcvslib-perl -- \
+ dh_gencontrol -plibpcvslib-perl -- \
-v0.02+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_md5sums -i
- dh_builddeb -i $(BUILDDEB_OPTIONS)
+ dh_builddeb -i $(DEBHELPER_OPTIONS)
touch $@
