./packages/openofficeorg/3.0/experimental r1203: update mono install and reenable the mono packages
------------------------------------------------------------
revno: 1203
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-07-30 21:16:08 +0200
message:
update mono install and reenable the mono packages
modified:
changelog
cli-uno-bridge.installcligac
control
control.in
libuno-cli-basetypes1.0-cil.installcligac
libuno-cli-cppuhelper1.0-cil.installcligac
libuno-cli-oootypes1.0-cil.installcligac
libuno-cli-ure1.0-cil.installcligac
libuno-cli-uretypes1.0-cil.installcligac
rules
=== modified file 'changelog'
--- a/changelog 2008-07-30 14:17:40 +0000
+++ b/changelog 2008-07-30 19:16:08 +0000
@@ -6,7 +6,7 @@
editable) (closes: #490549)
- package-ooo: fix install to make help land properly in -help-xx.
* ooo-build:
- - update (r13437)
+ - update (r13440)
* debian/rules:
- Add SYSTEM_LUCENE conditional
- Add SYSTEM_REDLAND conditional
@@ -31,7 +31,10 @@
- -style-andromeda is back (contains the "Classic" theme)
- split kab support into -kab to not make -kde depend on kdepimlibs5
* debian/rules, debian/control.mono.in: update for cli_types.dll split due
- to the three layer OOo; Section: libs to fix override disparity
+ to the three layer OOo; Section: libs to fix override disparity. Install
+ more (upstream-generated) .config and policy* files. Don't make ure
+ contain/depend on cli*dll as that would make all OOo packages depend on
+ mono and people might not need it
* debian/control.in:
- Standards-Version: 3.8.0 (already following it)
- fix -andromedas Replaces:
@@ -44,7 +47,7 @@
openoffice.org-headless.lintian-overrides: libvclplug_svp is now in
-coreXY upstream. Follow.
- -- Rene Engelhard <rene@debian.org> Wed, 30 Jul 2008 02:24:59 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 30 Jul 2008 20:43:58 +0200
openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
=== modified file 'cli-uno-bridge.installcligac'
--- a/cli-uno-bridge.installcligac 2008-07-06 21:28:19 +0000
+++ b/cli-uno-bridge.installcligac 2008-07-30 19:16:08 +0000
@@ -1,1 +1,1 @@
-/usr/lib/openoffice/program/cli_uno_bridge.dll
+/usr/lib/ure/lib/cli_uno_bridge.dll
=== modified file 'control'
--- a/control 2008-07-30 15:12:18 +0000
+++ b/control 2008-07-30 19:16:08 +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) , 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 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , 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 , kdelibs5-dev (>= 4:3.4.3-2) , kdepimlibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2+ds1-2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , 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 , librdf0-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) , 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 ia64 ppc64], libgcj-bc [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , 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 , kdelibs5-dev (>= 4:3.4.3-2) , kdepimlibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2+ds1-2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , 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 , librdf0-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.8.0
XS-Python-Version: current
@@ -16,7 +16,7 @@
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
-Conflicts: openoffice.org2 (<< ${Source-Version}),
+Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
Description: OpenOffice.org Office suite
@@ -3099,6 +3099,79 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
+Package: cli-uno-bridge
+Section: libs
+Architecture: i386 sparc amd64 ia64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${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
+Section: libs
+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-uretypes1.0-cil
+Section: libs
+Architecture: all
+Depends: ${cli:Depends}
+Description: CLI-UNO bridge - URE 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_uretypes.dll, a CLI library which provides classes
+ and interfaces for components and client programs. It contains the URE types.
+
+Package: libuno-cli-oootypes1.0-cil
+Section: libs
+Architecture: all
+Depends: ${cli:Depends}
+Description: CLI-UNO bridge - office 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_oootypes.dll, a CLI library which provides classes
+ and interfaces for components and client programs. It contains the OOo types.
+
+Package: libuno-cli-cppuhelper1.0-cil
+Section: libs
+Architecture: all
+Depends: ${cli:Depends}, cli-uno-bridge
+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
+Section: libs
+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
=== modified file 'control.in'
--- a/control.in 2008-07-29 01:10:06 +0000
+++ b/control.in 2008-07-30 19:16:08 +0000
@@ -93,7 +93,7 @@
graphicsmagick-imagemagick-compat | imagemagick,
libpaper-utils,
${gstreamer-plugins-suggests}
-Conflicts: openoffice.org2 (<< ${Source-Version}),
+Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
Description: OpenOffice.org Office suite
=== modified file 'libuno-cli-basetypes1.0-cil.installcligac'
--- a/libuno-cli-basetypes1.0-cil.installcligac 2008-07-07 00:49:43 +0000
+++ b/libuno-cli-basetypes1.0-cil.installcligac 2008-07-30 19:16:08 +0000
@@ -1,1 +1,2 @@
/usr/lib/cli/uno-1.0/cli_basetypes.dll
+/usr/lib/cli/uno-1.0/policy.1.0.cli_basetypes.dll
=== modified file 'libuno-cli-cppuhelper1.0-cil.installcligac'
--- a/libuno-cli-cppuhelper1.0-cil.installcligac 2008-07-07 00:49:43 +0000
+++ b/libuno-cli-cppuhelper1.0-cil.installcligac 2008-07-30 19:16:08 +0000
@@ -1,1 +1,2 @@
/usr/lib/cli/uno-1.0/cli_cppuhelper.dll
+/usr/lib/cli/uno-1.0/policy.1.0.cli_cppuhelper.dll
=== modified file 'libuno-cli-oootypes1.0-cil.installcligac'
--- a/libuno-cli-oootypes1.0-cil.installcligac 2008-07-17 01:27:30 +0000
+++ b/libuno-cli-oootypes1.0-cil.installcligac 2008-07-30 19:16:08 +0000
@@ -1,1 +1,2 @@
/usr/lib/cli/uno-1.0/cli_oootypes.dll
+/usr/lib/cli/uno-1.0/policy.1.0.cli_oootypes.dll
=== modified file 'libuno-cli-ure1.0-cil.installcligac'
--- a/libuno-cli-ure1.0-cil.installcligac 2008-07-07 00:49:43 +0000
+++ b/libuno-cli-ure1.0-cil.installcligac 2008-07-30 19:16:08 +0000
@@ -1,1 +1,2 @@
/usr/lib/cli/uno-1.0/cli_ure.dll
+/usr/lib/cli/uno-1.0/policy.1.0.cli_ure.dll
=== modified file 'libuno-cli-uretypes1.0-cil.installcligac'
--- a/libuno-cli-uretypes1.0-cil.installcligac 2008-07-17 01:27:30 +0000
+++ b/libuno-cli-uretypes1.0-cil.installcligac 2008-07-30 19:16:08 +0000
@@ -1,1 +1,2 @@
/usr/lib/cli/uno-1.0/cli_uretypes.dll
+/usr/lib/cli/uno-1.0/policy.1.0.cli_uretypes.dll
=== modified file 'rules'
--- a/rules 2008-07-30 15:12:18 +0000
+++ b/rules 2008-07-30 19:16:08 +0000
@@ -97,7 +97,7 @@
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
JDK=java-gcj-compat
-ENABLE_MONO=n
+ENABLE_MONO=y
MONO_MINVER= (>= 1.2.3)
USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
@@ -1651,16 +1651,24 @@
mv openoffice.org-common/$(OODIR)/program/*.so \
openoffice.org-dev/$(OODIR)/program
- # somehow, these go into -common. Move them to -core here to be able
- # to install them later in install-arch
ifeq "$(ENABLE_MONO)" "y"
cd debian/tmp/pkg; \
- mv openoffice.org-common/$(OODIR)/program/cli_uno_bridge.dll* \
- openoffice.org-core/$(OODIR)/program
- if [ -d openoffice.org-common/$(OODIR)/program/assembly ]; then \
- rm -rf openoffice.org-common/$(OODIR)/program/assembly; \
- fi
+ mkdir -p openoffice.org-core/$(OOBRANDDIR)/ure/lib; \
+ mv openoffice.org-common/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll* \
+ openoffice.org-core/$(OOBRANDDIR)/ure/lib
+ for i in `dh_listpackages | grep libuno-cli`; do \
+ if echo "$$i" | grep -q oootypes; then p=openoffice.org-common; d=$(OODIR)/program; \
+ else p=ure; d=$(OOBRANDDIR)/ure/lib; fi; \
+ rm -rf debian/tmp/pkg/$$i && mkdir -p -m755 debian/tmp/pkg/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
+ mv debian/tmp/pkg/$$p/$$d/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll \
+ debian/tmp/pkg/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
+ mv debian/tmp/pkg/$$p/$$d/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.config \
+ debian/tmp/pkg/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
+ mv debian/tmp/pkg/$$p/$$d/policy.*.`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll \
+ debian/tmp/pkg/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
+ done
endif
+
ifeq "$(PACKAGE_QA_TOOLS)" "y"
cd debian/tmp/pkg; \
mv openoffice.org-common/$(OODIR)/program/testtoolrc \
@@ -2210,17 +2218,17 @@
ifeq "$(ENABLE_MONO)" "y"
# Mono bindings
- mkdir -p -m755 debian/cli-uno-bridge/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/cli_uno_bridge.dll \
- debian/cli-uno-bridge/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/cli_uno_bridge.dll.config \
- debian/cli-uno-bridge/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/libcli* \
- debian/cli-uno-bridge/$(OODIR)/program
+ mkdir -p -m755 debian/cli-uno-bridge/$(OOUREDIR)/lib
+ mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll \
+ debian/cli-uno-bridge/$(OOUREDIR)/lib
+ mv debian/tmp/$(OODIR)/program/cli_uno_bridge.dll.config \
+ debian/cli-uno-bridge/$(OOUREDIR)/lib
+ mv debian/ure/$(OOUREDIR)/lib/libcli* \
+ debian/cli-uno-bridge/$(OOUREDIR)/lib
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-1.0,g \
- | sed -e s,/usr/lib/cli/uno-1.0/cli_uno_bridge.dll,/$(OODIR)/program/cli_uno_bridge.dll, \
+ | sed -e s,/usr/lib/cli/uno-1.0/cli_uno_bridge.dll,/$(OOUREDIR)/lib/cli_uno_bridge.dll, \
> debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
endif
@@ -2877,6 +2885,14 @@
zip -d $(CURDIR)/$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/install/wiki-publisher.oxt license/THIRDPARTYLICENSEREADME.html
endif
+ifeq "$(ENABLE_MONO)" "y"
+ for i in `dh_listpackages -i | grep libuno-cli`; do \
+ rm -rf debian/$$i; \
+ cp -ra debian/tmp/pkg/$$i \
+ debian/$$i; \
+ done
+endif
+
for i in $(ARCH_INDEP_PACKAGES); do \
install -D -m644 debian/presubj \
debian/$$i/usr/share/bug/$$i/presubj; \
@@ -2907,16 +2923,6 @@
# fix permission
chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
-ifeq "$(ENABLE_MONO)" "y"
- for i in libuno-cli-basetypes1.0-cil libuno-cli-uretypes1.0-cil \
- libuno-cli-oootypes1.0-cil libuno-cli-cppuhelper1.0-cil \
- libuno-cli-ure1.0-cil; do \
- rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
- 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-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
- done
-endif
-
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
Reply to: