./packages/openofficeorg/3.0/experimental r1159: merge mono fixes from 2.4; disable mono until m22
------------------------------------------------------------
revno: 1159
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-07-07 02:49:43 +0200
message:
merge mono fixes from 2.4; disable mono until m22
modified:
changelog
control
control.mono.in
libuno-cli-basetypes1.0-cil.installcligac
libuno-cli-cppuhelper1.0-cil.installcligac
libuno-cli-types1.1-cil.installcligac
libuno-cli-ure1.0-cil.installcligac
rules
------------------------------------------------------------
revno: 1022.1.125
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-07-06 23:26:21 +0200
message:
oops, forgot to change this one
modified:
openoffice.org-emailmerge.postinst.in
------------------------------------------------------------
revno: 1022.1.126
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-07-07 01:30:53 +0200
message:
we need a versioned dir, and cli_cppuhelper.dll needs cli-uno-bridge...
modified:
changelog
control
control.mono.in
libuno-cli-basetypes1.0-cil.installcligac
libuno-cli-cppuhelper1.0-cil.installcligac
libuno-cli-types1.1-cil.installcligac
libuno-cli-ure1.0-cil.installcligac
rules
------------------------------------------------------------
revno: 1022.1.127
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-07-07 02:45:05 +0200
message:
pkg-config fixes again
modified:
control
control.mono.in
rules
=== modified file 'changelog'
--- a/changelog 2008-07-06 21:38:03 +0000
+++ b/changelog 2008-07-07 00:49:43 +0000
@@ -33,6 +33,7 @@
- BUILD_ONLY_EN_US=y
- remove spellchecking symlink and specify the new configure options for
specifying dictionary/hyphenation/thesauri paths.
+ - disable mono, known-broken right now, will be fixed with m22 onwards
* debian/rules, debian/control.in:
- make openoffice.org-core Pre-Depend on ure (>= 1.4+OOo3.0.0~)
(unfortunately ure didn't update it's version although 3.0.0 needs new
@@ -61,7 +62,7 @@
- remove xutils build-dep, nas was using xmkmf and it's long gone here
* debian/openoffice.org-presentation-minmizer*: update for new ID
- -- Rene Engelhard <rene@debian.org> Sun, 06 Jul 2008 23:18:26 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Jul 2008 00:51:39 +0200
openoffice.org (1:2.4.1-4.5pre) unstable; urgency=medium
@@ -81,7 +82,7 @@
to register mailmerge.py as it otherwise doesn't seem to work
(closes: #488875)
- -- Rene Engelhard <rene@debian.org> Sun, 06 Jul 2008 23:08:20 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 06 Jul 2008 23:28:58 +0200
openoffice.org (1:2.4.1-4) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-07-06 21:28:19 +0000
+++ b/control 2008-07-07 00:49:43 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc, graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 6.0.7~) , gcj-4.3 (>= 4.3.1-2) [armel] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -556,64 +556,6 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-Package: cli-uno-bridge
-Architecture: i386 sparc amd64 ia64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), ${cli:Depends}
-Conflicts: libuno-cil
-Provides: libuno-cil
-Replaces: libuno-cil
-Description: CLI binding for OpenOffice.org
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the CLI bindings to OpenOffice.org for
- accessing the OpenOffice.org API from Mono languages (e.g. C# and Boo)
- .
- Note that currently the use of Mono for add-ins & scripting inside
- OpenOffice.org is *not* yet supported.
-
-Package: libuno-cli-basetypes1.0-cil
-Architecture: all
-Depends: ${cli:Depends}
-Description: CLI-UNO bridge - base types
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_basetypes.dll, which, as the name implies, provides
- some base types.
-
-Package: libuno-cli-types1.1-cil
-Architecture: all
-Depends: ${cli:Depends}
-Description: CLI-UNO bridge - type library
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_types.dll, a CLI library which provides classes
- and interfaces for components and client programs. It is a collection of
- all UNO interfaces currently used in the office.
-
-Package: libuno-cli-cppuhelper1.0-cil
-Architecture: all
-Depends: ${cli:Depends}
-Description: CLI-UNO Bridge - bootstrapping library
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_cppuhelper.dll, a CLI library which provides
- bootstrapping code to bootstrap native UNO (use various UNO services
- implemented in different languages).
-
-Package: libuno-cli-ure1.0-cil
-Architecture: all
-Depends: ${cli:Depends}
-Description: CLI-UNO Bridge - helper classes
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_ure.dll, a CLI library which contains helper
- classes for implementing UNO interfaces.
-
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
@@ -717,10 +659,13 @@
quality as presentations designed for print."
Homepage: http://extensions.services.openoffice.org/project/PresentationMinimizer
-Package: openoffice.org-presenter-screen
+Package: openoffice.org-presenter-console
Section: misc
Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Conflicts: openoffice.org-presenter-screen
+Provides: openoffice.org-presenter-screen
+Replaces: openoffice.org-presenter-screen
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6), openoffice.org-impress (>= 1:3.0.0~bea300~dev300m6)
Enhances: openoffice.org-impress
Description: OpenOffice.org Presenter Console extension
=== modified file 'control.mono.in'
--- a/control.mono.in 2008-07-06 21:28:19 +0000
+++ b/control.mono.in 2008-07-07 00:49:43 +0000
@@ -2,7 +2,8 @@
Architecture: %OOO_MONO_ARCHS%
Depends: ${shlibs:Depends},
openoffice.orgVER-core (>> ${base-version}),
- ${cli:Depends}
+ ${cli:Depends},
+ libuno-cli-cppuhelper1.0-cil
Conflicts: libuno-cil
Provides: libuno-cil
Replaces: libuno-cil
@@ -39,7 +40,7 @@
Package: libuno-cli-cppuhelper1.0-cil
Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, cli-uno-bridge (= ${binary:Version})
Description: CLI-UNO Bridge - bootstrapping library
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'libuno-cli-basetypes1.0-cil.installcligac'
--- a/libuno-cli-basetypes1.0-cil.installcligac 2008-07-06 21:28:19 +0000
+++ b/libuno-cli-basetypes1.0-cil.installcligac 2008-07-07 00:49:43 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_basetypes.dll
+/usr/lib/cli/uno-1.0/cli_basetypes.dll
=== modified file 'libuno-cli-cppuhelper1.0-cil.installcligac'
--- a/libuno-cli-cppuhelper1.0-cil.installcligac 2008-07-06 21:28:19 +0000
+++ b/libuno-cli-cppuhelper1.0-cil.installcligac 2008-07-07 00:49:43 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_cppuhelper.dll
+/usr/lib/cli/uno-1.0/cli_cppuhelper.dll
=== modified file 'libuno-cli-types1.1-cil.installcligac'
--- a/libuno-cli-types1.1-cil.installcligac 2008-07-06 21:28:19 +0000
+++ b/libuno-cli-types1.1-cil.installcligac 2008-07-07 00:49:43 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_types.dll
+/usr/lib/cli/uno-1.1/cli_types.dll
=== modified file 'libuno-cli-ure1.0-cil.installcligac'
--- a/libuno-cli-ure1.0-cil.installcligac 2008-07-06 21:28:19 +0000
+++ b/libuno-cli-ure1.0-cil.installcligac 2008-07-07 00:49:43 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/uno/cli_ure.dll
+/usr/lib/cli/uno-1.0/cli_ure.dll
=== modified file 'rules'
--- a/rules 2008-07-06 21:28:19 +0000
+++ b/rules 2008-07-07 00:49:43 +0000
@@ -97,7 +97,7 @@
BUILD_ONLY_EN_US=y
ENABLE_JAVA=y
JDK=java-gcj-compat
-ENABLE_MONO=y
+ENABLE_MONO=n
MONO_MINVER= (>= 1.2.3)
USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
@@ -2187,8 +2187,9 @@
debian/cli-uno-bridge/$(OODIR)/program
mkdir -p debian/cli-uno-bridge/usr/lib/pkgconfig
cat debian/tmp/usr/lib/pkgconfig/mono-$(OODIRNAME).pc \
- | sed -e s,/usr/lib/mono/openoffice,/usr/lib/cli/uno,g \
- | sed -e s,/usr/lib/cli/uno/cli_uno_bridge.dll,/$(OODIR)/progam/cli_uno_bridge.dll, \
+ | sed -e s,/usr/lib/mono/openoffice,/usr/lib/cli/uno-1.0,g \
+ | sed -e s,/usr/lib/cli/uno-1.0/cli_uno_bridge.dll,/$(OODIR)/progam/cli_uno_bridge.dll, \
+ | sed -e s,/usr/lib/cli/uno-1.0/cli_types.dll,/usr/lib/cli/uno-1.1/cli_types.dll, \
> debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
endif
@@ -2877,7 +2878,7 @@
libuno-cli-cppuhelper1.0-cil libuno-cli-ure1.0-cil; do \
rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno; \
mv $(PKGDIR)-common/$(OODIR)/program/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll* \
- debian/$$i/usr/lib/cli/uno; \
+ debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
done
endif
Reply to: