[Pkg-mono-svn-commits] rev 961 - mono/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-12 11:24:34 -0600 (Sat, 12 Jun 2004)
New Revision: 961

Added:
   mono/trunk/debian/mono-jit.postinst.head
   mono/trunk/debian/mono-jit.postinst.mint-setup
   mono/trunk/debian/mono-jit.postinst.mono-setup
   mono/trunk/debian/mono-jit.postinst.old
Removed:
   mono/trunk/debian/mono-jit.postinst
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
mono vs. mint check at build time


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/changelog	2004-06-12 17:24:34 UTC (rev 961)
@@ -1,15 +1,16 @@
-mono (0.95-0pre1v2) unstable; urgency=low
+mono (0.95-0pre1v3) unstable; urgency=low
 
   * (NOT RELEASED YET) New upstream release
   * Eduard Bloch
-    + setting virtual ".shlibs" via provides, currently libmono-0.95 and
-      mono-assemblies-base-0.95
+    + setting virtual ".shlibs" via provides, currently libmono-0.95
+    + dh_makenetlibs and dh_netdeps tools to manage assembly dependencies in
+      the Perl/Python way
     + mono-common.preinst now moves /usr/lib/mono directory (if exists) to
       /usr/share/dotnet
+    + moved the check for mono-vs.-mint priority to debian/rules
   * Mirco 'meebey' Bauer
     + New upstream release
     + enabled preview features (.NET 1.2, generics)
-    + added dpkg-dev dependency to mono-jit (postinst needs it)
   * Michael Schiansky
     + Since beta1 (0.91) dllmaps are handled cleanly (Closes: #241686)
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/control	2004-06-12 17:24:34 UTC (rev 961)
@@ -24,7 +24,7 @@
 Package: mono-jit
 Provides: cli-virtual-machine
 Architecture: i386 powerpc s390
-Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}, mono-common (= ${Source-Version}), dpkg-dev
+Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}, mono-common (= ${Source-Version})
 Description: fast CLI (.NET/Mono) JIT compiler
  The Mono Project is an open development initiative sponsored by Ximian that is
  working to develop an open source, Linux-based version of the Microsoft .NET

Deleted: mono/trunk/debian/mono-jit.postinst
===================================================================
--- mono/trunk/debian/mono-jit.postinst	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/mono-jit.postinst	2004-06-12 17:24:34 UTC (rev 961)
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-# if we're configuring, /usr/share/doc/mono-jit is a directory,
-# and isn't a symlink, replace it with a symlink to mono-common
-if [ "$1" = "configure" -a -d /usr/share/doc/mono-jit -a ! -h /usr/share/doc/mono-jit ]; then
-	rmdir /usr/share/doc/mono-jit
-	ln -s mono-common /usr/share/doc/mono-jit
-fi
-
-ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
-if [[ "$ARCH" = "i386" || "$ARCH" = "powerpc" || "$ARCH" = "s390" ]]; then
-	update-alternatives --install /usr/bin/cli cli /usr/bin/mono 14 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-else
-	update-alternatives --install /usr/bin/cli cli /usr/bin/mono 9 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-fi
-
-#DEBHELPER#

Added: mono/trunk/debian/mono-jit.postinst.head
===================================================================
--- mono/trunk/debian/mono-jit.postinst.head	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/mono-jit.postinst.head	2004-06-12 17:24:34 UTC (rev 961)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+# if we're configuring, /usr/share/doc/mono-jit is a directory,
+# and isn't a symlink, replace it with a symlink to mono-common
+if [ "$1" = "configure" -a -d /usr/share/doc/mono-jit -a ! -h /usr/share/doc/mono-jit ]; then
+	rmdir /usr/share/doc/mono-jit
+	ln -s mono-common /usr/share/doc/mono-jit
+fi
+

Added: mono/trunk/debian/mono-jit.postinst.mint-setup
===================================================================
--- mono/trunk/debian/mono-jit.postinst.mint-setup	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/mono-jit.postinst.mint-setup	2004-06-12 17:24:34 UTC (rev 961)
@@ -0,0 +1,3 @@
+update-alternatives --install /usr/bin/cli cli /usr/bin/mono 9 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
+
+#DEBHELPER#

Added: mono/trunk/debian/mono-jit.postinst.mono-setup
===================================================================
--- mono/trunk/debian/mono-jit.postinst.mono-setup	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/mono-jit.postinst.mono-setup	2004-06-12 17:24:34 UTC (rev 961)
@@ -0,0 +1,3 @@
+	update-alternatives --install /usr/bin/cli cli /usr/bin/mono 14 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
+
+#DEBHELPER#

Copied: mono/trunk/debian/mono-jit.postinst.old (from rev 934, mono/trunk/debian/mono-jit.postinst)

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2004-06-12 17:11:04 UTC (rev 960)
+++ mono/trunk/debian/rules	2004-06-12 17:24:34 UTC (rev 961)
@@ -35,6 +35,7 @@
 # we don't touch precompiled stuff
 	perl -pe 's,\ runtime\ ,  ,' -i Makefile
 	$(MAKE)
+	( cat debian/mono-jit.postinst.head; ARCH= ; case `dpkg-architecture -qDEB_HOST_ARCH` in i386|powerpc|s390) cat debian/mono-jit.postinst.mono-setup ;; *) cat debian/mono-jit.postinst.mint-setup ;; esac )
 	touch build-stamp
 
 #clean: unpatch