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

[Sebastian Dröge]

Author: slomo
Date: 2007-04-15 19:13:50 +0000 (Sun, 15 Apr 2007)
New Revision: 3042

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
* prepare mono for unstable


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-04-15 18:27:53 UTC (rev 3041)
+++ mono/trunk/debian/changelog	2007-04-15 19:13:50 UTC (rev 3042)
@@ -1,3 +1,17 @@
+mono (1.2.3.1-4) unstable; urgency=low
+
+  * Upload to unstable
+  * Sebastian 'slomo' Dröge:
+    + debian/control:
+      - Let mono-utils depend on exactly the same upstream version of libmono0
+        that it was build with and remove the other workarounds for bug #412970
+        as this is now the correct fix. Thanks to Mirco Bauer for investigating
+      - Add armel to architectures
+    + debian/rules:
+      - The shlibs file of libmono0 now contains >= $UPVERSION
+
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 15 Apr 2007 21:06:21 +0200
+
 mono (1.2.3.1-3) experimental; urgency=low
 
   * Sebastian 'slomo' Dröge:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-04-15 18:27:53 UTC (rev 3041)
+++ mono/trunk/debian/control	2007-04-15 19:13:50 UTC (rev 3042)
@@ -8,7 +8,7 @@
 Standards-Version: 3.7.2
 
 Package: mono-common
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Depends: ${shlibs:Depends}, ${misc:Depends}, binfmt-support (>= 1.1.2)
 Description: common files for Mono
  Mono is a platform for running and developing applications based on the
@@ -22,7 +22,7 @@
 
 Package: mono-runtime
 Provides: cli-runtime
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Depends: mono-jit (= ${Source-Version}), mono-gac (= ${source:Version})
 Description: Mono runtime
  Mono is a platform for running and developing applications based on the
@@ -35,9 +35,8 @@
 
 Package: mono-jit
 Provides: cli-virtual-machine
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Depends: ${shlibs:Depends}, ${misc:Depends}, mono-common (= ${Source-Version})
-Conflicts: mono-utils (<< 1.2.3.1)
 Description: fast CLI JIT/AOT compiler for Mono
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -51,7 +50,7 @@
  powerpc, arm, amd64 kfreebsd-amd64 and ia64 architectures.
 
 Package: mono
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Depends: mono-common (= ${Source-Version}), mono-jit (= ${Source-Version})
 Recommends: libgdiplus, libmono-corlib1.0-cil
 Description: Mono CLI (.NET) runtime
@@ -68,7 +67,7 @@
 
 Package: mono-devel
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Depends: mono (= ${Source-Version}), mono-mcs, mono-gac, mono-utils, mono-jay
 Suggests: mono-gmcs
 Description: Mono CLI runtime with development tools
@@ -84,9 +83,9 @@
 Package: mono-utils
 Provides: cil-disassembler
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Replaces: mono-mcs (<= 1.1.6-4)
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmono-corlib1.0-cil (>= ${mono:upversion}), libmono-corlib1.0-cil (<< ${mono:next-upversion})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmono0 (<< ${mono:next-upversion}), libmono-corlib1.0-cil
 Suggests: libmono-corlib2.0-cil
 Description: Mono utilities
  Mono is a platform for running and developing applications based on the
@@ -100,7 +99,7 @@
 
 Package: libmono0
 Section: libs
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Replaces: libmono-dev (<= 1.1.6-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: libraries for the Mono JIT
@@ -115,7 +114,7 @@
 
 Package: libmono-dev
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 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.
@@ -917,7 +916,7 @@
 
 Package: mono-jay
 Section: devel
-Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LALR(1) parser generator oriented to Java/CLI
  Mono is a platform for running and developing applications based on the

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-04-15 18:27:53 UTC (rev 3041)
+++ mono/trunk/debian/rules	2007-04-15 19:13:50 UTC (rev 3042)
@@ -318,7 +318,7 @@
 	dh_strip -s
 	dh_compress -s -Xskeleton.cs
 	dh_fixperms -s
-	dh_makeshlibs -plibmono0 -V 'libmono0 (>= $(MONO_API))'
+	dh_makeshlibs -plibmono0 -V 'libmono0 (>= $(UPVERSION))'
 	dh_installdeb -s
 	dh_shlibdeps -s -Xlibmono-profiler-cov -ldebian/libmono0/usr/lib
 	dh_gencontrol -s -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)