./packages/openofficeorg/2.4.1/unstable r1227: make policy compliant and mention kde-open-url fix....
------------------------------------------------------------
revno: 1227
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-01 14:55:13 +0000
+++ b/changelog 2008-12-03 16:32:04 +0000
@@ -1,10 +1,12 @@
openoffice.org (1:2.4.1-13.14pre) unstable; urgency=high
+ * ooo-build:
+ - sensible-browser.diff: really fix typo (closes: #505429)
* debian/rules:
- add hackaround to use ENABLE_QA_TOOLS=n on ia64 as "jar" segfaults
there (and only there) (closes: #507135)
- -- Rene Engelhard <rene@debian.org> Mon, 01 Dec 2008 15:53:44 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 03 Dec 2008 09:30:50 +0100
openoffice.org (1:2.4.1-13) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-11-25 12:00:45 +0000
+++ b/control 2008-12-03 16:32:04 +0000
@@ -3101,7 +3101,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 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel armel s390 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 14:55:13 +0000
+++ b/rules 2008-12-03 16:32:04 +0000
@@ -326,6 +326,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-
@@ -1243,6 +1245,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: