------------------------------------------------------------
revno: 937
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-11-06 16:53:45 +0100
message:
use system jfreereport libs
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-11-06 12:52:34 +0000
+++ b/changelog 2007-11-06 15:53:45 +0000
@@ -10,11 +10,12 @@
java-gcj-compat-dev for this
- fix logic error preventing mozilla-openoffice.org having
real content, oops (closes: #449528)
+ - use system jfreereport libs
* debian/control.in:
- XS-Vcs-* -> Vcs-*
- add a conflict against libicu38 (= 3.8~d01-1)
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 06 Nov 2007 13:45:33 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 06 Nov 2007 16:52:46 +0100
openoffice.org (1:2.3.0-4) experimental; urgency=medium
=== modified file 'control'
--- a/control 2007-11-04 15:48:52 +0000
+++ b/control 2007-11-06 15:53:45 +0000
@@ -3,7 +3,7 @@
Priority: optional
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 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] ,
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 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-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
@@ -471,7 +471,7 @@
Section: misc
Priority: optional
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-base (>= 2.3.0~src680m225),
openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-java-common (>=
1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base
(>= 2.3.0~src680m225), openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'control.in'
--- a/control.in 2007-11-04 15:48:52 +0000
+++ b/control.in 2007-11-06 15:53:45 +0000
@@ -718,7 +718,7 @@
Section: misc
Priority: optional
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-base (>= 2.3.0~src680m225),
openoffice.orgVER-core (>> 1:2.3.0~oog680m1), openoffice.org-java-common (>=
1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, ${report-builder-jar-depends},
openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-core (>>
1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'rules'
--- a/rules 2007-11-06 12:52:34 +0000
+++ b/rules 2007-11-06 15:53:45 +0000
@@ -441,6 +441,10 @@
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
+ # report-builder
+ 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)
else
CONFIGURE_FLAGS += --without-java
DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean
-Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
@@ -2608,6 +2612,7 @@
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
+ -V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk |
cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+OOo`echo $(BINARY_VERSION) | cut -d:
-f2`
