------------------------------------------------------------
revno: 965
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-01-15 11:07:45 +0100
message:
OOH680_m2
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-01-14 15:21:17 +0000
+++ b/changelog 2008-01-15 10:07:45 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:2.4.0~ooh680m1-0.1pre) experimental; urgency=low
+openoffice.org (1:2.4.0~ooh680m2-0.1pre) experimental; urgency=low
- * new upstream snapshot (OOH680_m1)
+ * new upstream snapshot (OOH680_m2)
- adds https support for WebDAV (closes: #244280)
- officially adds possibility to input formulas starting with -/+
(closes: #433360)
@@ -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 (r11246)
+ - use trunk again (r11261)
- 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
@@ -34,12 +34,19 @@
- s/stlport4/stlport/
- fix ENABLE_JAVA=n build, build the help as it doesn't need Java anymore,
don't build report-builder
+ - enable the report-builder using the internally-built jars for the etch
+ backport now that this is possible
+ - temporarily build the report-builder using the internally-built jars
* debian/control.in:
- remove Provides: writer2latex from -writer, bogus (we only provide
libwriter2latex-java at all, and that with an old version). Depend
on openoffice.org-writer2latex.
- build-depend on graphicsmagick-imagemagick-compat instead of simply
graphicsmagick as ooo-builds Makefile.shared now uses "convert".
+ Suggest graphicsmagick-imagemagick-compat | imagemagick.
+ - suggest only ttf-dejavu instead of ttf-dejavu | ttf-bitstream-vera;
+ OOo now contains the DejaVu fonts
+ - add USE_SYSTEM_JFREEREPORT conditional
* debian/control.ogltrans.in:
- depend on openoffice.orgVER-core and openoffice.orgVER-impress
>> 2.4.0~m237
@@ -51,7 +58,7 @@
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Jan 2008 16:20:17 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Jan 2008 11:05:10 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-08 13:36:46 +0000
+++ b/control 2008-01-15 10:07:45 +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 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-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] , 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-runtime-depends},
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, 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,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
=== modified file 'control.in'
--- a/control.in 2008-01-08 13:36:46 +0000
+++ b/control.in 2008-01-15 10:07:45 +0000
@@ -79,7 +79,7 @@
unixodbc,
cupsys-bsd,
libsane,
- ttf-dejavu | ttf-bitstream-vera,
+ ttf-dejavu,
openoffice.org-hyphenation,
openoffice.org2-thesaurus,
libxrender1,
@@ -90,7 +90,7 @@
${java-runtime-depends},
openclipart-openoffice.org,
pstoedit,
- imagemagick,
+ graphicsmagick-imagemagick-compat | imagemagick,
libpaper-utils,
${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
=== modified file 'rules'
--- a/rules 2008-01-14 15:21:17 +0000
+++ b/rules 2008-01-15 10:07:45 +0000
@@ -148,6 +148,7 @@
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
ENABLE_REPORTDESIGN=y
+ USE_SYSTEM_JFREEREPORT=n
else
ENABLE_REPORTDESIGN=n
endif
@@ -213,7 +214,8 @@
USE_SYSTEM_BOOST=y
USE_SYSTEM_LIBWPG=n
USE_SYSTEM_HSQLDB=n
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTDESIGN=y
+ USE_SYSTEM_JFREEREPORT=n
NEONSONR=26
NEW_DPKG_SHLIBDEPS=n
DBVER=4.4
@@ -542,10 +544,12 @@
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
+ ifeq "$(USE_SYSTEM_JFREEREPORT)" "y"
REPORT_BUILDER_BUILD_DEPS += , libjcommon-java (>= 1.0.10)
[$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)], libxml-java
[$(OOO_JAVA_ARCHS)], libflute-1.3-jfree-java [$(OOO_JAVA_ARCHS)],
libjfreereport-java (>= 0.9.0-05) [$(OOO_JAVA_ARCHS)], liblayout-java
[$(OOO_JAVA_ARCHS)], libloader-java [$(OOO_JAVA_ARCHS)], libformula-java
[$(OOO_JAVA_ARCHS)], librepository-java [$(OOO_JAVA_ARCHS)], libfonts-java (>=
0.2.6) [$(OOO_JAVA_ARCHS)], libjcommon-serializer-java [$(OOO_JAVA_ARCHS)]
REPORT_BUILDER_JAR_DEPENDS := $(REPORT_BUILDER_BUILD_DEPS)
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport
+ endif
else
CONFIGURE_FLAGS += --disable-reportdesign
endif
