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

Mirco Bauer meebey-guest@costa.debian.org
Tue, 15 Feb 2005 23:14:01 +0100


Author: meebey-guest
Date: 2005-02-15 23:14:00 +0100 (Tue, 15 Feb 2005)
New Revision: 1519

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/dh_makenetlibs
   mono/trunk/debian/dh_netdeps
   mono/trunk/debian/rules
Log:
- removing s390 support
- tuned dh_* scripts to check buil-dep for mono-utils >= 1.x



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-02-04 16:44:30 UTC (rev 1518)
+++ mono/trunk/debian/changelog	2005-02-15 22:14:00 UTC (rev 1519)
@@ -1,3 +1,15 @@
+mono (1.0.5-2) unstable; urgency=high
+
+  * Mirco 'meebey' Bauer
+    + removed mono-mint package and all packages for s390.
+      The mono-mint (the interpeter) is deprecated, unmaintained upstream
+      and was just a proof-of-concept programm.
+      The mono-jit is no longer supported for s390 by upstream in the stable
+      release and has a lot of bugs on that arch. This prevents Mono to enter
+      "testing", thus removed.
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Tue, 15 Feb 2005 22:58:39 +0200
+
 mono (1.0.5-1) unstable; urgency=high
 
   * New upstream release

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2005-02-04 16:44:30 UTC (rev 1518)
+++ mono/trunk/debian/control	2005-02-15 22:14:00 UTC (rev 1519)
@@ -9,7 +9,7 @@
 
 Package: mono-common
 Provides: cli-common
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
 Depends: binfmt-support (>= 1.1.2)
 Conflicts: binfmt-detector-cli, cli-common
 Replaces: mono-jit (<< 0.16), binfmt-detector-cli
@@ -23,7 +23,7 @@
 
 Package: mono-jit
 Provides: cli-virtual-machine
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
 Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}, mono-common (= ${Source-Version})
 Description: fast CLI/.NET JIT compiler for Mono
  The Mono Project is an open development initiative sponsored by Ximian that is
@@ -32,29 +32,13 @@
  .
  This package contains the Virtual Execution Environment and code
  generator (Just-in-Time and Ahead-of-Time) "mono" which runs CLI/.NET
- applications, currently available for i386, powerpc and s390 architectures
+ applications, currently available for i386 and powerpc architectures
  only.
 
-Package: mono-mint
-Provides: cli-virtual-machine
-Architecture: s390
-Conflicts: libmint0, libmint-dev
-Replaces: libmint0, libmint-dev
-Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}, mono-common (= ${Source-Version})
-Recommends: mono-jit
-Description: deprecated CLI/.NET code interpreter for Mono
- 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
- development platform.
- .
- This package contains the generic .NET code interpreter "mint". It is
- more portable but slow implementation, don't use it unless the mono-jit
- package is not available for your system architecture.
- 
 Package: mono
-Architecture: i386 powerpc s390
-Depends: mono-jit (= ${Source-Version}) | mono-mint (= ${Source-Version}), mono-utils (= ${Source-Version}), mono-mcs, mono-assemblies-arch
-Description: The Mono .NET development environment
+Architecture: i386 powerpc
+Depends: mono-jit (= ${Source-Version}), mono-utils (= ${Source-Version}), mono-mcs, mono-assemblies-arch
+Description: Mono .NET development environment
  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
  development platform.
@@ -66,7 +50,7 @@
 
 Package: mono-utils
 Section: devel
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
 Depends: ${shlibs:Depends}, mono-assemblies-base
 Description: Mono utilities
  The Mono Project is an open development initiative sponsored by Ximian that is
@@ -78,7 +62,7 @@
 
 Package: libmono0
 Section: libs
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
 Depends: ${shlibs:Depends}
 Conflicts: libmint0
 Provides: libmono-${mono:upversion}
@@ -93,7 +77,7 @@
 
 Package: libmono-dev
 Section: devel
-Architecture: i386 powerpc s390
+Architecture: i386 powerpc
 Depends: libmono0 (= ${Source-Version}), libglib2.0-dev
 Description: libraries for the Mono interpreter - Development files
  Header files and static libraries for libmono and libmono-profiler-conv.

Modified: mono/trunk/debian/dh_makenetlibs
===================================================================
--- mono/trunk/debian/dh_makenetlibs	2005-02-04 16:44:30 UTC (rev 1518)
+++ mono/trunk/debian/dh_makenetlibs	2005-02-15 22:14:00 UTC (rev 1519)
@@ -114,8 +114,8 @@
 
 init();
 
-if ( system "grep -q \"Build-Dep.*mono-utils.*0.9\" debian/control" ) {
-    warning("Warning! No Build-Depends on mono-utils (>= 0.96)!");
+if ( system "egrep -q \"Build-Depends: .*mono-utils \(>= 1\.[0-9.-]+\)\" debian/control" ) {
+    warning("Warning! No Build-Depends on mono-utils (>= 1.0)!");
 }
 
 my $fh;

Modified: mono/trunk/debian/dh_netdeps
===================================================================
--- mono/trunk/debian/dh_netdeps	2005-02-04 16:44:30 UTC (rev 1518)
+++ mono/trunk/debian/dh_netdeps	2005-02-15 22:14:00 UTC (rev 1519)
@@ -34,7 +34,7 @@
 which refers to the particular shared library (by its SONAME).
 
 If you use this program, your package should build-depend on mono-utils
-(>> 0.95).
+(>= 1.0).
 
 =head1 OPTIONS
 
@@ -69,8 +69,8 @@
     );
 }
 
-if ( system "grep -q \"Build-Dep.*mono-utils.*0.9\" debian/control" ) {
-    warning("Warning! No Build-Depends on mono-utils (>= 0.96)!");
+if ( system "egrep -q \"Build-Depends: .*mono-utils \(>= 1\.[0-9.-]+\)\" debian/control" ) {
+    warning("Warning! No Build-Depends on mono-utils (>= 1.0)!");
 }
 
 if ( !defined $mono_version || $mono_version eq "" ) {

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2005-02-04 16:44:30 UTC (rev 1518)
+++ mono/trunk/debian/rules	2005-02-15 22:14:00 UTC (rev 1519)
@@ -11,11 +11,6 @@
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-ifeq ($(DEB_BUILD_ARCH), s390)
-  JIT = --with-jit=yes --with-nptl=no
-  ATG = arch_target=s390
-endif
-
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
 else
@@ -33,13 +28,13 @@
 	./configure $(confflags) --prefix=/usr --with-gc=included \
 	  --mandir=\$${prefix}/share/man \
 	  --infodir=\$${prefix}/share/info \
-	  --sysconfdir=/etc --with-sigaltstack=no $(JIT) \
-	  --with-tls=pthread
+	  --sysconfdir=/etc --with-sigaltstack=no \
+	  --with-tls=pthread --with-nptl=no
 	# we don't install precompiled stuff
 	# (getting those build by the mcs source package)
 	perl -pe 's,\ runtime\ ,  ,' -i Makefile
-	$(MAKE) -j5 $(ATG)
-	( cat debian/mono-jit.postinst.head; ARCH= ; case $(DEB_HOST_ARCH) in i386|powerpc|s390) cat debian/mono-jit.postinst.mono-setup ;; *) cat debian/mono-jit.postinst.mint-setup ;; esac ) > debian/mono-jit.postinst
+	$(MAKE)
+	( cat debian/mono-jit.postinst.head; ARCH= ; case $(DEB_HOST_ARCH) in i386|powerpc) cat debian/mono-jit.postinst.mono-setup ;; *) cat debian/mono-jit.postinst.mint-setup ;; esac ) > debian/mono-jit.postinst
 	touch build-stamp
 
 clean: unpatch
@@ -99,11 +94,8 @@
 	dh_compress -s
 	dh_fixperms -s
 	if test -d debian/libmono0 ; then dh_makeshlibs -plibmono0 -V 'libmono-$(UPVERSION)' ;fi
-	#dh_makeshlibs -plibmint0 -V 'libmint0 (= $(VERSION))'
 	dh_installdeb -s
 	dh_shlibdeps -s -Xlibmono-profiler-cov
-	# fix cross-dependencies... but calls for trouble... using -X for now
-	# perl -pe 's/(Depends:.*)libmono0[^,\n]+[,\n](.*)/$$1$$2/' -i debian/libmono0/DEBIAN/control
 	dh_gencontrol -s -- -Vmono:upversion=$(UPVERSION)
 	dh_md5sums -s
 	dh_builddeb -s