------------------------------------------------------------
revno: 977
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-12-10 15:07:42 +0100
message:
update ooo-build; add ENABLE_REPORTDESIGN conditional, disable it for etch;
remove libsvg conditional; rm -f debian/scripts/aotcompile.py*; -l-base//program
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-12-06 21:38:00 +0000
+++ b/changelog 2007-12-10 14:07:42 +0000
@@ -1,11 +1,20 @@
openoffice.org (1:2.3.1-1.2pre) unstable; urgency=low
+ * ooo-build:
+ - update (r11063)
+ + buildfix-sal-system.h-no-asm-sigcontext.h.diff: don't include
+ <asm/sigcontext.h>, thanks Aurelien Jarno
* debian/rules:
- - fix PYTHONPATH setting
+ - fix PYTHONPATH setting and remove aotcompile.pyc in clean, too...
+ - we also need -l$(PKGDIR)-base/$(OODIR)/program for dh_shlibdeps
+ as report-builder links against libdbu
+ - don't build the report builder for etch backports
+ - remove libsvg conditional; SVGImport is incomplete and now disabled
+ in ooo-build
* debian/control.in:
- add missing epoch to -base-core's Replaces: (closes: #454625)
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 06 Dec 2007 22:33:43 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 10 Dec 2007 15:01:38 +0100
openoffice.org (1:2.3.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-12-06 21:38:00 +0000
+++ b/control 2007-12-10 14:07:42 +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
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] , dpkg-dev (>= 1.14.11) [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] , 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] , libhyphen-dev (>= 2.3-3) [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.9-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] , dpkg-dev (>= 1.14.11) [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] , 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] , libhyphen-dev (>= 2.3-3) [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] , 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.9-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-7), libicu-dev (<= 3.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -482,22 +482,6 @@
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
-Package: openoffice.org-report-builder
-Section: misc
-Priority: optional
-Architecture: i386 powerpc sparc amd64 ppc64
-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
-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.
-Homepage: http://extensions.services.openoffice.org/project/reportdesign
-
Package: openoffice.org-l10n-af
Architecture: all
Depends: locales | belocs-locales-data | locales-all
@@ -2975,6 +2959,26 @@
This package contains a Mozilla/Netscape compatible plugin which can handle
all OOo documents.
+Package: openoffice.org-report-builder
+Section: misc
+Priority: optional
+Architecture: i386 powerpc sparc amd64 ppc64
+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
+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: ttf-opensymbol
Section: x11
Architecture: all
=== modified file 'control.in'
--- a/control.in 2007-12-06 21:38:00 +0000
+++ b/control.in 2007-12-10 14:07:42 +0000
@@ -732,19 +732,3 @@
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
-Package: openoffice.orgVER-report-builder
-Section: misc
-Priority: optional
-Architecture: %OOO_ARCHS%
-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
-Enhances: openoffice.orgVER-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.
-Homepage: http://extensions.services.openoffice.org/project/reportdesign
-
=== modified file 'rules'
--- a/rules 2007-12-06 14:27:16 +0000
+++ b/rules 2007-12-10 14:07:42 +0000
@@ -144,6 +144,7 @@
MOZILLA=xulrunner
ENABLE_OPENGL=n
NEW_DPKG_SHLIBDEPS=y
+ENABLE_REPORTDESIGN=y
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
@@ -203,6 +204,7 @@
USE_SYSTEM_BOOST=y
USE_SYSTEM_LIBWPG=n
USE_SYSTEM_HSQLDB=n
+ ENABLE_REPORTDESIGN=n
NEONSONR=26
endif
@@ -461,10 +463,15 @@
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
+ ifeq "$(ENABLE_REPORTDESIGN)" "y"
# 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)
+ CONFIGURE_FLAGS += --with-system-jfreereport
+ else
+ CONFIGURE_FLAGS += --disable-reportdesign
+ endif
else
CONFIGURE_FLAGS += --without-java
DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean
-Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
@@ -574,11 +581,6 @@
endif
endif
-ifeq "$(USE_SYSTEM_LIBSVG)" "y"
- BUILD_DEPS += , libsvg-dev [$(OOO_ARCHS)]
- CONFIGURE_FLAGS += --with-system-libsvg
-endif
-
ifeq "$(USE_SYSTEM_ICU)" "y"
# 34 and 36 provide this and 38 changed the real name.
BUILD_DEPS += , libicu-dev [$(OOO_ARCHS)]
@@ -990,7 +992,7 @@
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
rm -f debian/libuno-cil.installcligac
- rm -f debian/scripts/aotcompile.py
+ rm -f debian/scripts/aotcompile.py*
ifeq "$(ENABLE_MONO)" "y"
rm -rf $(MONO_SHARED_DIR)/.wapi
@@ -1117,6 +1119,10 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.ogltrans.in
endif
+ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
+ >> debian/control < debian/control.reportdesign.in
+endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.fonts.in
@@ -2087,12 +2093,13 @@
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
mkdir -p $(PKGDIR)-report-builder/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder/$(OODIR)/program
-ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
# install this; we need to register this ourselved later in
# the maintainer scripts. This is intended upstream (**rpt* stuff
# in 2.3 and the actual report builde as an extension, without which
@@ -2103,6 +2110,7 @@
for i in THIRDPARTYREADMELICENSE.html license_en-US.html
readme_en-US.html readme_en-US.txt; do \
zip -d
$(CURDIR)/$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
$$i; \
done
+ endif
endif
rm -rf $(PKGDIR)-sdbc-postgresql
@@ -2639,6 +2647,7 @@
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
-l$(PKGDIR)-core/$(OODIR)/program \
+ -l$(PKGDIR)-base/$(OODIR)/program \
$(SHLIBS_OVERRIDE)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -popenoffice.org$(VER)-officebean \
@@ -2674,9 +2683,11 @@
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
+ifeq "$(ENABLE_REPORTDESIGN)" "y"
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`
+endif
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`
dh_md5sums -s
