The following commit has been merged in the debian-experimental-3.5 branch:
commit f1e941eaf5d99689f2f3b5f73ca8c0dcc609101f
Author: Rene Engelhard <[email protected]>
Date: Thu Oct 20 21:48:50 2011 +0000
the mono stuff is not in "normal" LibO, so gone (at least for now)
diff --git a/control b/control
index 909f126..36fb93a 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev,
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, git, rsync,
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libpoppler-cpp-dev,
libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1),
libjpeg-dev, libxml2-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12), openj
dk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa
kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64
kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0),
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~),
xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (
>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64
>kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64
>kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64
>kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64
>kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
>libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev
>(>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>=
>2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev,
>libcmis-dev, libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev
>(>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev
>(>= 1.1.0~r791), libgtk-3-dev, libebook1.2-dev [!armel], libpq-dev (>= 9.0~),
>libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh
>(>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1),
>libsuitesparse-dev (>= 1:3.4.0),
libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10),
libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev,
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, git, rsync,
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libpoppler-cpp-dev,
libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1),
libjpeg-dev, libxml2-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12), openj
dk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa
kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64
kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0),
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~),
xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (
>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
>libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev
>(>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>=
>2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev,
>libcmis-dev, libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev
>(>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev
>(>= 1.1.0~r791), libgtk-3-dev, libebook1.2-dev [!armel], libpq-dev (>= 9.0~),
>libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh
>(>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1),
>libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60),
>libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
>1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
>liborbit2-dev, gettext, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -3109,77 +3109,6 @@ Description: office productivity suite -- Java libraries
for GIJ
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-Package: cli-uno-bridge
-Section: cli-mono
-Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, libreoffice-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}, ${misc:Depends}
-Conflicts: libuno-cil, libuno-cli-types1.1-cil
-Provides: libuno-cil
-Replaces: libuno-cil
-Description: LibreOffice bindings for Mono CLI
- LibreOffice 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 LibreOffice for
- accessing the LibreOffice API from Mono languages (e.g. C# and Boo) and
- for using Mono for components.
-
-Package: libuno-cli-basetypes1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- base types
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- URE type library
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- LibreOffice type library
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, cli-uno-bridge, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- bootstrapping library
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- helper classes
- LibreOffice 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: mozilla-libreoffice
Section: net
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/control.mono.in b/control.mono.in
deleted file mode 100644
index 15ae02a..0000000
--- a/control.mono.in
+++ /dev/null
@@ -1,84 +0,0 @@
-Package: cli-uno-bridge
-Section: cli-mono
-Architecture: %OOO_MONO_ARCHS%
-Depends: ${shlibs:Depends},
- libreofficeVER-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},
- ${misc:Depends}
-Conflicts: libuno-cil, libuno-cli-types1.1-cil
-Provides: libuno-cil
-Replaces: libuno-cil
-Description: LibreOffice bindings for Mono CLI
- LibreOffice 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 LibreOffice for
- accessing the LibreOffice API from Mono languages (e.g. C# and Boo) and
- for using Mono for components.
-
-Package: libuno-cli-basetypes1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends},
- ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- base types
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends},
- ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- URE type library
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends},
- ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- LibreOffice type library
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, cli-uno-bridge,
- ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- bootstrapping library
- LibreOffice 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: cli-mono
-Architecture: all
-Depends: ${cli:Depends},
- ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- helper classes
- LibreOffice 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.
-
diff --git a/rules b/rules
index 543b791..174523a 100755
--- a/rules
+++ b/rules
@@ -132,13 +132,6 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
endif
JAVAHELPER_MIN_VERSION= (>= 0.37~)
-ENABLE_MONO=y
-MONO2=y
-ifeq "$(MONO2)" "y"
- MONO_MINVER= (>= 2.4.2.3)
-else
- MONO_MINVER= (>= 1.2.3)
-endif
SYSTEM_STUFF += hunspell
HUNSPELL_MIN_VER= (>= 1.1.5-2)
SYSTEM_STUFF += altlinuxhyph
@@ -409,17 +402,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
BUILD_JARS_NATIVE=y
endif
-ifeq "$(ENABLE_MONO)" "y"
-# mono
-# ppc fails (#412967), arm(el), too
-OOO_MONO_ARCHS = $(filter amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386,
$(OOO_ARCHS))
-ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_MONO_ARCHS)))
- ENABLE_MONO=n
-endif
-else
-OOO_MONO_ARCHS=
-endif
-
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
OOO_NPSOPLUGIN_ARCHS = $(OOO_ARCHS)
else
@@ -887,31 +869,6 @@ ifeq "$(USE_SYSTEM_DMAKE)" "y"
BUILD_DEPS += , dmake (>= 1:4.11)
endif
-ifneq "$(OOO_MONO_ARCHS)" ""
- ifeq "$(MONO2)" "y"
- BUILD_DEPS += , mono-devel $(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)]
- else
- # 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.5.7) [$(OOO_MONO_ARCHS)], mono-1.0-devel
[$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
- endif
-endif
-ifeq "$(ENABLE_MONO)" "y"
- # http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
- MONO_SHARED_DIR = $(CURDIR)
- export MONO_SHARED_DIR
- CONFIGURE_FLAGS+= --enable-mono
- ifeq "$(MONO2)" "y"
-export MCS=/usr/bin/mono-csc
-export GMCS=/usr/bin/mono-csc
-export MKBUNDLE2=/usr/bin/mkbundle
- endif
- DBG_DBG_SUGGESTS += , mono-jit-dbg [$(OOO_MONO_ARCHS)], libmono0-dbg
[$(OOO_MONO_ARCHS)], mono-dbg [$(OOO_MONO_ARCHS)]
-else
- CONFIGURE_FLAGS+= --disable-mono
- DEBHELPER_OPTIONS += -Nlibuno-cli-basetypes1.0-cil
-Nlibuno-cli-uretypes1.0-cil -Nlibuno-cli-oootypes1.0-cil
-Nlibuno-cli-cppuhelper1.0-cil -Nlibuno-cli-ure1.0-cil
-endif
-
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
endif
@@ -1305,10 +1262,6 @@ ifneq "$(OOO_L10N_DIR)" ""
rm -rf $(OOO_L10N_DIR)
endif
-ifeq "$(ENABLE_MONO)" "y"
- rm -rf $(MONO_SHARED_DIR)/.wapi
-endif
-
ifeq "$(HELPISOS)" ""
rm -rf images*
endif
@@ -1447,10 +1400,6 @@ ifeq "$(ENABLE_JAVA)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
endif
-ifneq "$(OOO_MONO_ARCHS)" ""
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.mono.in
-endif
ifneq "$(OOO_NPSOPLUGIN_ARCHS)" ""
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.mozilla.in
@@ -1524,7 +1473,6 @@ endif
perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g
debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g"
debian/control
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
@@ -1897,27 +1845,6 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
endif
-ifeq "$(ENABLE_MONO)" "y"
- mkdir -p $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib; \
- mv $(PKGDIR)-common/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll* \
- $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib
- mv $(PKGDIR)-common/$(OOBRANDDIR)/ure/lib/mono_loader*.uno.so \
- $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib
- for i in `dh_listpackages | grep libuno-cli`; do \
- if echo "$$i" | grep -q oootypes; then p=libreoffice-common;
d=$(OODIR)/program; \
- else p=ure; d=$(OOBRANDDIR)/ure/lib; fi; \
- rm -rf debian/$$i && mkdir -p -m755
debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
- mv debian/$$p/$$d/`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/'`; \
- mv debian/$$p/$$d/`echo $$i | sed -e "s/libuno-//" | sed -e
"s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.config \
- debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e
's/.*(\d.\d).*/$$1/'`/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" |
sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll.config; \
- ln -s `echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e
"s/-/_/" | perl -pi -e 's/\d.\d//'`.dll.config \
- debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e
's/.*(\d.\d).*/$$1/'`/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" |
sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.config; \
- mv debian/$$p/$$d/policy.*.`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
-
# remove eventually sneaked in .testtoolrc
rm -f $(PKGDIR)-common/$(OODIR)/program/.testtoolrc
@@ -2457,23 +2384,6 @@ ifeq "$(BUILD_PYUNO)" "y"
endif
endif
-ifeq "$(ENABLE_MONO)" "y"
- # Mono bindings
- 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 $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/mono_loader*.uno.so \
- 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,/$(OOUREDIR)/lib/cli_uno_bridge.dll, \
- > debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
-endif
-
# should be empty now, remove if there
rm -rf $(PKGDIR)-core/$(OOBRANDDIR)/ure
@@ -3189,9 +3099,6 @@ else
dh_strip -s
endif
dh_icons -s
-ifeq "$(ENABLE_MONO)" "y"
- dh_installcligac -s
-endif
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-c0 -v`echo $(BINARY_VERSION) | cut -d: -f2`
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" --
-v`echo $(BINARY_VERSION) | cut -d: -f2`
@@ -3247,10 +3154,6 @@ endif
ifeq "$(LINK_TO_STLPORT)" "y"
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat
/var/lib/dpkg/info/libstlport4.6*.shlibs | awk '{ print $$3,$$4,$$5 }')/'
debian/ure.substvars
endif
-ifeq "$(ENABLE_MONO)" "y"
- dh_makeclilibs -s
- dh_clideps -s
-endif
ifeq "$(ENABLE_JAVA)" "y"
jh_depends -s -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure
ifeq "$(PACKAGE_BASE)" "y"
@@ -3339,11 +3242,6 @@ ifneq ($(DEB_HOST_ARCH),$(findstring
$(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
echo "For uploads with binary-all packages, please use arches where
Java is enabled!!!!!"
echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
-ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_MONO_ARCHS)))
- echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "For uploads with binary-all packages, please use arches where
Mono is enabled!!!!!"
- echo
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-endif
dh_testdir
dh_testroot
@@ -3402,15 +3300,8 @@ endif
dh_fixperms -i
dh_icons -i
dh_installxmlcatalogs -i
-ifeq "$(ENABLE_MONO)" "y"
- dh_installcligac -i
-endif
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
-ifeq "$(ENABLE_MONO)" "y"
- dh_makeclilibs -i
- dh_clideps -i
-endif
ifeq "$(ENABLE_JAVA)" "y"
# the help recommends lucene. this is enough. no need for a hard depend
in
# -common, IMHO
@@ -3440,20 +3331,6 @@ endif
-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 +LibO 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)+LibO`echo
$(BINARY_VERSION) | cut -d: -f2`
- dh_gencontrol -plibuno-cli-uretypes1.0-cil -- \
- -v$(shell grep CLI_URETYPES_NEW_VERSION
$(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+LibO`echo
$(BINARY_VERSION) | cut -d: -f2`
- dh_gencontrol -plibuno-cli-oootypes1.0-cil -- \
- -v$(shell grep CLI_OOOTYPES_NEW_VERSION
$(SOURCE_TREE)/unoil/climaker/version.txt | cut -d"=" -f2)+LibO`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)+LibO`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)+LibO`echo
$(BINARY_VERSION) | cut -d: -f2`
-endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
dh_gencontrol -pttf-opensymbol -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);'
debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo
$(BINARY_VERSION) | cut -d: -f2`
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
