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

Mirco Bauer meebey-guest@costa.debian.org
Sun, 10 Jul 2005 20:36:50 +0000


Author: meebey-guest
Date: 2005-07-10 20:36:50 +0000 (Sun, 10 Jul 2005)
New Revision: 1882

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
- fixed bootstrap problems with mono-classlib-1.0 depdency on mono-common.
- applied patch my Ingo Saitz for easier bootstrapping (no build-dep on mono anymore!).
   


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-07-05 12:27:13 UTC (rev 1881)
+++ mono/trunk/debian/changelog	2005-07-10 20:36:50 UTC (rev 1882)
@@ -1,3 +1,23 @@
+mono (1.1.8.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Mirco 'meebey' Bauer
+    + debian/rules:
+      - Using new feature of cli-common (internal-mono), this allows to use
+        the built Mono (in debian/) instead of an installed Mono
+        (thanks to Ingo Saitz for working on this).
+    + debian/control:
+      - Added mono-gmcs to "Suggests" of mono-devel.
+      - Changed "Priority" of mono-classlib-(1.0|2.0)-dbg to extra.
+      - Changed dependency of mono-classlib-2.0-dbg from mono-classlib-1.0
+        to mono-classlib-2.0.
+      - Updated versioned cli-common build-dep to >= 0.1.4
+      - Removed mono-common dependency from many packages (it's not required
+        and breaks autobuilding of new packages).
+      - Removed mono-classlib-1.0/2.0 from build-deps.
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Sun, 10 Jul 2005 16:08:12 +0200
+
 mono (1.1.8.1-3) unstable; urgency=low
 
   * Mirco 'meebey' Bauer

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2005-07-05 12:27:13 UTC (rev 1881)
+++ mono/trunk/debian/control	2005-07-10 20:36:50 UTC (rev 1882)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade@debian.org>, Mirco Bauer <meebey@meebey.net>
-Build-Depends: debhelper (>= 4.0.0), cli-common (>= 0.1.3), mono-classlib-1.0, mono-classlib-2.0, libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev
+Build-Depends: debhelper (>= 4.0.0), cli-common (>= 0.1.4), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev
 Build-Conflicts: pnet-compiler
 Standards-Version: 3.6.1
 
@@ -52,6 +52,7 @@
 Section: devel
 Architecture: i386 powerpc amd64
 Depends: mono (= ${Source-Version}), mono-mcs, mono-gac, mono-utils, mono-jay
+Suggests: mono-gmcs
 Description: Mono CLI (.NET) runtime with development tools
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -65,7 +66,7 @@
 Section: devel
 Architecture: i386 powerpc amd64
 Replaces: mono-mcs (<= 1.1.6-4)
-Depends: mono-common (= ${Source-Version}), mono-classlib-1.0, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, mono-classlib-1.0
 Provides: cil-disassembler
 Description: Mono utilities
  Mono is a platform for running and developing applications based on the
@@ -80,7 +81,7 @@
 Section: libs
 Architecture: i386 powerpc amd64
 Replaces: libmono-dev (<= 1.1.6-4)
-Depends: mono-common (= ${Source-Version}), ${shlibs:Depends}
+Depends:  ${shlibs:Depends}
 Provides: libmono-${mono:upversion}
 Description: libraries for the Mono JIT
  Shared libraries for Mono, used for embedding/hosting of the
@@ -95,7 +96,7 @@
 Package: libmono-dev
 Section: devel
 Architecture: i386 powerpc amd64
-Depends: mono-common (= ${Source-Version}), libmono0 (= ${Source-Version}), libglib2.0-dev
+Depends: libmono0 (= ${Source-Version}), libglib2.0-dev
 Description: libraries for the Mono JIT - Development files
  Header files and static libraries for libmono and libmono-profiler-conv.
  .
@@ -121,7 +122,6 @@
 Section: libs
 Architecture: all
 Replaces: mono-assemblies-base (<< 1.1.8)
-Depends: mono-common (= ${Source-Version})
 Provides: mono-classlib-1.0-${mono:upversion}
 Description: Mono class library (1.0)
  Mono is a platform for running and developing applications based on the
@@ -135,9 +135,10 @@
 
 Package: mono-classlib-1.0-dbg
 Section: libs
+Priority: extra
 Architecture: all
 Replaces: mono-assemblies-base (<< 1.1.8)
-Depends: mono-common (= ${Source-Version}), mono-classlib-1.0 (= ${Source-Version})
+Depends: mono-classlib-1.0 (= ${Source-Version})
 Description: Mono class library (1.0) - debug symbols
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -149,7 +150,6 @@
 Package: mono-classlib-2.0
 Section: libs
 Architecture: all
-Depends: mono-common (= ${Source-Version})
 Provides: mono-classlib-2.0-${mono:upversion}
 Description: Mono class library (2.0)
  Mono is a platform for running and developing applications based on the
@@ -163,8 +163,9 @@
 
 Package: mono-classlib-2.0-dbg
 Section: libs
+Priority: extra
 Architecture: all
-Depends: mono-common (= ${Source-Version}), mono-classlib-1.0 (= ${Source-Version})
+Depends: mono-classlib-2.0 (= ${Source-Version})
 Description: Mono class library (2.0) - debug symbols
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -215,7 +216,7 @@
 Package: mono-gac
 Section: devel
 Architecture: all
-Depends: mono-common (= ${Source-Version}), ${cli:Depends}
+Depends: ${cli:Depends}
 Provides: global-assembly-cache-tool
 Description: Mono GAC tool
  Mono is a platform for running and developing applications based on the
@@ -229,7 +230,7 @@
 Package: mono-jay
 Section: devel
 Architecture: i386 powerpc amd64
-Depends: mono-common (= ${Source-Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: LALR(1) parser generator oriented to Java/.NET
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2005-07-05 12:27:13 UTC (rev 1881)
+++ mono/trunk/debian/rules	2005-07-10 20:36:50 UTC (rev 1882)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-#export BOOTSTRAP=1
 export MONO_SHARED_DIR=$(CURDIR)
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
@@ -47,11 +46,9 @@
 	dh_testroot
 	rm -f build-stamp
 	-$(MAKE) distclean
-	# mono's distclean is not perfect
-	#-find -name "*.mdb" -or -name "*.resources" | xargs rm -f
 	-cd debian/detector && $(MAKE) clean
 	rm -f cli-wrapper
-	rm -rf $(CURDIR)/.wapi
+	rm -rf $(MONO_SHARED_DIR)/.wapi
 	-cd debian && \
 	  rm -f dh_installxsp.1
 	dh_clean
@@ -82,7 +79,6 @@
 	cd debian && find -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" | xargs chmod -x
 	cd debian && find -type f -name "*.exe" | xargs chmod +x
 
-# Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
@@ -111,15 +107,12 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	if [ ! $$BOOTSTRAP ]; then \
-	  dh_makeclilibs -i -m 1.0; \
-	  dh_clideps -i; \
-	fi
+	dh_makeclilibs -i -m 1.0 internal-mono
+	dh_clideps -i internal-mono
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s