./packages/openofficeorg/3.2/unstable r1875: disable arch-dep extensions for now for armel
------------------------------------------------------------
revno: 1875
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-22 01:08:19 +0100
message:
disable arch-dep extensions for now for armel
modified:
changelog
control
control.minimizer.in
control.pdfimport.in
control.postgresql.in
control.presenter.in
rules
=== modified file 'changelog'
--- a/changelog 2010-03-19 21:37:26 +0000
+++ b/changelog 2010-03-22 00:08:19 +0000
@@ -17,7 +17,7 @@
* debian/rules:
- re-enable system-mysqlcppconn (also in the STLport case); handle
MYSQLC_STATUS suffix in version.mk
- - re-enable armel
+ - re-enable armel, disable arch-dep extensions for it now, though
- fix build with 1.0 source format. Add missing uuencode for the extra
"3.0 (quilt)" components. Use "normal" quilt for patching, add build-dep
- disable system-boost on lenny
=== modified file 'control'
--- a/control 2010-03-19 21:37:26 +0000
+++ b/control 2010-03-22 00:08:19 +0000
@@ -3523,7 +3523,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa armel alpha
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa alpha
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 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa armel alpha
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa alpha
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 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa armel alpha
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa alpha
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 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa armel alpha
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa alpha
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-01-28 09:39:07 +0000
+++ b/control.minimizer.in 2010-03-22 00:08:19 +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-01-28 09:39:07 +0000
+++ b/control.pdfimport.in 2010-03-22 00:08:19 +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-01-28 09:39:07 +0000
+++ b/control.postgresql.in 2010-03-22 00:08:19 +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-01-31 23:32:35 +0000
+++ b/control.presenter.in 2010-03-22 00:08:19 +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-03-19 21:37:26 +0000
+++ b/rules 2010-03-22 00:08:19 +0000
@@ -460,6 +460,8 @@
OOO_GCJ_JDK_ARCHS := ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out m68k armel,$(OOO_ARCHS))
+
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -1698,6 +1700,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: