------------------------------------------------------------
revno: 2020
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sun 2010-06-13 00:07:58 +0200
message:
disable Base and associated stuff for armel
modified:
changelog
control
control.in
control.reportdesign.in
rules
=== modified file 'changelog'
--- a/changelog 2010-06-10 22:27:36 +0000
+++ b/changelog 2010-06-12 22:07:58 +0000
@@ -13,10 +13,11 @@
* debian/rules:
- run smoketest for armel again (the logic was flawed anyway and
disabled smoketest for all archs)
- * debian/smoketest/*, debian/rules: disable Databse{Insert,Delete,Seek} tests
- on armel. No regression and works if used "correctly" inside OOo
+ * debian/smoketest/*, debian/rules: disable Database{Insert,Delete,Seek}
tests
+ on armel. No regression. Base (still) unusable, though :/
+ * debian/rules, debian/control*in: disable Base and associated stuff for
armel
- -- Rene Engelhard <[email protected]> Thu, 10 Jun 2010 18:02:35 +0200
+ -- Rene Engelhard <[email protected]> Sat, 12 Jun 2010 13:30:18 +0200
openoffice.org (1:3.2.1-1) unstable; urgency=medium
=== modified file 'control'
--- a/control 2010-06-05 16:27:35 +0000
+++ b/control 2010-06-12 22:07:58 +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), flex | 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)
[powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>=
1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev, python-all ,
debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel
ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s39
0x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java ,
xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3)
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3)
[i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.4.2.3) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>
= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) ,
libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5)
, libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>=
2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.
10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | 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)
[powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>=
1.15.1) , libgl1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev, python-all ,
debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel
ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386
mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64
ppc64 s390x sparc], libflut
e-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips m
ipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64
s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>=
3.12.3) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>=
2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>=
2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>=
2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>=
0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd8-dev (>=
0.8.3-
3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0)
, libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>=
4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java
(>= 2.3.2) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>>
1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips
mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
ppc64 s390x sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60)
, libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>=
1.0.8) ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5)
Standards-Version: 3.8.4
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ttf-sil-gentium-basic, ${ooo-officebean-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base [!armel],
openoffice.org-report-builder-bin [!armel], ttf-dejavu, ttf-sil-gentium-basic,
${ooo-officebean-dep}, openoffice.org-filter-mobiledev, ${lucene-depends},
${java-common-depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | ttf-mscorefonts-installer
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, libpaper-utils,
${gstreamer-plugins-suggests}, ${libldap-suggests}
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common
(<< 1:3.0.0)
@@ -151,7 +151,7 @@
Package: openoffice.org-writer
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}) [!armel], ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.org-emailmerge, openoffice.org-math
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${binary:Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${binary:Version}), openoffice.org-java-common (<= 1:2.3.1)
@@ -165,7 +165,7 @@
Package: openoffice.org-calc
Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}) [!armel], ${shlibs:Depends}, ${lpsolve-dep},
${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${binary:Version})
Provides: openoffice.org2-calc
@@ -213,7 +213,7 @@
This package contains the equation editor component for OpenOffice.org.
Package: openoffice.org-base-core
-Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
@@ -228,7 +228,7 @@
install openoffice.org-base.
Package: openoffice.org-base
-Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
Section: database
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4~)
@@ -386,7 +386,7 @@
* evolution
Package: openoffice.org-evolution
-Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
Section: gnome
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
@@ -3502,7 +3502,7 @@
Package: openoffice.org-report-builder-bin
Section: misc
-Architecture: i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-base (>= 2.3.0~src680m225), ${misc:Depends}
Replaces: openoffice.org-report-builder
Description: OpenOffice.org extension for building database reports --
libraries
=== modified file 'control.in'
--- a/control.in 2010-06-05 16:27:35 +0000
+++ b/control.in 2010-06-12 22:07:58 +0000
@@ -61,8 +61,8 @@
openoffice.orgVER-impress,
openoffice.orgVER-draw,
openoffice.orgVER-math,
- openoffice.orgVER-base,
- openoffice.orgVER-report-builder-bin,
+ openoffice.orgVER-base [%OOO_NO_BASE_ARCHS%],
+ openoffice.orgVER-report-builder-bin [%OOO_NO_BASE_ARCHS%],
ttf-dejavu,
ttf-sil-gentium-basic,
${ooo-officebean-dep},
@@ -345,7 +345,7 @@
Package: openoffice.orgVER-writer
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- openoffice.orgVER-base-core (= ${binary:Version}),
+ openoffice.orgVER-base-core (= ${binary:Version}) [%OOO_NO_BASE_ARCHS%],
${shlibs:Depends},
${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.orgVER-emailmerge, openoffice.orgVER-math
@@ -368,7 +368,7 @@
Package: openoffice.orgVER-calc
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- openoffice.orgVER-base-core (= ${binary:Version}),
+ openoffice.orgVER-base-core (= ${binary:Version}) [%OOO_NO_BASE_ARCHS%],
${shlibs:Depends},
${lpsolve-dep},
${misc:Depends}
@@ -446,7 +446,7 @@
This package contains the equation editor component for OpenOffice.org.
Package: openoffice.orgVER-base-core
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_BASE_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
@@ -463,7 +463,7 @@
install openoffice.orgVER-base.
Package: openoffice.orgVER-base
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_BASE_ARCHS%
Section: database
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base-core (= ${binary:Version}),
@@ -658,7 +658,7 @@
* evolution
Package: openoffice.orgVER-evolution
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_BASE_ARCHS%
Section: gnome
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base,
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2010-05-20 11:34:57 +0000
+++ b/control.reportdesign.in 2010-06-12 22:07:58 +0000
@@ -21,7 +21,7 @@
Package: openoffice.orgVER-report-builder-bin
Section: misc
-Architecture: %OOO_JAVA_ARCHS%
+Architecture: %OOO_BASE_ARCHS%
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.orgVER-base (>= 2.3.0~src680m225), ${misc:Depends}
Replaces: openoffice.orgVER-report-builder
Description: OpenOffice.org extension for building database reports --
libraries
=== modified file 'rules'
--- a/rules 2010-06-10 14:07:27 +0000
+++ b/rules 2010-06-12 22:07:58 +0000
@@ -488,6 +488,23 @@
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+OOO_BASE_ARCHS := $(filter-out armel,$(OOO_ARCHS))
+OOO_NO_BASE_ARCHS := !armel
+OOO_REPORTDESIGN_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
+
+ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
+ PACKAGE_BASE=n
+ ENABLE_SDBC_POSTGRESQL=n
+ ENABLE_MYSQLNATIVE=n
+ ENABLE_EVO2=n
+ ENABLE_KDEAB=n
+ ENABLE_REPORTDESIGN=n
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-base
openoffice.org$(VER)-base-core
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-evolution
-Nopenoffice.org$(VER)-kab
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-sdbc-postgresql
-Nopenoffice.org$(VER)-mysql-connector
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-report-builder-bin
-Nopenoffice.org$(VER)-report-builder
+endif
+
ifeq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
ENABLE_PDFIMPORT=n
@@ -890,7 +907,7 @@
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
ifeq "$(USE_SYSTEM_JFREEREPORT)" "y"
- REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org
[$(OOO_JAVA_ARCHS)], libsac-java [$(OOO_JAVA_ARCHS)],
libxml-java-openoffice.org [$(OOO_JAVA_ARCHS)], libflute-java-openoffice.org
[$(OOO_JAVA_ARCHS)], libpentaho-reporting-flow-engine-java-openoffice.org
[$(OOO_JAVA_ARCHS)], liblayout-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libloader-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libformula-java-openoffice.org [$(OOO_JAVA_ARCHS)],
librepository-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libfonts-java-openoffice.org [$(OOO_JAVA_ARCHS)],
libserializer-java-openoffice.org [$(OOO_JAVA_ARCHS)]
+ REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], libsac-java [$(OOO_REPORTDESIGN_ARCHS)],
libxml-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)],
libflute-java-openoffice.org [$(OOO_REPORTDESIGN_ARCHS)],
libpentaho-reporting-flow-engine-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], liblayout-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], libloader-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], libformula-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], librepository-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], libfonts-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)], libserializer-java-openoffice.org
[$(OOO_REPORTDESIGN_ARCHS)]
REPORT_BUILDER_JAR_DEPENDS := , libbase-java-openoffice.org,
libsac-java, libxml-java-openoffice.org, libflute-java-openoffice.org,
libpentaho-reporting-flow-engine-java-openoffice.org,
liblayout-java-openoffice.org, libloader-java-openoffice.org,
libformula-java-openoffice.org, librepository-java-openoffice.org,
libfonts-java-openoffice.org, libserializer-java-openoffice.org
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-jfreereport
--with-libbase-jar=/usr/share/java/openoffice/libbase.jar
--with-libxml-jar=/usr/share/java/openoffice/libxml.jar
--with-flute-jar=/usr/share/java/openoffice/flute.jar
--with-jfreereport-jar=/usr/share/java/openoffice/flow-engine.jar
--with-liblayout-jar=/usr/share/java/openoffice/liblayout.jar
--with-libloader-jar=/usr/share/java/openoffice/libloader.jar
--with-libformula-jar=/usr/share/java/openoffice/libformula.jar
--with-librepository-jar=/usr/share/java/openoffice/librepository.jar
--with-libfonts-jar=/usr/share/java/openoffice/libfonts.jar
--with-libserializer-jar=/usr/share/java/openoffice/libserializer.jar
@@ -1107,11 +1124,11 @@
ifeq "$(ENABLE_KDEAB)" "y"
ifeq "$(KDE_VER)" "4"
ADDITIONAL_SECTIONS += KDE4Experimental
- BUILD_DEPS += , kdepimlibs$(shell expr $(KDE_VER) + 1)-dev
+ BUILD_DEPS += , kdepimlibs$(shell expr $(KDE_VER) + 1)-dev
[$(OOO_NO_BASE_ARCHS)]
endif
else
CONFIGURE_FLAGS+= --disable-kdeab
- DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-kab
+ DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-kab [$(OOO_NO_BASE_ARCHS)]
endif
endif
@@ -1140,7 +1157,7 @@
CONFIGURE_FLAGS += --disable-evolution2
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-evolution
else
- BUILD_DEPS += , libebook1.2-dev
+ BUILD_DEPS += , libebook1.2-dev [$(OOO_NO_BASE_ARCHS)]
endif
ifeq "$(ENABLE_RANDR)" "y"
@@ -1762,6 +1779,8 @@
done
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g
debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
@@ -2163,6 +2182,7 @@
mv $(PKGDIR)-common/$(OODIR)/program/classes/officebean.jar \
$(PKGDIR)-core/usr/share/java/$(OODIRNAME)
+ ifeq "$(PACKAGE_BASE)" "y"
# move sdbc_hsqldb.jar into -base (do the move
# to /usr/share/java here directly, we do it for the "rest"
# later
@@ -2173,12 +2193,13 @@
ln -s /usr/share/java/$(OODIRNAME)/sdbc_hsqldb.jar \
$(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
- ifneq "$(USE_SYSTEM_HSQLDB)" "y"
+ ifneq "$(USE_SYSTEM_HSQLDB)" "y"
# we need this in -base. Otherwise we get unwanted package differences
# in the unstable version and backports which might use internal hsqldb
mkdir -p $(PKGDIR)-base/$(OODIR)/program/classes
mv $(PKGDIR)-common/$(OODIR)/program/classes/hsqldb.jar \
$(PKGDIR)-base/$(OODIR)/program/classes
+ endif
endif
endif
@@ -2856,12 +2877,14 @@
# in -base)
rm -f $(PKGDIR)-base/$(OODIR)/program/librpt*
else
+ ifeq "$(PACKAGE_BASE)" "y"
# move rpt stuff into -report-builder-bin
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
+ endif
ifeq "$(ENABLE_JAVA)" "y"
# install this; we need to register this ourselves later in
# the maintainer scripts. This is intended upstream (*rpt* stuff
@@ -3549,17 +3572,18 @@
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR)
\
$(SHLIBS_OVERRIDE)
endif
+ifeq "$(PACKAGE_BASE)" "y"
# this is in an extension (.zip), so dh_shlibdeps doesn't get it. We
need to do
# it manually.
-ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
+ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
-Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
-endif
-ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ endif
+ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
-Sdebian/uno-libs3/$(OOUREDIR)/lib \
@@ -3567,12 +3591,13 @@
$(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/mysqlc.uno.so \
$(SOURCE_TREE)/mysqlcppconn/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libmysqlcppconn.so \
> debian/openoffice.org$(VER)-mysql-connector.substvars
- ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "n"
+ ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "n"
# add mysqlclient dependency; it apparently is only dlopen()ed in
# the internal case.. (And in the external case we have a dep on
# libmysqlcppconn4 which deps on libmysqlclient16 already)
perl -pi -e 's/(shlibs:Depends=.*$$)/$$1, $(shell cat
/var/lib/dpkg/info/libmysqlclient16.shlibs | grep _r | cut -d" " -f3,4,5)/' \
debian/openoffice.org$(VER)-mysql-connector.substvars
+ endif
endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
@@ -3655,13 +3680,15 @@
dh_gencontrol -popenoffice.org$(VER)-presenter-console -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
-ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
+ifeq "$(PACKAGE_BASE)" "y"
+ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
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 | sed -e s/a$$//)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
-endif
-ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+ endif
+ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -popenoffice.org$(VER)-mysql-connector -- \
-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e
's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+ endif
endif
endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
