r778 ./packages/openofficeorg/2.2.1/unstable: disable smoketest again; revert to stlport4.6, update ooo-build, -5
------------------------------------------------------------
revno: 778
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-07-04 23:16:18 +0200
message:
disable smoketest again; revert to stlport4.6, update ooo-build, -5
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-07-03 15:10:44 +0000
+++ b/changelog 2007-07-04 21:16:18 +0000
@@ -1,7 +1,7 @@
-openoffice.org (2.2.1-4.5pre) unstable; urgency=low
+openoffice.org (2.2.1-5) unstable; urgency=low
* ooo-build:
- - update (r9697)
+ - update (r9703)
+ libpaper-support.diff: backport suppressing of
"paperconf: command not found" from cws vcl79 (closes: #430141)
* debian/control.mozilla.in:
@@ -9,8 +9,10 @@
* debian/rules:
- remove FontOOo from /usr/lib/openoffice/share/basic/launcher/script.xlb,
see issue 79153
+ - stop running the smoketest again...
+ - revert to using libstlport4.6, sorry Torsten...
- -- Rene Engelhard <rene@debian.org> Tue, 3 Jul 2007 17:08:37 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 4 Jul 2007 10:48:34 +0200
openoffice.org (2.2.1-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-01 20:20:14 +0000
+++ b/control 2007-07-04 21:16:18 +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) [i386 powerpc sparc amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64], sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64], libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386 powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev [i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64], libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386 powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386 powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386 powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] , libcurl3-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64], xbase-clients [i386 powerpc sparc amd64], xfonts-base [i386 powerpc sparc amd64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport5.1-dev (>= 5.0.99rc2-5) [i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64] , libufsparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64], sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64], libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386 powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev [i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64], libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386 powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386 powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386 powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] , libcurl3-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64] , libufsparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2007-07-03 14:21:30 +0000
+++ b/rules 2007-07-04 21:16:18 +0000
@@ -93,7 +93,7 @@
USE_AGG=n
SYSTEM_AGG=n
USE_STLPORT=y
-USE_STLPORT5=y
+USE_STLPORT5=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=n
USE_SYSTEM_PORTAUDIO=y
@@ -127,7 +127,7 @@
PACKAGE_QUICKSTART=y
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
-RUN_SMOKETEST=y
+RUN_SMOKETEST=n
USE_LIBCURL4=y
# when we have a package we want to have to be installed on older things with some older
@@ -1148,14 +1148,8 @@
test: $(STAMP_DIR)/test
$(STAMP_DIR)/test: $(STAMP_DIR)/build
-ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
ifeq "$(RUN_SMOKETEST)" "y"
# smoketest
- # apparently setting this here globally doesn't work, so hack around. If we don't do this we get loads
- # of harmless, but log-bloating warnings
- if ! grep fakeroot $(SOURCE_TREE)/*.sh; then \
- perl -pi -e 's,LD_LIBRARY_PATH=\"(.*)\",LD_LIBRARY_PATH=\"/usr/lib/libfakeroot:\1\",' $(SOURCE_TREE)/*.sh; \
- fi
cd $(SOURCE_TREE)/smoketestoo_native && \
mkdir -p $(CURDIR)/oosmoketest && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
@@ -1168,7 +1162,6 @@
fi && \
rm -rf $(CURDIR)/oosmoketest
endif
-endif
touch $@
Reply to: