------------------------------------------------------------
revno: 1146
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-07-03 10:21:43 +0200
message:
* debian/rules, debian/control.mono.in, debian/*.installcligac: split
cli_*dll in various subpackages to make the packages CLI policy
complicant.
Rename libuno-cil to cli-uno-bridge.
added:
libuno-cli-basetypes1.0-cil.installcligac.in
libuno-cli-cppuhelper1.0-cil.installcligac.in
libuno-cli-types1.1-cil.installcligac.in
libuno-cli-ure1.0-cil.installcligac.in
renamed:
libuno-cil.installcligac.in => cli-uno-bridge.installcligac.in
libuno-cil.lintian-overrides => cli-uno-bridge.lintian-overrides
modified:
changelog
control
control.mono.in
rules
cli-uno-bridge.installcligac.in
cli-uno-bridge.lintian-overrides
------------------------------------------------------------
revno: 1134.1.1
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: mono
timestamp: Tue 2008-07-01 02:10:04 +0200
message:
make more compliant with mono policy
added:
libuno-cli-basetypes1.0-cil.installcligac.in
libuno-cli-cppuhelper1.0-cil.installcligac.in
libuno-cli-types1.1-cil.installcligac.in
libuno-cli-ure1.0-cil.installcligac.in
renamed:
libuno-cil.installcligac.in => cli-uno-bridge.installcligac.in
libuno-cil.lintian-overrides => cli-uno-bridge.lintian-overrides
modified:
changelog
control
control.mono.in
rules
cli-uno-bridge.installcligac.in
cli-uno-bridge.lintian-overrides
------------------------------------------------------------
revno: 1134.1.2
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: mono
timestamp: Wed 2008-07-02 23:06:28 +0200
message:
descriptions
modified:
control.mono.in
------------------------------------------------------------
revno: 1134.1.3
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: mono
timestamp: Wed 2008-07-02 23:35:12 +0200
message:
dll of course
modified:
control.mono.in
=== modified file 'changelog'
--- a/changelog 2008-07-02 19:56:30 +0000
+++ b/changelog 2008-07-03 08:21:43 +0000
@@ -67,6 +67,9 @@
- remove xutils build-dep, nas was using xmkmf and it's long gone here
* debian/openoffice.org-emailmerge*: unopkg add --shared mailmerge.py
(closes: #488875)
+ * debian/rules, debian/control.mono.in, debian/*.installcligac: split
+ cli_*dll in various subpackages to make the packages CLI policy complicant.
+ Rename libuno-cil to cli-uno-bridge.
-- Rene Engelhard <[EMAIL PROTECTED]> Wed, 02 Jul 2008 21:54:49 +0200
=== renamed file 'libuno-cil.installcligac.in' =>
'cli-uno-bridge.installcligac.in'
--- a/libuno-cil.installcligac.in 2008-02-13 14:12:57 +0000
+++ b/cli-uno-bridge.installcligac.in 2008-07-01 00:10:04 +0000
@@ -1,5 +1,1 @@
-/@OODIR@/program/cli_basetypes.dll
-/@OODIR@/program/cli_cppuhelper.dll
-/@OODIR@/program/cli_types.dll
/@OODIR@/program/cli_uno_bridge.dll
-/@OODIR@/program/cli_ure.dll
=== renamed file 'libuno-cil.lintian-overrides' =>
'cli-uno-bridge.lintian-overrides'
--- a/libuno-cil.lintian-overrides 2008-03-13 22:11:47 +0000
+++ b/cli-uno-bridge.lintian-overrides 2008-07-01 00:10:04 +0000
@@ -1,1 +1,1 @@
-libuno-cil: binary-or-shlib-defines-rpath
+cli-uno-bridge: binary-or-shlib-defines-rpath
=== modified file 'control'
--- a/control 2008-07-02 19:56:30 +0000
+++ b/control 2008-07-03 08:21:43 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-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 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.4.4) [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) , 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-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,9 +556,12 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-Package: libuno-cil
+Package: cli-uno-bridge
Architecture: i386 sparc amd64 ia64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}),
mono-gac, ${cli:Depends}
+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.
@@ -569,6 +572,48 @@
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
=== modified file 'control.mono.in'
--- a/control.mono.in 2007-10-15 12:45:38 +0000
+++ b/control.mono.in 2008-07-02 21:35:12 +0000
@@ -1,9 +1,11 @@
-Package: libuno-cil
+Package: cli-uno-bridge
Architecture: %OOO_MONO_ARCHS%
Depends: ${shlibs:Depends},
openoffice.orgVER-core (>> ${base-version}),
- mono-gac,
${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.
@@ -14,3 +16,45 @@
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.
+
=== added file 'libuno-cli-basetypes1.0-cil.installcligac.in'
--- a/libuno-cli-basetypes1.0-cil.installcligac.in 1970-01-01 00:00:00
+0000
+++ b/libuno-cli-basetypes1.0-cil.installcligac.in 2008-07-01 00:10:04
+0000
@@ -0,0 +1,1 @@
+/@OODIR@/program/cli_basetypes.dll
=== added file 'libuno-cli-cppuhelper1.0-cil.installcligac.in'
--- a/libuno-cli-cppuhelper1.0-cil.installcligac.in 1970-01-01 00:00:00
+0000
+++ b/libuno-cli-cppuhelper1.0-cil.installcligac.in 2008-07-01 00:10:04
+0000
@@ -0,0 +1,1 @@
+/@OODIR@/program/cli_cppuhelper.dll
=== added file 'libuno-cli-types1.1-cil.installcligac.in'
--- a/libuno-cli-types1.1-cil.installcligac.in 1970-01-01 00:00:00 +0000
+++ b/libuno-cli-types1.1-cil.installcligac.in 2008-07-01 00:10:04 +0000
@@ -0,0 +1,1 @@
+/@OODIR@/program/cli_types.dll
=== added file 'libuno-cli-ure1.0-cil.installcligac.in'
--- a/libuno-cli-ure1.0-cil.installcligac.in 1970-01-01 00:00:00 +0000
+++ b/libuno-cli-ure1.0-cil.installcligac.in 2008-07-01 00:10:04 +0000
@@ -0,0 +1,1 @@
+/@OODIR@/program/cli_ure.dll
=== modified file 'rules'
--- a/rules 2008-07-03 03:16:14 +0000
+++ b/rules 2008-07-03 08:21:43 +0000
@@ -664,7 +664,7 @@
ifneq "$(OOO_MONO_ARCHS)" ""
# mono-gmcs for gmcs itself and mkbundle2
# mono-mcs for mcs itself and al
- BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs
$(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER)
[$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)],
cli-common-dev (>= 0.4.4) [$(OOO_MONO_ARCHS)], mono-1.0-devel
[$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
+ BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs
$(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER)
[$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)],
cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)], mono-1.0-devel
[$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
BUILD_DEPS += , mono-jit (>= 1.9.1+dfsg-2) [amd64]
endif
ifeq "$(ENABLE_MONO)" "y"
@@ -1145,7 +1145,7 @@
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
rm -f debian/*script.bug
- rm -f debian/libuno-cil.installcligac
+ rm -f debian/*.installcligac
rm -f debian/scripts/aotcompile.py*
ifeq "$(ENABLE_MONO)" "y"
@@ -1637,7 +1637,7 @@
# to install them later in install-arch
ifeq "$(ENABLE_MONO)" "y"
cd debian/tmp/pkg; \
- mv openoffice.org-common/$(OODIR)/program/cli_*.dll* \
+ 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; \
@@ -2180,18 +2180,17 @@
ifeq "$(ENABLE_MONO)" "y"
# Mono bindings
- mkdir -p -m755 debian/libuno-cil/$(OODIR)/program
+ 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/libuno-cil/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/cli_*.dll \
- debian/libuno-cil/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/cli_*.config \
- debian/libuno-cil/$(OODIR)/program
- mkdir -p debian/libuno-cil/usr/lib/mono
- mkdir -p debian/libuno-cil/usr/lib/pkgconfig
+ 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,/$(OODIR)/program,g \
- > debian/libuno-cil/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
+ > debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
endif
ifeq "$(PACKAGE_SDK)" "y"
@@ -2874,10 +2873,19 @@
# fix permission
chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+ifeq "$(ENABLE_MONO)" "y"
+ for i in libuno-cli-basetypes1.0-cil libuno-cli-types1.1-cil \
+ libuno-cli-cppuhelper1.0-cil libuno-cli-ure1.0-cil; do \
+ rm -rf debian/$$i && mkdir -p -m755
debian/$$i/$(OODIR)/program; \
+ 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/$(OODIR)/program; \
+ done
+endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control
$(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control
$(STAMP_DIR)/maintscripts $(STAMP_DIR)/binary-indep
dh_testdir
dh_testroot
@@ -2927,8 +2935,9 @@
dh_icons -s
endif
ifeq "$(ENABLE_MONO)" "y"
- cat debian/libuno-cil.installcligac.in | \
- sed -e s,@OODIR@,$(OODIR), > debian/libuno-cil.installcligac
+ for i in debian/*installcligac.in; do \
+ cat $$i | sed -e s,@OODIR@,$(OODIR), > debian/`basename $$i
.in`; \
+ done
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
@@ -2989,7 +2998,7 @@
> debian/openoffice.org$(VER)-pdfimport.substvars
endif
ifeq "$(ENABLE_MONO)" "y"
- dh_makeclilibs -s -V
+ dh_makeclilibs -s
dh_clideps -s
endif
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
@@ -3119,10 +3128,24 @@
dh_icons -i
endif
dh_installxmlcatalogs -i
+ifeq "$(ENABLE_MONO)" "y"
+ for i in debian/*installcligac.in; do \
+ cat $$i | sed -e s,@OODIR@,$(OODIR), > debian/`basename $$i
.in`; \
+ done
+ dh_installcligac -i
+endif
dh_compress -X.py -X.mk -X.sxd
dh_installdeb -i
+ifeq "$(ENABLE_MONO)" "y"
+ dh_makeclilibs -i
+ dh_clideps -i
+endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) -Nlibpcvslib-perl \
- -Nopenoffice.org$(VER)-wiki-publisher -- \
+ -Nopenoffice.org$(VER)-wiki-publisher \
+ -Nlibuno-cli-basetypes1.0-cil \
+ -Nlibuno-cli-types1.1-cil \
+ -Nlibuno-cli-cppuhelper1.0-cil \
+ -Nlibuno-cli-ure1.0-cil -- \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
@@ -3132,6 +3155,18 @@
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
+ifeq "$(ENABLE_MONO)" "y"
+ # although this version gets increased before every OOo release
+ # we need the +OOo anyway when we build milestones..
+ dh_gencontrol -plibuno-cli-basetypes1.0-cil -- \
+ -v$(shell grep CLI_BASETYPES_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+ dh_gencontrol -plibuno-cli-types1.1-cil -- \
+ -v$(shell grep CLI_TYPES_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+ dh_gencontrol -plibuno-cli-cppuhelper1.0-cil -- \
+ -v$(shell grep CLI_CPPUHELPER_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+ dh_gencontrol -plibuno-cli-ure1.0-cil -- \
+ -v$(shell grep CLI_URE_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -popenoffice.org$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
