[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. 2.0.1-6-92-g5f57dc0

Mirco Bauer meebey at meebey.net
Mon May 25 18:13:59 UTC 2009


The following commit has been merged in the master branch:
commit c96dd92af43d8e12595ce0570bfab3e51266becc
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu May 21 17:29:21 2009 +0200

        + Only pass mono/2.0 to MONO_PATH in RUN_MONO variable, else gmcs.exe
          picks up the 1.0 corlib.

diff --git a/debian/changelog b/debian/changelog
index bbdac6e..f88d1d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
     + Don't allow dh_clideps to add mono-runtime dependencies to
       mono-1.0/2.0-gac to prevent circular dependency hell. (Closes: #528090)
     + Added missing non-stamp/files targets to .PHONY.
+    + Only pass mono/2.0 to MONO_PATH in RUN_MONO variable, else gmcs.exe
+      picks up the 1.0 corlib.
   * debian/cli-wrapper.c
     + Dropped as this wrapper is obsolete since mono 1.1.6-1.
   * debian/README.source:
diff --git a/debian/rules b/debian/rules
index 13e2a66..f07cb31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
 NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 
-RUN_MONO = LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/1.0:debian/tmp/usr/lib/mono/2.0 debian/tmp/usr/bin/mono
+RUN_MONO = LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/2.0 debian/tmp/usr/bin/mono
 DH_INTERNAL_MONO_PARAM = --internal-mono
 ifeq ($(shell dpkg --compare-versions $$(dpkg-query -f '$${Version}' -W debhelper) lt 7.1; echo $$?), 0)
 	DH_INTERNAL_MONO_PARAM = internal-mono

-- 
mono



More information about the Pkg-mono-svn-commits mailing list