------------------------------------------------------------
revno: 1455
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Sun 2009-03-22 17:53:08 +0100
message:
m7; merge
removed:
control.qa.in
openoffice.org-qa-tools.docs
openoffice.org-qa-tools.lintian-overrides
openoffice.org-qa-tools.postrm.in
openoffice.org-qa-tools.preinst.in
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.103
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sat 2009-03-21 21:22:27 +0100
message:
+ Follow Lintian's recommendation to avoid dependency on a Debian ‘-1’
revision.
(Closes: Bug#520604)
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.104
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sun 2009-03-22 17:23:08 +0100
message:
* debian/rules, debian/control.qa.in:
- remove -qa-*, broken and unused anyway
removed:
control.qa.in
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.105
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sun 2009-03-22 17:42:56 +0100
message:
remove openoffice.org-qa-tools.*
removed:
openoffice.org-qa-tools.docs
openoffice.org-qa-tools.lintian-overrides
openoffice.org-qa-tools.postrm.in
openoffice.org-qa-tools.preinst.in
modified:
changelog
control
=== modified file 'changelog'
--- a/changelog 2009-03-20 19:51:35 +0000
+++ b/changelog 2009-03-22 16:53:08 +0000
@@ -1,4 +1,6 @@
-openoffice.org (1:3.1.0~ooo310m6-2) UNRELEASED; urgency=low
+openoffice.org (1:3.1.0~ooo310m7-1) UNRELEASED; urgency=low
+
+ * OpenOffice.org 3.1.0 development snapshot OOO310_m7
[ Rene Engelhard ]
* ooo-build:
@@ -6,6 +8,8 @@
* debian/rules:
- fix saxon conditional. use internal saxon because system-saxon
breaks various filters....
+ * debian/rules, debian/control.qa.in, debian/openoffice.org-qa-tools-*:
+ - remove -qa-*, broken and unused anyway
[ Ben Finney ]
* debian/control*.in:
@@ -15,6 +19,10 @@
architecture-independent packages.
(Closes: Bug#520475)
+ more ${misc:Depends}
+ (Closes: Bug#519644)
+ + Follow Lintian's recommendation to avoid dependency on a Debian ‘-1’
+ revision.
+ (Closes: Bug#520604)
-- Rene Engelhard <[email protected]> Fri, 20 Mar 2009 00:42:06 +0100
=== modified file 'control'
--- a/control 2009-03-20 19:51:35 +0000
+++ b/control 2009-03-22 16:53:08 +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-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, fastjar, xsltproc, imagemagick, 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) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64]
, gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>=
1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc
mips mipsel s390 armel amd64 ia64] , 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] , 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] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-logging-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-devel (>= 2.0.1)
[i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64],
mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [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] ,
libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , 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.10-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.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev
(>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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], 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, fastjar, xsltproc, imagemagick, 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) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64]
, gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>=
1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc
mips mipsel s390 armel amd64 ia64] , 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] , 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] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-logging-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-devel (>= 2.0.1)
[i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64],
mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [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] ,
libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , 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.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh
(>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
liblpsolve55-dev (>= 5.5.0.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev
(>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
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], base-files (= 5)
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -3276,38 +3276,6 @@
This package contains cli_ure.dll, a CLI library which contains helper
classes for implementing UNO interfaces.
-Package: openoffice.org-qa-tools
-Section: devel
-Priority: extra
-Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}),
${ooo-binfilter-dep}, ${java-common-depends}, ${misc:Depends}
-Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests,
-Suggests: ${java-runtime-depends}
-Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
-Replaces: openoffice.org-common (<< 1:3.1.0~dev300m38)
-Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ppc64
-Description: OpenOffice.org Automatic Test Programs
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the test tools to automatically test the
- OpenOffice.org programs.
- .
- Install the openoffice.org-qa-ui-tests and
- openoffice.org-qa-api-tests packages to get the official
- testscripts, or write your own scripts.
-
-Package: openoffice.org-qa-api-tests
-Section: devel
-Priority: extra
-Depends: openoffice.org-qa-tools, ${java-runtime-depends}
-Architecture: all
-Description: OpenOffice.org API Test Data
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the test data for the OpenOffice.org Java and
- Basic APIs.
-
Package: mozilla-openoffice.org
Section: net
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
=== modified file 'control.in'
--- a/control.in 2009-03-20 19:51:35 +0000
+++ b/control.in 2009-03-22 16:53:08 +0000
@@ -5,7 +5,7 @@
Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]>
Build-Depends: lsb-release,
bzip2,
- bison (>= 1:1.875a-1),
+ bison (>= 1:1.875a),
flex-old,
libpam0g-dev,
libxaw7-dev,
@@ -16,7 +16,7 @@
pkg-config,
libfontconfig1-dev,
binutils (>= 2.14.90.0.6-3) [sparc],
- libc6 (>= 2.3.2-1) [powerpc],
+ libc6 (>= 2.3.2) [powerpc],
zlib1g-dev,
libfreetype6-dev,
libx11-dev,
=== removed file 'control.qa.in'
--- a/control.qa.in 2009-03-20 19:51:35 +0000
+++ b/control.qa.in 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-Package: openoffice.orgVER-qa-tools
-Section: devel
-Priority: extra
-Depends: ${shlibs:Depends},
- openoffice.orgVER (>> ${base-version}),
- ${ooo-binfilter-dep},
- ${java-common-depends},
- ${misc:Depends}
-Recommends: openoffice.orgVER-qa-api-tests,
- openoffice.orgVER-qa-ui-tests,
-Suggests: ${java-runtime-depends}
-Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
-Replaces: openoffice.org-common (<< 1:3.1.0~dev300m38)
-Architecture: %OOO_QA_ARCHS%
-Description: OpenOffice.org Automatic Test Programs
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the test tools to automatically test the
- OpenOffice.org programs.
- .
- Install the openoffice.orgVER-qa-ui-tests and
- openoffice.orgVER-qa-api-tests packages to get the official
- testscripts, or write your own scripts.
-
-Package: openoffice.orgVER-qa-api-tests
-Section: devel
-Priority: extra
-Depends: openoffice.orgVER-qa-tools, ${java-runtime-depends}
-Architecture: all
-Description: OpenOffice.org API Test Data
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the test data for the OpenOffice.org Java and
- Basic APIs.
-
=== removed file 'openoffice.org-qa-tools.docs'
--- a/openoffice.org-qa-tools.docs 2006-08-23 17:59:51 +0000
+++ b/openoffice.org-qa-tools.docs 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/README.qa
=== removed file 'openoffice.org-qa-tools.lintian-overrides'
--- a/openoffice.org-qa-tools.lintian-overrides 2008-12-07 17:47:27 +0000
+++ b/openoffice.org-qa-tools.lintian-overrides 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-openoffice.org-qa-tools: binary-or-shlib-defines-rpath
-openoffice.org-qa-tools: executable-not-elf-or-script
./usr/lib/openoffice/basis3.1/smoketest/testlog.pl
-openoffice.org-qa-tools: executable-not-elf-or-script
./usr/lib/openoffice/basis3.1/smoketest/smoketest.pl
-openoffice.org-qa-tools: executable-not-elf-or-script
./usr/lib/openoffice/basis3.1/smoketest/testlog.pl
-
=== removed file 'openoffice.org-qa-tools.postrm.in'
--- a/openoffice.org-qa-tools.postrm.in 2009-03-12 21:25:18 +0000
+++ b/openoffice.org-qa-tools.postrm.in 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# postrm script for openoffice.org-qa-tools
-
-THIS_PACKAGE=openoffice.org-qa-tools
-THIS_SCRIPT=postrm
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in remove)
- dpkg-divert --package $THIS_PACKAGE --remove --rename --divert \
- /@OOBASISDIR@/presets/basic/Standard/script.xlb.no-smoketest \
- /@OOBASISDIR@/presets/basic/Standard/script.xlb
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== removed file 'openoffice.org-qa-tools.preinst.in'
--- a/openoffice.org-qa-tools.preinst.in 2009-03-12 21:25:18 +0000
+++ b/openoffice.org-qa-tools.preinst.in 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# preinst script for openoffice.org-qa-tools
-
-THIS_PACKAGE=openoffice.org-qa-tools
-THIS_SCRIPT=preinst
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in install|upgrade)
- dpkg-divert --package $THIS_PACKAGE --add --rename --divert \
- /@OOBASISDIR@/presets/basic/Standard/script.xlb.no-smoketest \
- /@OOBASISDIR@/presets/basic/Standard/script.xlb
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
=== modified file 'rules'
--- a/rules 2009-03-19 23:44:50 +0000
+++ b/rules 2009-03-22 16:53:08 +0000
@@ -95,16 +95,6 @@
else
PYTHON=python$(PYTHON_VERSION)
endif
-# causes out-of-memory
-ifeq "$(JDK)" "openjdk-cacao"
- PACKAGE_QA_TOOLS=n
-else
- ifneq "$(ARCH)" "ia64"
- PACKAGE_QA_TOOLS=y
- else
- PACKAGE_QA_TOOLS=n
- endif
-endif
PACKAGE_TTF_OPENSYMBOL=y
ifneq "$(ARCH)" "powerpc"
ifneq "$(ARCH)" "ppc64"
@@ -162,7 +152,7 @@
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
-HSQLDB_MINVER= (>> 1.8.0.10-1)
+HSQLDB_MINVER= (>> 1.8.0.10)
# disabled because system-saxon breaks all kinds exports using XSLT transforms
# (e.g. M$ Word/Excel 2003 XML, Mediawiki, XHTML, UOF, ...)
# It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
@@ -396,8 +386,6 @@
endif
OOO_BINFILTER_ARCHS=$(filter-out arm,$(filter-out armel,$(OOO_ARCHS)))
-OOO_QA_ARCHS=$(filter-out ia64,$(OOO_ARCHS))
-
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
@@ -535,10 +523,7 @@
endif
endif
-ifneq "$(PACKAGE_QA_TOOLS)" "y"
- DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-qa-tools
-Nopenoffice.org$(VER)-qa-api-tests
CONFIGURE_FLAGS += --disable-qadevooo
-endif
ifeq "$(ENABLE_JAVA)" "y"
WRITER_W2L_DEP = openoffice.org-writer2latex
@@ -917,8 +902,8 @@
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
endif
ifeq "$(USE_SYSTEM_BSH)" "y"
- BUILD_DEPS += , bsh (>= 2.0b4-1) [$(OOO_JAVA_ARCHS)]
- COMMON_BSH_DEPENDS = bsh (>= 2.0b4-1)
+ BUILD_DEPS += , bsh (>= 2.0b4) [$(OOO_JAVA_ARCHS)]
+ COMMON_BSH_DEPENDS = bsh (>= 2.0b4)
CONFIGURE_FLAGS+= --with-system-beanshell
JAVA_GCJ_DEPENDS += , bsh-gcj
endif
@@ -1351,10 +1336,6 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mono.in
endif
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
- sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
- >> debian/control < debian/control.qa.in
-endif
ifneq "$(OOO_NPSOPLUGIN_ARCHS)" ""
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
@@ -1407,7 +1388,6 @@
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g"
debian/control
- perl -pi -e "s,%OOO_QA_ARCHS%,$(OOO_QA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BUILD_SVN%,$(OOO_BUILD_SVN)," debian/control
ifeq (he,$(findstring he,$(LANGPACKISOS)))
@@ -2132,37 +2112,6 @@
mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
$(PKGDIR)-core/usr/share/applications
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
- mkdir -p -m755 $(PKGDIR)-qa-tools/usr/bin
- install -m755 $(SOURCE_TREE)/ootestapi$(VER) $(PKGDIR)-qa-tools/usr/bin
- install -m755 $(SOURCE_TREE)/ootesttool$(VER) $(PKGDIR)-qa-tools/usr/bin
- install -m755 $(SOURCE_TREE)/oosmoketest$(VER)
$(PKGDIR)-qa-tools/usr/bin
-
- install -D -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/lib/libsalalloc_malloc.so.3
$(PKGDIR)-qa-tools/$(OOUREDIR)/lib/libsalalloc_malloc.so.3
-
- ifeq "$(ENABLE_JAVA)" "y"
- mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/program/classes
- mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
- cp $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/class/OOoRunnerLight.jar \
- $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
- ln -sf /usr/share/java/$(OODIRNAME)/OOoRunnerLight.jar \
- $(PKGDIR)-qa-tools/$(OODIR)/program/classes/OOoRunnerLight.jar
- endif
-
- mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/smoketest
- install -m755 $(SOURCE_TREE)/smoketestoo_native/smoketest.pl \
- $(SOURCE_TREE)/smoketestoo_native/testlog.pl \
- $(PKGDIR)-qa-tools/$(OODIR)/smoketest
-
- mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/presets/basic/Standard
- install -m644 $(SOURCE_TREE)/smoketestoo_native/data/scripts/*.x* \
- $(PKGDIR)-qa-tools/$(OODIR)/presets/basic/Standard
-
- # fix permission
- chmod 644 $(PKGDIR)-qa-tools/$(OODIR)/program/hid.lst
- chmod 644 $(PKGDIR)-qa-tools/$(OODIR)/program/testtoolrc
-endif
-
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
@@ -2857,56 +2806,6 @@
$(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd
cp debian/catalog.xml
$(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
- ifeq "$(ENABLE_JAVA)" "y"
- mkdir -p -m755 $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests/java
- for d in objdsc testdocs; do \
- cp -r $(SOURCE_TREE)/qadevOOo/$$d
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$d; \
- done
- endif
-
- mkdir -p -m755 $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests
- cp -r $(SOURCE_TREE)/qadevOOo/tests/basic
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests
- ifeq "$(ENABLE_JAVA)" "y"
- for d in mod ifc; do \
- cp -r $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/class/$$d
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests/java; \
- done
- endif
-
- find $(PKGDIR)-qa-api-tests -type d -name "CVS" | xargs rm -rf
- find $(PKGDIR)-qa-api-tests -type f | xargs chmod 0644
-
- ifeq "$(ENABLE_JAVA)" "y"
- echo "TestBase=java_fat" >
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props
- endif
- echo "TestBase=java_complex" >
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/complex.props
- echo "TestBase=basic_fat" >
$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
-
- echo "BASICBRIDGE=/$(OODIR)/qadevOOo/testdocs/BasicBridge.sxw" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
- echo "BASICRESPTH=/$(OODIR)/qadevOOo/tests/basic" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
-
- ifeq "$(ENABLE_JAVA)" "y"
- echo "DescriptionPath=/$(OODIR)/qadevOOo/objdsc" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props; \
- echo "TestDocumentPath=/$(OODIR)/qadevOOo/testdocs" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props; \
- echo "AppExecutionCommand=/$(OODIR)/program/soffice" \
- "-norestore -nocrashreport
-accept=socket,host=localhost,port=8100;urp;" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props
- endif
- for i in complex basic; do \
- echo "DescriptionPath=/$(OODIR)/qadevOOo/objdsc" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
- echo "TestDocumentPath=/$(OODIR)/qadevOOo/testdocs" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
- echo "AppExecutionCommand=/$(OODIR)/program/soffice" \
- "-norestore -nocrashreport
-accept=socket,host=localhost,port=8100;urp;" >> \
- $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
- done
-endif
-
# add "openoffice" symlink
cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice
