------------------------------------------------------------
revno: 2145
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Sun 2010-10-17 22:30:32 +0200
message:
temporarily also disable system-stlport on i386
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-10-17 16:49:28 +0000
+++ b/changelog 2010-10-17 20:30:32 +0000
@@ -6,13 +6,12 @@
- remove lenny->squeeze transitional packages, obsolete and not
needed here anyways with the OOo -> LibO move
* debian/rules:
- - temporarily disable system-{graphite,cppunit} on i386, will be
- reeenabled when beta3 included the necessary patches to make this
- work
- * debian/copyright:
- - update
+ - temporarily disable system-{graphite,cppunit,stlport} on i386,
+ will be reeenabled when beta3 included the necessary patches to
+ make this work
+ * debian/copyright: update
- -- Rene Engelhard <[email protected]> Sun, 17 Oct 2010 18:43:32 +0200
+ -- Rene Engelhard <[email protected]> Sun, 17 Oct 2010 22:06:13 +0200
libreoffice (1:3.3.0~beta2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-10-17 16:21:01 +0000
+++ b/control 2010-10-17 20:30:32 +0000
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, automake, 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, bc, , 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 powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x
sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 ppc64 s390x
sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel
powerpc powerpcspe 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 , debhelper (>= 7.2.3~) , epm ,
libcppunit-dev (>= 1.12) , tcsh , openjdk-6-jdk [i386 powerpc powerpcspe 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 powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha am
d64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386
mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i3
86 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64
ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe 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 ia6
4], 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), libboost-thread-dev,
libboost-program-options-dev , 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 powerpcspe 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 powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390
kfreeb
sd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh
(>= 2.0b4) [i386 mips mipsel powerpc powerpcspe 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, automake, 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, bc, , 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 powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x
sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 ppc64 s390x
sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel
powerpc powerpcspe 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 , debhelper (>= 7.2.3~) , epm ,
libcppunit-dev (>= 1.12) [!i386] , tcsh , openjdk-6-jdk [i386 powerpc
powerpcspe 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 powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime
[i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386
mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips
mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfr
eebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mip
s mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa
ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe 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-a
md64 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) , libboost-dev (>=
1.38), libboost-thread-dev, libboost-program-options-dev , 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 powerpcspe
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 powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>>
1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd
64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel
powerpc powerpcspe 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, , libtextcat-data-utf8 , fontforge
-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), libhsqldb-java (>= 1.8.1~)
+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), libhsqldb-java (>= 1.8.1~), libstlport4.6-dev
Standards-Version: 3.8.4
XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/libreoffice/3.3.0/experimental
=== modified file 'rules'
--- a/rules 2010-10-17 16:49:28 +0000
+++ b/rules 2010-10-17 20:30:32 +0000
@@ -159,7 +159,7 @@
USE_AGG=n
SYSTEM_AGG=n
USE_STLPORT=n
-USE_SYSTEM_STLPORT=y
+USE_SYSTEM_STLPORT=n
USE_SYSTEM_BOOST=y
BOOST_VERSION=default
ifeq "$(BOOST_VERSION)" "default"
@@ -806,7 +806,7 @@
endif
ifeq "$(USE_SYSTEM_CPPUNIT)" "y"
CONFIGURE_FLAGS += --with-system-cppunit
- BUILD_DEPS += , libcppunit-dev (>= 1.12)
+ BUILD_DEPS += , libcppunit-dev (>= 1.12) [!$(OOO_STLPORT_ARCHS)]
ifeq "$(USE_STLPORT)" "y"
ADDITIONAL_SECTIONS += SystemBitsWithSTLport
endif
