[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-6-26-g8b65c7c

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 844b77c59f42b940dfaa3652a2359f25cb292a8d
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Jul 30 15:58:40 2009 +0200

    install MonoGetAssemblyName with dh_install

diff --git a/debian/mono-gac.install b/debian/mono-gac.install
index 38e6fba..3af8f6b 100644
--- a/debian/mono-gac.install
+++ b/debian/mono-gac.install
@@ -1 +1,2 @@
 debian/tmp/usr/bin/gacutil
+debian/MonoGetAssemblyName.exe /usr/share/mono/
diff --git a/debian/rules b/debian/rules
index b9fcad6..336a3b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,9 +70,9 @@ CONFIGURE =	CFLAGS="$(CFLAGS)" \
 MAKE_FLAGS += -j1
 export MAKEFLAGS=$(MAKE_FLAGS)
 
-ifeq ($(DEB_BUILD_ARCH), i386)
+#ifeq ($(DEB_BUILD_ARCH), i386)
 #	MAKE_FLAGS += RUNTIME=$(CURDIR)/debian/mono-aot-wrapper
-endif
+#endif
 
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
@@ -204,7 +204,8 @@ clean-patched:
 	# AOT stuff we created using mono-aot-wrapper/mono-aot-bootstrap
 	find mcs/class/lib -name "*.so" -delete
 	-cd debian/detector && $(MAKE) clean
-	rm -f debian/MonoGetAssemblyName.exe
+	rm -f debian/MonoGetAssemblyName.exe \
+	      debian/mono-api-diff.exe
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 
 	rm -f mcs/class/lib/default/mono-api-info.exe               \
@@ -334,19 +335,12 @@ binary-indep: build-arch install-arch build-indep install-indep
 	dh_testdir
 	dh_testroot
 
-	# that exclude list are programs for arch-dep packages
-	dh_install -i -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
-
-	# Late GAC
-	install -D -m 755 debian/mono.runtime-script debian/mono-gac/usr/share/cli-common/runtimes.d/mono
-
 	# Build the late-GAC tool,
 	# using the built Mono runtime from debian/tmp
 	# (thus the install-arch target dependency!)
-	mkdir -p debian/mono-gac/usr/share/mono
 	$(RUN_MONO) mcs/class/lib/net_2_0/gmcs.exe \
 	  -target:exe \
-	  -out:debian/mono-gac/usr/share/mono/MonoGetAssemblyName.exe \
+	  -out:debian/MonoGetAssemblyName.exe \
 	  debian/MonoGetAssemblyName.cs
 
 	# Build mono-api-diff
@@ -355,6 +349,12 @@ binary-indep: build-arch install-arch build-indep install-indep
 	  -out:debian/mono-api-diff.exe \
 	  debian/mono-api-diff.cs
 
+	# that exclude list are programs for arch-dep packages
+	dh_install -i -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
+
+	# Late GAC
+	install -D -m 755 debian/mono.runtime-script debian/mono-gac/usr/share/cli-common/runtimes.d/mono
+
 	install -m 644 debian/System.Data.dll.config debian/libmono-system-data1.0-cil/usr/lib/mono/gac/System.Data/1.0.*/
 	install -m 644 debian/System.Data.dll.config debian/libmono-system-data2.0-cil/usr/lib/mono/gac/System.Data/2.0.*/
 	install -m 644 debian/System.Drawing.dll.config debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Drawing/1.0.*/

-- 
mono