./packages/openofficeorg/3.0/experimental r1228: add libpoppler-dev builddep; temporarily disable hu; merge more -report-builder fixes, merge -java-common fixes
------------------------------------------------------------
revno: 1228
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-20 19:45:39 +0200
message:
add libpoppler-dev builddep; temporarily disable hu; merge more -report-builder fixes, merge -java-common fixes
modified:
changelog
control
control.in
control.reportdesign.in
rules
------------------------------------------------------------
revno: 1022.1.150
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-20 16:14:32 +0200
message:
more -report-builder fixes; more -java-common Replaces:
modified:
changelog
control
control.in
control.reportdesign.in
rules
------------------------------------------------------------
revno: 1022.1.151
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-20 17:04:16 +0200
message:
missing ,
modified:
control.in
=== modified file 'changelog'
--- a/changelog 2008-08-20 04:04:51 +0000
+++ b/changelog 2008-08-20 17:45:39 +0000
@@ -6,7 +6,7 @@
editable) (closes: #490549)
- package-ooo: fix install to make help land properly in -help-xx.
* ooo-build:
- - update (r13633)
+ - update (r13640)
- src: get OOO300 GSIs from ftp.linux.cz
* debian/rules:
- Add SYSTEM_LUCENE conditional, disable it yet as liblucene2-java is
@@ -14,6 +14,7 @@
- Add SYSTEM_REDLAND conditional
- reenable the SDK
- enable mn (Mongolian) and kk (Kazahk); build all languages again
+ (except hu which is broken and just contains svs translation)
- remove obsolete [$(OOO_ARCHS)] qualifier from python-dev builddep
(closes: #491623)
- build against kde4
@@ -30,6 +31,8 @@
as ooo-build supports it. Use Suns solver for now
- put hsqldb.jar also to -base with internal hsqldb so that we don't
get file differences between sids package and backports.
+ - add build-dep on libpoppler-dev (>= 0.8.0) as there's now a patch
+ making "xpdfwrapper" build against poppler. yay.
* debian/rules, debian/control.help.in: recommend
liblucene2-java/openoffice.org-java-common. We don't depend on it as we
don't want to make the help depend on Java (lucene is needed for "search"
@@ -54,9 +57,9 @@
- fix -andromedas Replaces:
- Homepage: http://www.go-oo.org, thanks Renato Yamane
- move bsh from Depends to Suggests at -java-common
- - For upgrades from 1:2.4.1-3~bpo40+1 add a Replaces:
- openoffice.org-java-common (= 1:2.4.1-3~bpo40+1) to -base because of
- hsqldb, see below. (closes: #494512)
+ - For upgrades from bpo packages add a Replaces on
+ openoffice.org-java-common to -base because of hsqldb, see below.
+ (closes: #494512)
* debian/control.ure.in:
- uno-libs3-dbg is Priority: extra
* debian/copyright:
@@ -70,7 +73,7 @@
the SRB also often work with older librpt*/OOo, but that would not work
with the current packaging due to shlibdeps.
- -- Rene Engelhard <rene@debian.org> Tue, 19 Aug 2008 21:27:44 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 20 Aug 2008 19:27:10 +0200
openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-08-20 04:04:51 +0000
+++ b/control 2008-08-20 17:45:39 +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) , 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] , 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) , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , 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 , 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] , 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) , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , 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 , 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
@@ -222,7 +222,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java, openoffice.org-gcj, openoffice.org-report-builder
-Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.4.1-3~bpo40+1)
+Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
Provides: openoffice.org2-base
Description: OpenOffice.org office suite - database
@@ -1319,33 +1319,6 @@
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
@@ -2838,20 +2811,6 @@
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
@@ -3266,9 +3225,8 @@
Package: openoffice.org-report-builder
Section: misc
-Priority: optional
-Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
-Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), openoffice.org-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), 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
=== modified file 'control.in'
--- a/control.in 2008-08-16 05:49:17 +0000
+++ b/control.in 2008-08-20 17:45:39 +0000
@@ -441,7 +441,12 @@
openoffice.org-debian-files,
openoffice.org2-base (<< ${Source-Version}),
openoffice.org-java,
- openoffice.org-java-common (= 1:2.4.1-3~bpo40+1)
+ openoffice.org-java-common (= 1:2.3.1-2~bpo40+1),
+ openoffice.org-java-common (= 1:2.4.0-4~bpo40+1),
+ openoffice.org-java-common (= 1:2.4.1-3~bpo40+1),
+ openoffice.org-java-common (= 2.2.0-6~bpo.1),
+ openoffice.org-java-common (= 2.2.1-1~bpo.1),
+ openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files,
openoffice.org2-base (<< ${Source-Version}),
openoffice.org-common (= 2.0.4-4)
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-08-16 05:23:17 +0000
+++ b/control.reportdesign.in 2008-08-20 14:14:32 +0000
@@ -1,8 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
-Priority: optional
-Architecture: %OOO_JAVA_ARCHS%
-Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Architecture: all
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-report-builder-bin, 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 2008-08-20 11:05:15 +0000
+++ b/rules 2008-08-20 17:45:39 +0000
@@ -416,6 +416,8 @@
endif
ifeq "$(ENABLE_PDFIMPORT)" "n"
CONFIGURE_FLAGS += --disable-pdfimport
+else
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
endif
ifeq "$(USE_LIBCURL4)" "y"
@@ -503,16 +505,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 hu it ja \
+ en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr it ja \
ka kk 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 hu it ja km ko nl \
+ HELPISOS:=en-US cs da de dz en-GB es et eu fr gl hi-IN 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 hu it ja \
+ en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr it ja \
ka kk 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
@@ -3070,7 +3072,6 @@
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg -Nuno-libs3 -Nuno-libs3-dbg \
- -Nopenoffice.org$(VER)-report-builder \
-Nopenoffice.org$(VER)-presentation-minimizer \
-Nopenoffice.org$(VER)-presenter-console \
-Nopenoffice.org$(VER)-pdfimport \
@@ -3098,11 +3099,6 @@
debian/openoffice.org$(VER)-officebean/DEBIAN/control
endif
endif
-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`
-endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
dh_gencontrol -popenoffice.org$(VER)-pdfimport -- \
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/pdfimport/config/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
@@ -3203,6 +3199,7 @@
dh_clideps -i
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) -Nlibpcvslib-perl \
+ -Nopenoffice.org$(VER)-report-builder \
-Nopenoffice.org$(VER)-wiki-publisher \
-Nlibuno-cli-basetypes1.0-cil \
-Nlibuno-cli-uretypes1.0-cil \
@@ -3239,6 +3236,11 @@
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
+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`
+endif
ifeq "$(PACKAGE_PCVSLIB)" "y"
dh_gencontrol -plibpcvslib-perl -- \
-v0.02+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
Reply to: