[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 97dc1146dfb9e3a07b0be04bb894d9c6dfc1cde5
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Jul 30 15:53:42 2009 +0200

      * debian/rules
        debian/mono-devel.install
        debian/mono-api-diff.cs:
        + As mono-api-diff was dropped from Mono 2.4 and we need it to track API
          changes we bundle it now in the source package.

diff --git a/debian/changelog b/debian/changelog
index e95aba4..21d7dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 mono (2.4.2.3+dfsg-1~pre1) unstable; urgency=low
 
   * New upstream release.
-    + Shipping the RabbitMQ.Client library now the non-free bits were
+    + Shipping the RabbitMQ.Client library now as the non-free bits were
       removed.
+  * debian/rules
+    debian/mono-devel.install
+    debian/mono-api-diff.cs:
+    + As mono-api-diff was dropped from Mono 2.4 and we need it to track API
+      changes we bundle it now in the source package.
 
- -- Mirco Bauer <meebey at debian.org>  Wed, 29 Jul 2009 16:34:12 +0200
+ -- Mirco Bauer <meebey at debian.org>  Thu, 30 Jul 2009 15:43:43 +0200
 
 mono (2.4+dfsg-6) unstable; urgency=low
 
diff --git a/debian/mono-api-check b/debian/mono-api-check
index 386ca25..c5bd01b 100755
--- a/debian/mono-api-check
+++ b/debian/mono-api-check
@@ -3,12 +3,12 @@
 NAME=$(basename $0)
 MONO_API_INFO1="/usr/lib/mono/1.0/mono-api-info.exe"
 MONO_API_INFO2="/usr/lib/mono/2.0/mono-api-info.exe"
-MONO_API_DIFF="/usr/lib/mono/1.0/mono-api-diff.exe"
+MONO_API_DIFF="/usr/lib/mono/2.0/mono-api-diff.exe"
 
-RUNTIME_VERSION=1
+RUNTIME_VERSION=2
 if [ "$1" = "-2" ]; then
 	if [ ! -x $MONO_API_INFO2 ]; then
-		echo "Error: $MONO_API_INFO2 does not exist, you need to install the mono-gmcs package"
+		echo "Error: $MONO_API_INFO2 does not exist, you need to install the mono-devel package"
 		exit 1
 	fi
 	MONO_API_INFO=$MONO_API_INFO2
@@ -25,7 +25,7 @@ if [ "$1" = "-k" ]; then
 fi
 
 if [ $# -lt 2 ]; then
-	echo "usage: $NAME [-2] [-k] old.dll new.dll"
+	echo "usage: $NAME [-2] [-k] old.dll|deb|changes new.dll|deb|changes"
 	exit 1
 fi
 
diff --git a/debian/mono-devel.install b/debian/mono-devel.install
index 5f42910..4778457 100644
--- a/debian/mono-devel.install
+++ b/debian/mono-devel.install
@@ -65,4 +65,5 @@ debian/tmp/usr/lib/pkgconfig/dotnet35.pc
 debian/tmp/usr/lib/pkgconfig/mono-lineeditor.pc
 debian/tmp/usr/lib/pkgconfig/mono-options.pc
 debian/tmp/usr/share/locale/*/LC_MESSAGES/mcs.mo
-debian/mono-api-check /usr/bin/
+debian/mono-api-check		/usr/bin/
+debian/mono-api-diff.exe	/usr/lib/mono/2.0/
diff --git a/debian/rules b/debian/rules
index 3587cbd..b9fcad6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -349,6 +349,12 @@ binary-indep: build-arch install-arch build-indep install-indep
 	  -out:debian/mono-gac/usr/share/mono/MonoGetAssemblyName.exe \
 	  debian/MonoGetAssemblyName.cs
 
+	# Build mono-api-diff
+	$(RUN_MONO) mcs/class/lib/net_2_0/gmcs.exe \
+	  -target:exe \
+	  -out:debian/mono-api-diff.exe \
+	  debian/mono-api-diff.cs
+
 	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