[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:17 UTC 2009


The following commit has been merged in the master branch:
commit 96c82bf9243da920aa5dfaacbd78422efd717e19
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed May 20 02:28:40 2009 +0200

        + Don't allow dh_clideps to add mono-runtime dependencies to
          mono-1.0/2.0-gac to prevent circular dependency hell. (Closes: #528090)

diff --git a/debian/changelog b/debian/changelog
index 7e43137..7869706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
       will ship the assemblies with the release containing Silverlight 2.0
       support.
     + Build MonoGetAssemblyName using gmcs instead of mcs.
+    + Don't allow dh_clideps to add mono-runtime dependencies to
+      mono-1.0/2.0-gac to prevent circular dependency hell. (Closes: #528090)
   * debian/README.source:
     + Mention which files we removed and how to create the tarball we use.
     + Document which binaries are required to bootstrap the C# compiler.
diff --git a/debian/rules b/debian/rules
index b89ee51..b7ed0c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -335,8 +335,9 @@ binary-indep: build-arch install-arch build-indep install-indep
 	debian/dh_makeclilibs -p libmono-system2.1-cil -m 2.0 $(DH_INTERNAL_MONO_PARAM)
 	debian/dh_clideps -i -l debian/tmp $(DH_INTERNAL_MONO_PARAM)
 	#DH_VERBOSE=1 debian/dh_clideps -i -l debian/tmp $(DH_INTERNAL_MONO_PARAM)
-	# mono-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-gac)
-	debian/dh_clideps -p mono-gac -r $(DH_INTERNAL_MONO_PARAM)
+	# mono-1.0/2.0-gac needs special runtime dep, to prevent circular dep (mono-runtime <-> mono-1.0/2.0-gac)
+	debian/dh_clideps -p mono-1.0-gac -r $(DH_INTERNAL_MONO_PARAM)
+	debian/dh_clideps -p mono-2.0-gac -r $(DH_INTERNAL_MONO_PARAM)
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i

-- 
mono



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