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

[Eduard Bloch]

Author: blade
Date: 2004-06-06 18:09:19 -0600 (Sun, 06 Jun 2004)
New Revision: 904

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
Doing the same for mono-assemblies and using a proper way to pass
substvars


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2004-06-06 23:35:46 UTC (rev 903)
+++ mono/trunk/debian/changelog	2004-06-07 00:09:19 UTC (rev 904)
@@ -2,7 +2,8 @@
 
   * (NOT RELEASED YET) New upstream release
   * Eduard Bloch
-    + setting virtual ".shlibs" via provides, currently libmono-0.95
+    + setting virtual ".shlibs" via provides, currently libmono-0.95 and
+    mono-assemblies-base-0.95
   * Mirco 'meebey' Bauer
     + New upstream release
     + enabled preview features (.NET 1.2 / gmcs)

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2004-06-06 23:35:46 UTC (rev 903)
+++ mono/trunk/debian/control	2004-06-07 00:09:19 UTC (rev 904)
@@ -24,8 +24,7 @@
 Package: mono-jit
 Provides: cli-virtual-machine
 Architecture: i386 powerpc s390
-Depends: ${shlibs:Depends}, mono-assemblies-base, mono-common (= ${Source-Version})
-Conflicts: mono-assemblies-base (<< 0.91), mono-assemblies-base (>> 0.91.9)
+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
@@ -41,8 +40,7 @@
 Architecture: alpha arm hppa powerpc s390 sparc i386
 Conflicts: libmint0, libmint-dev
 Replaces: libmint0, libmint-dev
-Depends: ${shlibs:Depends}, mono-assemblies-base, mono-common (= ${Source-Version})
-Conflicts: mono-assemblies-base (<< 0.91), mono-assemblies-base (>> 0.91.9)
+Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}, mono-common (= ${Source-Version})
 Recommends: mono-jit
 Description: generic CLI (.NET/Mono) code interpreter
  The Mono Project is an open development initiative sponsored by Ximian that is

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2004-06-06 23:35:46 UTC (rev 903)
+++ mono/trunk/debian/rules	2004-06-07 00:09:19 UTC (rev 904)
@@ -87,7 +87,7 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i
+	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -115,7 +115,6 @@
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s
-	echo "mono:upversion=$(UPVERSION)" >> $(CURDIR)/debian/libmono0.substvars
 	if test -d debian/libmono0 ; then dh_makeshlibs -plibmono0 -V 'libmono-$(UPVERSION)' ;fi
 	#dh_makeshlibs -plibmint0 -V 'libmint0 (= $(VERSION))'
 	dh_installdeb -s