./packages/openofficeorg/3.2/experimental r1740: merge
------------------------------------------------------------
revno: 1740 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-12-16 02:03:14 +0100
message:
merge
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-12-14 23:31:41 +0000
+++ b/changelog 2009-12-16 01:03:14 +0000
@@ -3,7 +3,7 @@
* OpenOffice.org 3.2.0 release candidate 1 (OOO320_m8)
* ooo-build
- - update (759279dde5848e00498fa268fafa15525443e2e3)
+ - update (f6b210783462c203eed15f254c84df85cf931682)
- makes "Always allow saving of document" configurable (closes: #478130)
- src: add OOO320 GSIs from ftp.linux.cz
- debian-opt.diff: build with -O2 instead of -Os. Fixes FTBFS on ppc
@@ -12,12 +12,17 @@
- re-enable eo
- enable hppa, use gcj-jdk
* debian/control.in:
+ - bump ttf-opensymbol dep to (>= 1:3.0), we need it for some bullets
+ (closes: #561182)
+ * debian/rules:
- build-depend on g++-4.4 (>= 4.4.2-5) on armel because of various
wrong code generation fixes. Thanks Matthias Klose.
+ - bump build-dep for mono to >= 2.4.3 and adapt for csc -> mono-csc
+ change
* merge 1:3.1.1-9 and 1:3.1.1-10
- -- Rene Engelhard <rene@debian.org> Mon, 14 Dec 2009 23:07:16 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Dec 2009 01:59:04 +0100
openoffice.org (1:3.1.1-10) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-12-14 01:15:25 +0000
+++ b/control 2009-12-16 01:03:14 +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), flex | 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) [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, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc
hppa] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips m
ipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev (>= 2.0.1) [i386 amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64 sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmy
sqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , 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 , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , gcc-4.4, g++-4.4 , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | 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) [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, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc
hppa] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips m
ipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa] , dmake (>= 1:4.11) , mono-devel (>= 2.4.3) [i386 amd64 ia64 sparc], libmono-dev (>= 2.4.3) [i386 amd64 ia64 sparc], mono-utils (>= 2.4.3) [i386 amd64 ia64 sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmy
sqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , 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 , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , gcc-4.4, g++-4.4 , libldap2-dev
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), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -101,7 +101,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc hppa
-Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
+Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-help-2.4.1, openoffice.org-help-3.1.1, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-core (<< ${binary:Version}), openoffice.org-calc (<< ${binary:Version}), openoffi
ce.org-writer (<< ${binary:Version}), openoffice.org-impress (<< ${binary:Version}), openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<< ${binary:Version}), openoffice.org-gtk (<< ${binary:Version}), openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<< ${binary:Version}), openoffice.org-evolution (<< ${binary:Version}), openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean (<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), openoffice.org-hyphenation-hr (<< 20060617-2), openoffice.org-hyphenation-pl (<< 1:3
.0a-3), openoffice.org-hyphenation-sh (<< 1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3), openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<< 1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3), openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<< 1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3), openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<< 2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5), openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<< 1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3), openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<< 1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3), openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<< 1:3.1.0-3)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-headless
=== modified file 'control.in'
--- a/control.in 2009-11-29 22:04:53 +0000
+++ b/control.in 2009-12-16 01:03:14 +0000
@@ -181,7 +181,7 @@
Package: openoffice.orgVER-core
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-common (>> ${base-version}),
- ttf-opensymbol,
+ ttf-opensymbol (>= 1:3.0),
${shlibs:Depends},
fontconfig,
${mozilla-nss-depends},
=== modified file 'rules'
--- a/rules 2009-12-14 23:31:41 +0000
+++ b/rules 2009-12-16 01:03:14 +0000
@@ -120,7 +120,7 @@
ENABLE_MONO=y
MONO2=y
ifeq "$(MONO2)" "y"
- MONO_MINVER= (>= 2.0.1)
+ MONO_MINVER= (>= 2.4.3)
else
MONO_MINVER= (>= 1.2.3)
endif
@@ -832,7 +832,7 @@
export MONO_SHARED_DIR
CONFIGURE_FLAGS+= --enable-mono
ifeq "$(MONO2)" "y"
- CONFIGURE_FLAGS += MCS=/usr/bin/csc GMCS=/usr/bin/csc MKBUNDLE2=/usr/bin/mkbundle
+ CONFIGURE_FLAGS += MCS=/usr/bin/mono-csc GMCS=/usr/bin/mono-csc 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
Reply to: