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

Mirco Bauer meebey at meebey.net
Wed Aug 5 23:04:07 UTC 2009 

The following commit has been merged in the master branch:
commit fc1f904aca39733b1e2b1caa5476f82bdd974aca
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Jul 30 20:52:20 2009 +0200

      * debian/control
        debian/mono-devel.install
        debian/mono-mcs.install
        debian/mono-gmcs.install:
        + Moved mcs to mono-mcs and gmcs to mono-gmcs from mono-devel, as that
          caused a lot of confusion. (closes: #525279)
        + Added mono-csc to mono-devel in preparation to drop csc in the future as
          it conflicts with the chicken compiler, see #509367.

diff --git a/debian/changelog b/debian/changelog
index 0966c94..70a34c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,14 @@ mono (2.4.2.3+dfsg-1~pre1) unstable; urgency=low
     debian/libmono-profiler.install:
     + Moved the libmono-profiler-* libraries to the new libmono-profiler
       package, as they pull libmono0 in which is unneeded for normal usage.
+  * debian/control
+    debian/mono-devel.install
+    debian/mono-mcs.install
+    debian/mono-gmcs.install:
+    + Moved mcs to mono-mcs and gmcs to mono-gmcs from mono-devel, as that
+      caused a lot of confusion. (closes: #525279)
+    + Added mono-csc to mono-devel in preparation to drop csc in the future as
+      it conflicts with the chicken compiler, see #509367.
 
  -- Mirco Bauer <meebey at debian.org>  Thu, 30 Jul 2009 19:35:10 +0200
 
diff --git a/debian/control b/debian/control
index 26a5053..f3fa206 100644
--- a/debian/control
+++ b/debian/control
@@ -1367,6 +1367,7 @@ Depends: ${cli:Depends},
          libmono-corlib1.0-cil (>= ${mono:upversion}),
          libmono-corlib1.0-cil (<< ${mono:next-upversion})
 Recommends: pkg-config
+Replaces: mono-devel (<< 2.4.2.3)
 Description: Mono C# 1.0 compiler for CLI 1.1
  This is the Mono C# (C-Sharp) 1.0 compiler, a platform-independent compiler
  which produces CIL (Common Intermediate Language) binary executables.
@@ -1384,7 +1385,7 @@ Depends: ${cli:Depends},
          libmono-corlib2.0-cil (>= ${mono:upversion}),
          libmono-corlib2.0-cil (<< ${mono:next-upversion})
 Recommends: pkg-config
-Replaces: mono-mcs (>= 1.1.10), mono-mcs (<= 1.1.13)
+Replaces: mono-mcs (>= 1.1.10), mono-mcs (<= 1.1.13), mono-devel (<< 2.4.2.3)
 Description: Mono C# 2.0 and C# 3.0 compiler for CLI 2.0
  This is the Mono C# (C-Sharp) 2.0 and C# 3.0 compiler, a platform-independent
  compiler which produces CIL (Common Intermediate Language) binary executables.
diff --git a/debian/mono-devel.install b/debian/mono-devel.install
index 4778457..e5749ea 100644
--- a/debian/mono-devel.install
+++ b/debian/mono-devel.install
@@ -8,11 +8,9 @@ debian/tmp/usr/bin/disco
 debian/tmp/usr/bin/dtd2xsd
 debian/tmp/usr/bin/dtd2rng
 debian/tmp/usr/bin/genxs
-debian/tmp/usr/bin/gmcs
 debian/tmp/usr/bin/ilasm
 debian/tmp/usr/bin/installvst
 debian/tmp/usr/bin/macpack
-debian/tmp/usr/bin/mcs
 debian/tmp/usr/bin/mkbundle
 debian/tmp/usr/bin/mono-api-info
 debian/tmp/usr/bin/mono-cil-strip
diff --git a/debian/mono-devel.links b/debian/mono-devel.links
index 399953f..03e59cc 100644
--- a/debian/mono-devel.links
+++ b/debian/mono-devel.links
@@ -1 +1,2 @@
 usr/bin/gmcs usr/bin/csc
+usr/bin/gmcs usr/bin/mono-csc
diff --git a/debian/mono-devel.manpages b/debian/mono-devel.manpages
index 331ef99..1063159 100644
--- a/debian/mono-devel.manpages
+++ b/debian/mono-devel.manpages
@@ -7,11 +7,9 @@ debian/tmp/usr/share/man/man1/cilc.1
 debian/tmp/usr/share/man/man1/disco.1
 debian/tmp/usr/share/man/man1/dtd2xsd.1
 debian/tmp/usr/share/man/man1/genxs.1
-debian/tmp/usr/share/man/man1/gmcs.1
 debian/tmp/usr/share/man/man1/ilasm.1
 debian/tmp/usr/share/man/man1/macpack.1
 debian/tmp/usr/share/man/man1/makecert.1
-debian/tmp/usr/share/man/man1/mcs.1
 debian/tmp/usr/share/man/man1/mkbundle.1
 debian/tmp/usr/share/man/man1/mono-cil-strip.1
 debian/tmp/usr/share/man/man1/mono-shlib-cop.1
diff --git a/debian/mono-devel.postinst b/debian/mono-devel.postinst
index 6f29bfd..891721d 100644
--- a/debian/mono-devel.postinst
+++ b/debian/mono-devel.postinst
@@ -2,7 +2,7 @@
 set -e
 
 update-alternatives \
-	--install /usr/bin/cli-csc c-sharp-compiler /usr/bin/csc 10 \
+	--install /usr/bin/cli-csc c-sharp-compiler /usr/bin/mono-csc 10 \
 	--slave /usr/share/man/man1/cli-csc.1.gz cli-csc.1.gz /usr/share/man/man1/csc.1.gz
 
 update-alternatives \
diff --git a/debian/mono-devel.prerm b/debian/mono-devel.prerm
index 8873c9d..02b8961 100644
--- a/debian/mono-devel.prerm
+++ b/debian/mono-devel.prerm
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 if [ "$1" = remove ]; then
-        update-alternatives --remove c-sharp-compiler		/usr/bin/csc
+        update-alternatives --remove c-sharp-compiler		/usr/bin/mono-csc
         update-alternatives --remove resource-file-generator	/usr/bin/resgen
         update-alternatives --remove assembly-linker		/usr/bin/al
         update-alternatives --remove strong-name-tool		/usr/bin/sn
diff --git a/debian/mono-gmcs.install b/debian/mono-gmcs.install
index 0c5c21f..62acc18 100644
--- a/debian/mono-gmcs.install
+++ b/debian/mono-gmcs.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/gmcs2
+debian/tmp/usr/bin/gmcs
 debian/tmp/usr/lib/mono/2.0/gmcs.exe*
diff --git a/debian/mono-gmcs.manpages b/debian/mono-gmcs.manpages
index 9bcf408..d4bf5b2 100644
--- a/debian/mono-gmcs.manpages
+++ b/debian/mono-gmcs.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/gmcs2.1
+debian/tmp/usr/share/man/man1/gmcs.1
diff --git a/debian/mono-mcs.install b/debian/mono-mcs.install
index 9225606..bd2a2d9 100644
--- a/debian/mono-mcs.install
+++ b/debian/mono-mcs.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/mcs1
+debian/tmp/usr/bin/mcs
 debian/tmp/usr/lib/mono/1.0/mcs.exe*
diff --git a/debian/mono-mcs.manpages b/debian/mono-mcs.manpages
index 1dd5380..76e99b9 100644
--- a/debian/mono-mcs.manpages
+++ b/debian/mono-mcs.manpages
@@ -1 +1 @@
-debian/tmp/usr/share/man/man1/mcs1.1
+debian/tmp/usr/share/man/man1/mcs.1
diff --git a/debian/rules b/debian/rules
index d30b82b..9e10439 100755
--- a/debian/rules
+++ b/debian/rules
@@ -275,8 +275,6 @@ install-indep-stamp:
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/gmcs.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
-	   $(CURDIR)/debian/tmp/usr/share/man/man1/gmcs2.1
-	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/smcs.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mono-service.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/mono-service2.1
@@ -303,8 +301,6 @@ install-indep-stamp:
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/genxs1.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/ilasm.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/ilasm1.1
-	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mcs.1 \
-	   $(CURDIR)/debian/tmp/usr/share/man/man1/mcs1.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/mkbundle.1 \
 	   $(CURDIR)/debian/tmp/usr/share/man/man1/mkbundle1.1
 	cp $(CURDIR)/debian/tmp/usr/share/man/man1/monop.1 \
@@ -318,9 +314,6 @@ install-indep-stamp:
 	# copy missing default scripts
 	cp $(CURDIR)/debian/tmp/usr/bin/xsd \
 	   $(CURDIR)/debian/tmp/usr/bin/xsd1
-	# copy missing 2.0 scripts
-	cp $(CURDIR)/debian/tmp/usr/bin/gmcs \
-	   $(CURDIR)/debian/tmp/usr/bin/gmcs2
 	# gacutil should be 2.0 by default (like all other development tools)
 	mv $(CURDIR)/debian/tmp/usr/bin/gacutil \
 	   $(CURDIR)/debian/tmp/usr/bin/gacutil1

-- 
mono

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