./packages/openofficeorg/3.0/experimental r1246: m4
------------------------------------------------------------
revno: 1246
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-09-04 07:56:17 +0200
message:
m4
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1244.1.1
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-09-02 01:20:10 +0200
message:
fix USE_SCSOLVER conditional
modified:
changelog
rules
------------------------------------------------------------
revno: 1244.1.2
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-09-02 01:27:01 +0200
message:
m4 updates
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-09-03 14:06:10 +0000
+++ b/changelog 2008-09-04 05:56:17 +0000
@@ -1,3 +1,20 @@
+openoffice.org (1:3.0.0~ooo300m4-0.1pre) experimental; urgency=low
+
+ * OpenOffice.org 3.0 release branch milestone 4 (OOO300_m4)
+ - catches exception on (malformed) ODGs referencing not existing
+ images (closes: #494644)
+ * ooo-build:
+ - update (r13751)
+ * debian/rules:
+ - fix USE_SCSOLVER conditional
+ - 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...
+
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Sep 2008 01:25:48 +0200
+
openoffice.org (1:3.0.0~ooo300m3-3) experimental; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2008-08-27 03:32:58 +0000
+++ b/control 2008-09-01 23:27:01 +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), 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-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-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
@@ -1319,6 +1319,33 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
+Package: openoffice.org-l10n-hu
+Architecture: all
+Depends: locales | belocs-locales-data | locales-all
+Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hu
+Provides: openoffice.org-l10n-${help-l10n-virtual-version}, openoffice.org2-l10n-hu
+Suggests: hunspell-dictionary-hu | myspell-dictionary-hu, openoffice.org-hyphenation-hu, openoffice.org2-thesaurus-hu, openoffice.org-help-hu
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>= ${base-version}.1), openoffice.org2-l10n-hu
+Replaces: openoffice.org2-l10n-hu
+Description: Hungarian language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ Hungarian.
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages).
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+
Package: openoffice.org-l10n-it
Architecture: all
Depends: locales | belocs-locales-data | locales-all
@@ -2784,6 +2811,20 @@
This package contains the help of OpenOffice.org in
Hindi.
+Package: openoffice.org-help-hu
+Architecture: all
+Section: doc
+Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hu, ${lucene-depends}, ${java-common-depends}
+Depends: openoffice.org-writer | language-support-translations-hu, openoffice.org-l10n-hu
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version})
+Provides: openoffice.org-help-${help-l10n-virtual-version}
+Description: Hungarian help for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the help of OpenOffice.org in
+ Hungarian.
+
Package: openoffice.org-help-it
Architecture: all
Section: doc
@@ -3123,37 +3164,6 @@
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, 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: 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 'rules'
--- a/rules 2008-09-03 14:06:10 +0000
+++ b/rules 2008-09-04 05:56:17 +0000
@@ -29,8 +29,8 @@
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d: -f2 | cut -d- -f1)
BASE_VERSION:=$(shell echo $(SOURCE_VERSION) | cut -d: -f1):$(UPSTREAM_VERSION)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=2.4
+#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
+HELP_L10N_VIRTUAL_VERSION:=3.0
BINARY_VERSION=$(SOURCE_VERSION)
#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
@@ -63,7 +63,7 @@
MWS=OOO300
MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
-#MILESTONE=m3
+#MILESTONE=m4
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-0
@@ -166,7 +166,7 @@
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
- ENABLE_REPORTDESIGN=y
+ ENABLE_REPORTDESIGN=n
USE_SYSTEM_JFREEREPORT=y
ENABLE_MEDIAWIKI=y
USE_SYSTEM_APACHE_COMMONS=y
@@ -413,15 +413,14 @@
CONFIGURE_FLAGS += --disable-odk
endif
-ifeq "$(ENABLE_MINIMIZER)" "n"
- CONFIGURE_FLAGS += --disable-minimizer
+ifeq "$(ENABLE_MINIMIZER)" "y"
+ CONFIGURE_FLAGS += --enable-minimizer
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --enable-presenter-screen
+ CONFIGURE_FLAGS += --enable-presenter-console
endif
-ifeq "$(ENABLE_PDFIMPORT)" "n"
- CONFIGURE_FLAGS += --disable-pdfimport
-else
+ifeq "$(ENABLE_PDFIMPORT)" "y"
+ CONFIGURE_FLAGS += --enable-pdfimport
BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
endif
@@ -510,16 +509,16 @@
# have gid_Module_Root.$iso
#ISOS=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
ISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
- en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr it ja \
+ en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
ka km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \
pa-IN pl pt pt-BR ro ru rw sk sl sr ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
- HELPISOS:=en-US cs da de dz en-GB es et eu fr gl hi-IN it ja km ko nl \
+ HELPISOS:=en-US cs da de dz en-GB es et eu fr gl hi-IN hu it ja km ko nl \
pl pt pt-BR ru sl sv zh-CN zh-TW
#LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as-IN be-BY bg bn br bs ca cs cy da de dz el \
- en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr it ja \
+ en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
ka km ko ku lo lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns or-IN \
pa-IN pl pt pt-BR ro ru rw sk sl sr ss st sv \
ta-IN te-IN tg th tn tr ts uk uz ve vi xh zh-CN zh-TW zu
@@ -613,6 +612,7 @@
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
+ CONFIGURE_FLAGS += --enable-wiki-publisher
ifeq "$(USE_SYSTEM_APACHE_COMMONS)" "y"
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java [$(OOO_JAVA_ARCHS)], libcommons-httpclient-java [$(OOO_JAVA_ARCHS)], libcommons-lang-java [$(OOO_JAVA_ARCHS)], libcommons-logging-java [$(OOO_JAVA_ARCHS)]
MEDIAWIKI_JAR_DEPENDS := $(MEDIAWIKI_BUILD_DEPS)
@@ -621,8 +621,6 @@
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java | grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
ADDITIONAL_SECTIONS += DebianBaseSystemApacheCommons
endif
- else
- CONFIGURE_FLAGS += --disable-mediawiki
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
@@ -634,7 +632,7 @@
ADDITIONAL_SECTIONS += DebianBaseSystemJFreeReport
endif
else
- CONFIGURE_FLAGS += --disable-reportdesign
+ CONFIGURE_FLAGS += --disable-report-builder
endif
OOO_OFFICEBEAN_DEP = openoffice.org$(VER)-officebean
else
@@ -813,7 +811,7 @@
ADDITIONAL_SECTIONS += CalcSolver
BUILD_DEPS += , python-xml
else
- CONFIGURE_OPTIONS += --disable-scsolver
+ CONFIGURE_FLAGS += --disable-scsolver
endif
ifeq "$(BUILD_GTK)" "n"
@@ -2430,19 +2428,19 @@
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
done
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
# move rpt stuff into -report-builder
- rm -rf $(PKGDIR)-report-builder
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
+ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ rm -rf $(PKGDIR)-report-builder
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
# the *rpt* stuff is a no-op.
- install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
+ install -D -m644 $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/install/sun-report-builder.oxt
# unneeded license files
for i in THIRDPARTYREADMELICENSE.html readme_en-US.html readme_en-US.txt; do \
@@ -3257,7 +3255,7 @@
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/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ -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
ifeq "$(PACKAGE_PCVSLIB)" "y"
dh_gencontrol -plibpcvslib-perl -- \
Reply to: