./packages/openofficeorg/3.0/experimental r1328: merge
------------------------------------------------------------
revno: 1328
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-12-03 21:12:36 +0100
message:
merge
modified:
changelog
control
control.qa.in
rules
------------------------------------------------------------
revno: 1022.1.205
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-12-03 17:32:04 +0100
message:
make policy compliant and mention kde-open-url fix....
modified:
changelog
control
control.qa.in
rules
=== modified file 'changelog'
--- a/changelog 2008-12-02 22:06:38 +0000
+++ b/changelog 2008-12-03 20:12:36 +0000
@@ -11,8 +11,8 @@
-gnomes description ((GNOME) VFS -> GIO)
- add hackaround to use ENABLE_QA_TOOLS=n on ia64 as "jar" segfaults
there (and only there) (closes: #507135)
-
- -- Rene Engelhard <rene@debian.org> Tue, 02 Dec 2008 23:04:57 +0100
+
+ -- Rene Engelhard <rene@debian.org> Wed, 03 Dec 2008 21:07:08 +0100
openoffice.org (1:3.0.0-5) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-11-30 22:46:58 +0000
+++ b/control 2008-12-03 20:12:36 +0000
@@ -3181,7 +3181,7 @@
Suggests: ${java-runtime-depends}
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
-Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+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.
=== modified file 'control.qa.in'
--- a/control.qa.in 2008-10-13 11:34:14 +0000
+++ b/control.qa.in 2008-12-03 16:32:04 +0000
@@ -10,7 +10,7 @@
Suggests: ${java-runtime-depends}
Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
-Architecture: %OOO_ARCHS%
+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.
=== modified file 'rules'
--- a/rules 2008-12-01 22:10:51 +0000
+++ b/rules 2008-12-03 20:12:36 +0000
@@ -354,6 +354,8 @@
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-
@@ -1350,7 +1352,7 @@
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)))
Reply to: