------------------------------------------------------------
revno: 1261
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-09-21 11:44:31 +0200
message:
reenable report-builder; fix dependency
modified:
changelog
control
control.reportdesign.in
rules
=== modified file 'changelog'
--- a/changelog 2008-09-18 12:41:39 +0000
+++ b/changelog 2008-09-21 09:44:31 +0000
@@ -6,7 +6,7 @@
- makes -report-builder depend on 3.0 *exactly*.
* ooo-build:
- use ooo-build-3-0 branch
- - update (r13933)
+ - update (r13975)
- really fixes ppc/openjdk build
- math-draw-generic-name.diff: add GenericName for
Draw (closes: #498922) and Math (closes: #498924)
@@ -18,8 +18,6 @@
- reenable hu
- HELP_L10N_VIRTUAL_VERSION:=3.0
- various conditional updates for new extension configure defaults
- - temporarily disable report-builder as reportbuilder module is not
- available in the tarballs yet...
- --with-java-target-version=1.5 for builds with openjdk/cacao-oj6
- also complain in binary-indep when Mono is disabled
* debian/control.reportdesign.in:
@@ -30,7 +28,7 @@
* debian/openoffice.org-presentation-minimizer.preinst.in: oops, fix version
comparison
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 18 Sep 2008 14:39:48 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 20 Sep 2008 14:12:16 +0200
openoffice.org (1:3.0.0~ooo300m3-3) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-09-06 14:15:06 +0000
+++ b/control 2008-09-21 09:44:31 +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), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , gij [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:3.4.3-2) ,
kdepimlibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , gij [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:3.4.3-2) ,
kdepimlibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10)
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,
nvidia-glx-legacy-dev, 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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -3164,6 +3164,37 @@
articles with OpenOffice.org
Homepage: http://extensions.services.openoffice.org/project/wikipublisher
+Package: openoffice.org-report-builder
+Section: misc
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>=
${base-version}), openoffice.org-java-common (>= ${base-version})
+Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Replaces: openoffice.org-reportdesigner
+Provides: openoffice.org-reportdesigner
+Enhances: openoffice.org-base
+Description: OpenOffice.org Report Builder extension
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the report builder extension:
+ "Create with the Sun Report Builder stylish, smart-looking database reports.
+ The flexible report editor can define group and page headers as well as
+ group and page footers and even calculation fields are available to
+ accomplish complex database reports."
+Homepage: http://extensions.services.openoffice.org/project/reportdesign
+
+Package: openoffice.org-report-builder-bin
+Section: misc
+Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-base (>= 2.3.0~src680m225)
+Replaces: openoffice.org-report-builder
+Description: OpenOffice.org Report Builder extension - support libraries
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains some architecture-dependent support libraries
+ (librpt*.so) for the report builder extension.
+
Package: openoffice.org-presentation-minimizer
Section: misc
Priority: optional
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-09-04 14:26:25 +0000
+++ b/control.reportdesign.in 2008-09-21 09:44:31 +0000
@@ -2,7 +2,7 @@
Section: misc
Architecture: all
Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin
(>= ${base-version}), openoffice.org-java-common (>= ${base-version})
-Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder (>=
${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
Enhances: openoffice.orgVER-base
=== modified file 'rules'
--- a/rules 2008-09-18 14:44:40 +0000
+++ b/rules 2008-09-21 09:44:31 +0000
@@ -166,7 +166,7 @@
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
- ENABLE_REPORTDESIGN=n
+ ENABLE_REPORTDESIGN=y
USE_SYSTEM_JFREEREPORT=y
ENABLE_MEDIAWIKI=y
USE_SYSTEM_APACHE_COMMONS=y
@@ -632,9 +632,8 @@
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport
--with-jcommon-jar=/usr/share/java/jcommon.jar
--with-libxml-jar=/usr/share/java/libxml.jar
--with-flute-jar=/usr/share/java/flute-1.3-jfree.jar
--with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar
--with-liblayout-jar=/usr/share/java/liblayout.jar
--with-libloader-jar=/usr/share/java/libloader.jar
--with-libformula-jar=/usr/share/java/libformula.jar
--with-librepository-jar=/usr/share/java/librepository.jar
--with-libfonts-jar=/usr/share/java/libfonts.jar
--with-jcommon-serializer-jar=/usr/share/java/jcommon-serializer.jar
ADDITIONAL_SECTIONS += DebianBaseSystemJFreeReport
+ CONFIGURE_FLAGS += --enable-report-builder
endif
- else
- CONFIGURE_FLAGS += --disable-report-builder
endif
OOO_OFFICEBEAN_DEP = openoffice.org$(VER)-officebean
else
@@ -3265,6 +3264,7 @@
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
+ -V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
