r942 ./packages/openofficeorg/2.3/experimental: - update ooo-build
------------------------------------------------------------
revno: 942
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2007-11-09 15:47:54 +0100
message:
- update ooo-build
- Adapt for STLport5 patchset not applied anymore. Remove STLport5
support.
- Build --without-stlport4 (closes: #294105). Keep STLport4 for i386
now due to compatibility with upstream OOo and binary-only stuff
- fix -dbg suggests on libstdc++6 (we want libstdc++6-4.x-dbg)
- depend/recommend (on) java-gcj-compat instead of gij | java-gcj-compat
as "gij" alone doesn't seem to be sufficient to make OOo know there's
a "Free Software Foundation" JDK (closes: #440899)
- s/j2re1.4/sun-java5-jre/
modified:
changelog
control
control.gcj.in
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-11-09 08:49:58 +0000
+++ b/changelog 2007-11-09 14:47:54 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.3.0-4.5pre) experimental; urgency=low
* ooo-build
- - update (r10762)
+ - update (r10791)
- jvmfwk-detect-removed-java.diff: try autodetection if it is allowed
and the current JRE has been removed (hopefully closes: #416242,
please reopen if not)
@@ -18,11 +18,21 @@
- use system jfreereport libs
- reenable ar langpack
- add libfontconfig1-dbg to DBG_DBG_SUGGESTS
+ - Adapt for STLport5 patchset not applied anymore. Remove STLport5
+ support.
+ - Build --without-stlport4 (closes: #294105). Keep STLport4 for i386
+ now due to compatibility with upstream OOo and binary-only stuff
+ - fix -dbg suggests on libstdc++6 (we want libstdc++6-4.x-dbg)
* debian/control.in:
- XS-Vcs-* -> Vcs-*
- add a conflict against libicu38 (= 3.8~d01-1)
+ * debian/control.{,gcj}.in:
+ - depend/recommend (on) java-gcj-compat instead of gij | java-gcj-compat
+ as "gij" alone doesn't seem to be sufficient to make OOo know there's
+ a "Free Software Foundation" JDK (closes: #440899)
+ - s/j2re1.4/sun-java5-jre/
- -- Rene Engelhard <rene@debian.org> Fri, 09 Nov 2007 09:43:52 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 09 Nov 2007 15:47:13 +0100
openoffice.org (1:2.3.0-4) experimental; urgency=medium
=== modified file 'control'
--- a/control 2007-11-07 15:00:43 +0000
+++ b/control 2007-11-09 14:47:54 +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) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , 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 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.8-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , 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 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.8-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc 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-4) [amd64], libicu36-dev (= 3.6-5) [amd64], libicu36-dev (= 3.6-6) [amd64], libicu-dev (= 3.8~d01-1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc 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 | j2re1.4 | 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-gcj-compat | sun-java5-jre | java2-runtime, 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
@@ -55,7 +55,7 @@
* iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser:
Mozilla profile with Certificates needed for XML Security...
* msttcorefonts: Installs standard MS truetype fonts (contrib)
- * java-gcj-compat/gij-4.1 | j2re1.4 (non-free) | java2-runtime
+ * java-gcj-compat | sun-java5-jre | java2-runtime
Java Runtime Environment for use with OpenOffice.org
* pstoedit / imagemagick: helper tools for EPS thumbnails
* gstreamer0.10-plugins-*: GStreamer plugins for use with OOos media backend
@@ -142,7 +142,7 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, gij | java-gcj-compat | j2re1.4 | java2-runtime ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-java-common (<= 2.2.0-4)
Provides: openoffice.org2-writer, writer2latex
@@ -203,7 +203,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij | java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, java-gcj-compat | sun-java5-jre | java2-runtime, ${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)
@@ -428,7 +428,7 @@
Package: openoffice.org-filter-mobiledev
Section: misc
Architecture: all
-Depends: gij | java-gcj-compat | j2re1.4 | java2-runtime, ${java-common-depends}
+Depends: java-gcj-compat | sun-java5-jre | java2-runtime, ${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
@@ -2861,7 +2861,7 @@
Package: openoffice.org-gcj
Section: libs
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: ${shlibs:Depends}, gij | java-gcj-compat, openoffice.org-core (= ${Source-Version}), openoffice.org-java-common (= ${source:Version}), ${java-gcj-depends}
+Depends: ${shlibs:Depends}, java-gcj-compat, openoffice.org-core (= ${Source-Version}), openoffice.org-java-common (= ${source:Version}), ${java-gcj-depends}
Enhances: openoffice.org-writer, openoffice.org-base
Description: OpenOffice.orgs Java libraries (native for use with GIJ)
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.gcj.in'
--- a/control.gcj.in 2007-08-06 15:28:57 +0000
+++ b/control.gcj.in 2007-11-09 14:47:54 +0000
@@ -2,7 +2,7 @@
Section: libs
Architecture: %OOO_ARCHS%
Depends: ${shlibs:Depends},
- gij | java-gcj-compat,
+ java-gcj-compat,
openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-java-common (= ${source:Version}),
${java-gcj-depends}
=== modified file 'control.in'
--- a/control.in 2007-11-06 15:53:45 +0000
+++ b/control.in 2007-11-09 14:47:54 +0000
@@ -86,7 +86,7 @@
msttcorefonts,
openoffice.orgVER-gnome | openoffice.orgVER-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
- java-gcj-compat | j2re1.4 | java2-runtime,
+ java-gcj-compat | sun-java5-jre | java2-runtime,
openclipart-openoffice.org,
pstoedit,
imagemagick,
@@ -133,7 +133,7 @@
* iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser:
Mozilla profile with Certificates needed for XML Security...
* msttcorefonts: Installs standard MS truetype fonts (contrib)
- * java-gcj-compat/gij-4.1 | j2re1.4 (non-free) | java2-runtime
+ * java-gcj-compat | sun-java5-jre | java2-runtime
Java Runtime Environment for use with OpenOffice.org
* pstoedit / imagemagick: helper tools for EPS thumbnails
* gstreamer0.10-plugins-*: GStreamer plugins for use with OOos media backend
@@ -314,7 +314,7 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, gij | java-gcj-compat | j2re1.4 | java2-runtime ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
@@ -410,7 +410,7 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
- gij | java-gcj-compat | j2re1.4 | java2-runtime,
+ java-gcj-compat | sun-java5-jre | java2-runtime,
${base-hsqldb-depends},
${java-common-depends}
Suggests: unixodbc,
@@ -674,7 +674,7 @@
Package: openoffice.orgVER-filter-mobiledev
Section: misc
Architecture: all
-Depends: gij | java-gcj-compat | j2re1.4 | java2-runtime,
+Depends: java-gcj-compat | sun-java5-jre | java2-runtime,
${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 2007-11-09 08:49:58 +0000
+++ b/rules 2007-11-09 14:47:54 +0000
@@ -97,8 +97,7 @@
LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
USE_AGG=n
SYSTEM_AGG=n
-USE_STLPORT=y
-USE_STLPORT5=n
+USE_STLPORT=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=y
USE_SYSTEM_VIGRA=y
@@ -186,7 +185,6 @@
# Debian Etch backport
ifeq "$(ETCH_BACKPORT)" "y"
PATCHSET=$(DIST)Etch
- USE_STLPORT5=n
USE_SYSTEM_LIBWPS=n
SYSTEM_ALTLINUXHYPH=n
ENABLE_MONO=n
@@ -207,6 +205,11 @@
#############
# Architecture-specific changes
+OOO_STLPORT_ARCHS= i386
+ifeq "$(ARCH)" "i386"
+ USE_STLPORT=y
+endif
+
OOO_ARCHS= i386 powerpc sparc
ifeq "$(BUILD_AMD64)" "y"
OOO_ARCHS += amd64
@@ -295,7 +298,7 @@
else
# -g gives a far too big deb (>400M, ca. 1GB I-S)
SMALL_SYMBOLS = y
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head -n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
else
@@ -499,20 +502,14 @@
endif
ifneq "$(USE_STLPORT)" "y"
- CONFIGURE_FLAGS += --without-stlport
+ CONFIGURE_FLAGS += --without-stlport4
+ DEV_STL_DEPENDS=, libstdc++6-$(shell g++ --version | head -n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)
else
ifeq "$(USE_SYSTEM_STLPORT)" "y"
- ifeq "$(USE_STLPORT5)" "y"
- LIBSTLPORT_MINVER= (>= 5.0.99rc2-5)
- BUILD_DEPS += , libstlport5.1-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
- DEV_STL_DEPENDS=, libstlport5.1-dev $(LIBSTLPORT_MINVER)
- DBG_DBG_SUGGESTS+= , libstlport5.1-dbg
- else
LIBSTLPORT_MINVER= (>= 4.6.2-3)
- BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_ARCHS)]
- DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER)
- endif
- CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
+ BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
+ DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
+ CONFIGURE_FLAGS+= --with-stlport4=$(CURDIR)/stlport
endif
endif
@@ -1197,13 +1194,15 @@
endif
endif
-ifeq "$(USE_SYSTEM_STLPORT)" "y"
+ifeq "$(USE_STLPORT)" "y"
+ ifeq "$(USE_SYSTEM_STLPORT)" "y"
# stlport home
if [ ! -d stlport ]; then \
mkdir -p stlport; \
ln -sf /usr/include/stlport stlport/stlport; \
ln -sf /usr/lib stlport/lib; \
fi
+ endif
endif
ifneq "$(BUILD_ONLY_EN_US)" "y"
@@ -1873,10 +1872,6 @@
# for the SDK includes
cd $(PKGDIR)-dev/usr/include/openoffice$(VER) && \
rm -rf stl && ln -s /usr/include/stlport stl
- ifeq "$(USE_STLPORT5)" "y"
- perl -pi -e "s/STORELIB=-lstore/STORELIB=-lstore\nSTLPORT_VER=500/" \
- $(PKGDIR)-dev/$(OODIR)/sdk/settings/settings.mk
- endif
endif
ifeq "$(ENABLE_JAVA)" "y"
# move SDK Java stuff into /usr/share/java/openoffice
@@ -1952,10 +1947,8 @@
endif
ifeq "$(USE_SYSTEM_STLPORT)" "y"
rm -f $(PKGDIR)-core/$(OODIR)/program/libstlport*
- ifneq "$(USE_STLPORT5)" "y"
ln -s `readlink /usr/lib/libstlport_gcc.so` \
debian/openoffice.org$(VER)-core/$(OODIR)/program/libstlport_gcc.so
- endif
endif
ifeq "$(ENABLE_JAVA)" "y"
Reply to: