./packages/openofficeorg/3.2/unstable r1929: GAH, I missed that armel has broken arch-dep extensions, Reintroduce %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
------------------------------------------------------------
revno: 1929
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-04-12 00:00:36 +0200
message:
GAH, I missed that armel has broken arch-dep extensions, Reintroduce %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
modified:
changelog
control
control.minimizer.in
control.pdfimport.in
control.postgresql.in
control.presenter.in
rules
=== modified file 'changelog'
--- a/changelog 2010-04-09 21:04:50 +0000
+++ b/changelog 2010-04-11 22:00:36 +0000
@@ -18,9 +18,12 @@
build time
- the mozilla plugin is broken on 64 bit archs; (temporarily) disable it
on those until fixed
- * debian/scripts/vars.s390x: add, we have S390X conditionals in rule after all
+ * debian/scripts/vars.s390x: add, we have S390X conditionals in rules
+ after all
+ * debian/rules, debian/control*in: GAH, I missed that armel has broken
+ arch-dep extensions, Reintroduce %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
- -- Rene Engelhard <rene@debian.org> Fri, 09 Apr 2010 23:02:59 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 11 Apr 2010 23:54:49 +0200
openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-09 21:04:50 +0000
+++ b/control 2010-04-11 22:00:36 +0000
@@ -3523,7 +3523,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3), openoffice.org-impress, ${misc:Depends}
Enhances: openoffice.org-impress
@@ -3543,7 +3543,7 @@
Package: openoffice.org-presenter-console
Section: misc
-Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
Conflicts: openoffice.org-presenter-screen, ure (<< 1.5.1+OOo3.1.1-15)
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
@@ -3571,7 +3571,7 @@
Package: openoffice.org-pdfimport
Section: misc
Priority: extra
-Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -3683,7 +3683,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
-Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), ${misc:Depends}
Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212), openoffice.org-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15)
=== modified file 'control.minimizer.in'
--- a/control.minimizer.in 2010-04-06 15:42:25 +0000
+++ b/control.minimizer.in 2010-04-11 22:00:36 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-presentation-minimizer
Section: misc
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 2.3), openoffice.orgVER-impress,
${misc:Depends}
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2010-04-06 15:42:25 +0000
+++ b/control.pdfimport.in 2010-04-11 22:00:36 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-pdfimport
Section: misc
Priority: extra
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6),
${misc:Depends}
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2010-04-06 15:42:25 +0000
+++ b/control.postgresql.in 2010-04-11 22:00:36 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2010-04-06 15:42:25 +0000
+++ b/control.presenter.in 2010-04-11 22:00:36 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-presenter-console
Section: misc
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Conflicts: openoffice.orgVER-presenter-screen, ure (<< 1.5.1+OOo3.1.1-15)
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
=== modified file 'rules'
--- a/rules 2010-04-09 21:04:50 +0000
+++ b/rules 2010-04-11 22:00:36 +0000
@@ -460,6 +460,8 @@
OOO_GCJ_JDK_ARCHS := hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out armel,$(OOO_ARCHS))
+
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -1697,6 +1699,7 @@
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_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
ifeq (he,$(findstring he,$(LANGPACKISOS)))
perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control
Reply to: