./packages/openofficeorg/3.2/unstable r1912: update cws-linuxaxp01.diff, re-enable arch-dep extensions for m68k, remove obsolete variable
------------------------------------------------------------
revno: 1912
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-04-06 17:42:25 +0200
message:
update cws-linuxaxp01.diff, re-enable arch-dep extensions for m68k, remove obsolete variable
modified:
changelog
control
control.minimizer.in
control.pdfimport.in
control.postgresql.in
control.presenter.in
patches/cws-linuxaxp01.diff
rules
=== modified file 'changelog'
--- a/changelog 2010-04-06 08:07:21 +0000
+++ b/changelog 2010-04-06 15:42:25 +0000
@@ -1,16 +1,20 @@
openoffice.org (1:3.2.0-6) UNRELEASED; urgency=low
+ * debian/patches/cws-linuxaxp01.diff: update
* debian/rules:
- remove obsolete filter-out for mysqlcppconn--dve builddep so it
actually gets added for i386...
- add -F0 to QUILT_OPTIONS
+ - re-enable arch-dep extensions for m68k
+ * debian/rules, debian/control*in: remove %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+ again
- -- Rene Engelhard <rene@debian.org> Tue, 06 Apr 2010 10:06:18 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 06 Apr 2010 10:07:23 +0200
openoffice.org (1:3.2.0-5) unstable; urgency=low
* ooo-build:
- - update (3.2.0.9)
+ - update (3.2.0.9)
- branch_directly_to_cpp_vtable_call_on_arm.diff: adds
ARM bridges fix from issue 105359
=== modified file 'control'
--- a/control 2010-04-06 08:06:13 +0000
+++ b/control 2010-04-06 15:42:25 +0000
@@ -3523,7 +3523,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Architecture: i386 mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel 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 mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel 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 mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel 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 mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel 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-03-22 00:08:19 +0000
+++ b/control.minimizer.in 2010-04-06 15:42:25 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-presentation-minimizer
Section: misc
-Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+Architecture: %OOO_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-03-22 00:08:19 +0000
+++ b/control.pdfimport.in 2010-04-06 15:42:25 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-pdfimport
Section: misc
Priority: extra
-Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+Architecture: %OOO_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-03-22 00:08:19 +0000
+++ b/control.postgresql.in 2010-04-06 15:42:25 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
-Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+Architecture: %OOO_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-03-22 00:08:19 +0000
+++ b/control.presenter.in 2010-04-06 15:42:25 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-presenter-console
Section: misc
-Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+Architecture: %OOO_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 'patches/cws-linuxaxp01.diff'
--- a/patches/cws-linuxaxp01.diff 2010-03-29 12:53:07 +0000
+++ b/patches/cws-linuxaxp01.diff 2010-04-06 15:42:25 +0000
@@ -36,7 +36,7 @@
libwpd-testing.diff
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/cws-linuxaxp01.diff 2010-03-18 17:45:45.000000000 +0100
-@@ -0,0 +1,1955 @@
+@@ -0,0 +1,1969 @@
+diff -r f387649cb501 automation/source/testtool/objtest.cxx
+--- automation/source/testtool/objtest.cxx Fri Mar 12 15:32:45 2010 +0100
++++ automation/source/testtool/objtest.cxx Mon Mar 15 16:00:09 2010 +0000
@@ -1929,22 +1929,36 @@
+# Parent ec31c94b80f964365b6d9e1f63e9bdac1d88c9b1
+linuxaxp01: #i110145# yet another hard-coded list to fall over
+
++changeset 0b056a7d1510 in cws/linuxaxp01
++details: http://hg.services.openoffice.org/cws/linuxaxp01?cmd=changeset;node=0b056a7d1510
++author: Caolán McNamara <cmc@openoffice.org>
++date: Tue, 30 Mar 2010 10:43:30 +0100
++summary: linuxaxp01: #i110145# add Linux m68k to this list
++
++
+diff -r ec31c94b80f9 -r 33875dd3d07b desktop/source/deployment/misc/dp_platform.cxx
-+--- desktop/source/deployment/misc/dp_platform.cxx Thu Mar 18 11:03:29 2010 +0000
-++++ desktop/source/deployment/misc/dp_platform.cxx Fri Mar 19 14:44:49 2010 +0000
-+@@ -49,6 +49,8 @@
++--- desktop/source/deployment/misc/dp_platform.cxx Thu Mar 18 11:03:29 2010 +0000
+++++ desktop/source/deployment/misc/dp_platform.cxx Fri Mar 19 14:44:49 2010 +0000
++@@ -49,6 +49,9 @@
+ #define PLATFORM_LINUX_IA64 "linux_ia64"
+++#define PLATFORM_LINUX_M68K "linux_m68k"
+ #define PLATFORM_LINUX_S390 "linux_s390"
+ #define PLATFORM_LINUX_S390x "linux_s390x"
++#define PLATFORM_LINUX_HPPA "linux_hppa"
++#define PLATFORM_LINUX_ALPHA "linux_alpha"
-+
-+
-+
-+@@ -146,6 +148,10 @@
-+ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390"));
++
++
++
++@@ -142,10 +142,16 @@
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB"));
++ else if (token.equals(OUSTR(PLATFORM_LINUX_IA64)))
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64"));
+++ else if (token.equals(OUSTR(PLATFORM_LINUX_M68K)))
+++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K"));
++ else if (token.equals(OUSTR(PLATFORM_LINUX_S390)))
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390"));
+ else if (token.equals(OUSTR(PLATFORM_LINUX_S390x)))
-+ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
++ else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA)))
++ ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA"));
++ else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA)))
=== modified file 'rules'
--- a/rules 2010-04-06 08:07:21 +0000
+++ b/rules 2010-04-06 15:42:25 +0000
@@ -455,8 +455,6 @@
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 m68k armel,$(OOO_ARCHS))
-
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -1687,7 +1685,6 @@
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: