------------------------------------------------------------
revno: 1280
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-10-11 16:56:57 +0200
message:
run the smoketest on builds again
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-10-10 13:35:52 +0000
+++ b/changelog 2008-10-11 14:56:57 +0000
@@ -2,15 +2,18 @@
* OpenOffice.org 3.0.0 final
* ooo-build
- - update (r14280)
+ - update (r14286)
- system-python-ure-bootstrap.diff: set URE_BOOTSTRAP variable if not
there with system-python, thanks Daniel Watkins (closes: #501028)
* debin/rules:
- remove now obsolete ADDITIONAL_SECTIONS="DebianBaseSystem*"
- build against KDE3 again. In contrast to building against KDE4 it works
in runtime (and also works with KDE4)
+ - run smoketest during build again to prevent e.g. #501664 happening again.
+ Put it into a mktemp -q -d generated dir instead of in the build tree
+ so that it doesn't break the install after it....
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 10 Oct 2008 15:23:48 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 11 Oct 2008 16:26:00 +0200
openoffice.org (1:3.0.0~rc4-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-10-09 04:49:09 +0000
+++ b/control 2008-10-11 14:56:57 +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), 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) , 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 , kdelibs4-dev (>= 4:3.4.3-2) , 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~) , xvfb, xbase-clients, xfonts-base
, 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) ,
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 , kdelibs4-dev (>= 4:3.4.3-2) ,
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
=== modified file 'rules'
--- a/rules 2008-10-10 13:35:52 +0000
+++ b/rules 2008-10-11 14:56:57 +0000
@@ -150,7 +150,7 @@
USE_SYSTEM_REDLAND=y
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
-RUN_SMOKETEST=n
+RUN_SMOKETEST=y
RUN_UNIT_TESTS=n
USE_LIBCURL4=y
USE_SYSTEM_LIBSVG=y
@@ -1586,16 +1586,15 @@
ifeq "$(RUN_SMOKETEST)" "y"
# smoketest
cd $(SOURCE_TREE)/smoketestoo_native && \
- mkdir -p $(CURDIR)/oosmoketest && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
- export TEMP=$(CURDIR)/oosmoketest; \
+ export TEMP=`mktemp -q -d`; \
if [ -n "$$DISPLAY" ]; then \
../solenv/bin/build.pl; \
else \
xvfb-run -a ../solenv/bin/build.pl; \
fi && \
- rm -rf $(CURDIR)/oosmoketest
+ rm -rf $$TEMP
endif
endif
