[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-2-g7db12cd
The following commit has been merged in the master branch:
commit 7db12cda96ab99da7d306deb6517656ce10508b3
Author: Rene Engelhard <rene@debian.org>
Date: Wed Nov 16 22:31:06 2011 +0000
disable mono in prepartion for mono transition
diff --git a/changelog b/changelog
index 9cc975b..7f82868 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:3.4.4-2) UNRELEASED; urgency=low
* debian/rules:
- recommend fonts-thai-tlwg instead of ttf-thai-tlwg (closes: #648785)
+ - disable mono in prepartion for mono transition
- -- Rene Engelhard <rene@debian.org> Wed, 16 Nov 2011 22:28:40 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Nov 2011 22:30:42 +0000
libreoffice (1:3.4.4-1) unstable; urgency=low
diff --git a/control b/control
index f98acbe..e6c1267 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: 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, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-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 ia
64 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), 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), 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, libr
df0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
+Build-Depends: 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, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-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), libhyphe
n-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), 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), 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, 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
@@ -3078,77 +3078,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/rules b/rules
index 7532039..b49e43d 100755
--- a/rules
+++ b/rules
@@ -136,7 +136,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
endif
JAVAHELPER_MIN_VERSION= (>= 0.37~)
-ENABLE_MONO=y
+ENABLE_MONO=n
MONO2=y
ifeq "$(MONO2)" "y"
MONO_MINVER= (>= 2.4.2.3)
--
LibreOffice packaging repository
Reply to: