[Pkg-mono-svn-commits] rev 1850 - in mono/trunk/debian: . patches

Mirco Bauer meebey-guest@costa.debian.org
Fri, 17 Jun 2005 23:37:48 +0000


Author: meebey-guest
Date: 2005-06-17 23:37:45 +0000 (Fri, 17 Jun 2005)
New Revision: 1850

Added:
   mono/trunk/debian/mono-classlib-1.0-dbg.install
   mono/trunk/debian/mono-classlib-1.0.install
   mono/trunk/debian/mono-classlib-2.0-dbg.install
   mono/trunk/debian/mono-classlib-2.0.install
Removed:
   mono/trunk/debian/mono-assemblies-base.dirs
   mono/trunk/debian/mono-assemblies-base.install
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/libmono-dev.install
   mono/trunk/debian/libmono0.install
   mono/trunk/debian/mono-mcs.manpages
   mono/trunk/debian/mono-utils.install
   mono/trunk/debian/mono-utils.manpages
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
- updated for 1.1.8.
- splitted packages for 2.0 stuff.



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/changelog	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,3 +1,43 @@
+mono (1.1.8-0pre3) unstable; urgency=low
+
+  * New upstream release
+    + Fixed DirectoryInfo.GetFiles(), it failed when filename had a backspace
+      or space at the end. (Closes: #285287)
+    + With this release we also package the C# 2.0 part, for details see below.
+  * Mirco 'meebey' Bauer
+    + debian/mono-mcs.manpages:
+      - removed monoresgen.1
+      - removed prj2make.1
+    + debian/rules:
+      - disabled 07_no_libc_fun.dpatch
+        (upstream doesn't use internal libc symbols anymore)
+      - Deleting prj2make from build
+        (it is shipped with the prj2make-sharp package).
+      - Added --preview=yes and --with-ikvm-native=no to ./configure call
+        (libikvm-native.so is shipped by the ikvm package).
+      - A lot for changes to make the split of classlib 1.0/2.0 possible.
+    + debian/control:
+      - Updated versioned cli-common build-dep to >= 0.1.3
+      - Moved libMonoPosixHelper.so from libmono-dev to libmono0, because it's
+        an unversioned library now.
+      - Added "Replaces" to libmono0 for libmono-dev (<= 1.1.6-4).
+      - Renamed mono-assmeblies-base to mono-classlib-1.0 and set "Replaces"
+        and "Conflicts" for it.
+      - Added mono-assmeblies-base transistion package.
+      - Added new packages: mono-gmcs, mono-classlib-2.0, mono-classlib-1.0-dbg
+        and mono-classlib-2.0-dbg.
+      - Removed ${cli:Depends} in "Depends" from mono-classlib-1.0.
+      - Dropped mono-assemblies-arch package, there aren't any arch specific
+        CIL libraries.
+      - Changed static depends of mono-mcs to ${cli:Depends}
+    + debian/mono-utils.install:
+      - Using mono/dis/.libs/monodis because the Makefile is confused and
+        installs a libtool wrapp script instead.
+      - Added missing /usr/bin/monodiet
+      - Added new /usr/bin/mono-find-provides and /usr/bin/mono-find-requires
+
+ -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Thu, 16 Jun 2005 22:13:54 +0200
+
 mono (1.1.6-4) unstable; urgency=low
 
   * upload to unstable

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/control	2005-06-17 23:37:45 UTC (rev 1850)
@@ -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.1), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev
+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-Conflicts: pnet-compiler
 Standards-Version: 3.6.1
 
@@ -22,7 +22,7 @@
 Package: mono-jit
 Provides: cli-virtual-machine
 Architecture: i386 powerpc amd64
-Depends: mono-common (= ${Source-Version}), mono-assemblies-base-${mono:upversion}, ${shlibs:Depends}
+Depends: mono-common (= ${Source-Version}), mono-classlib-1.0-${mono:upversion}, ${shlibs:Depends}
 Description: fast CLI (.NET) JIT 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.
@@ -64,7 +64,7 @@
 Package: mono-utils
 Section: devel
 Architecture: i386 powerpc amd64
-Depends: mono-common (= ${Source-Version}), mono-assemblies-base, ${shlibs:Depends}
+Depends: mono-common (= ${Source-Version}), mono-classlib-1.0, ${shlibs:Depends}
 Provides: cil-disassembler
 Description: Mono utilities
  Mono is a platform for running and developing applications based on the
@@ -73,11 +73,12 @@
  produce and execute CIL bytecode (assemblies), and a .NET class library.
  .
  This package includes various tools useful for CLI (.NET) developers, like
- pedump, monodis, monograph and monosn.
+ dh_installxsp, pedump, monodiet, monodis and monograph.
 
 Package: libmono0
 Section: libs
 Architecture: i386 powerpc amd64
+Replaces: libmono-dev (<= 1.1.6-4)
 Depends: mono-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: libmono-${mono:upversion}
 Description: libraries for the Mono JIT
@@ -105,38 +106,76 @@
 Package: mono-assemblies-base
 Section: libs
 Architecture: all
-Depends: mono-common (= ${Source-Version}), ${cli:Depends}
-Recommends: mono-assemblies-arch
-Provides: mono-assemblies-base-${mono:upversion}
-Description: Mono class library
+Depends: mono-classlib-1.0
+Description: Mono class library - transistion package
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
  Mono provides a complete .NET CLR including compiler and runtime, which can
  produce and execute CIL bytecode (assemblies), and a .NET class library.
  .
- This package contains a collection of mono assemblies 
+ mono-assemblies-base is a metapackage for the "mono-assemblies-base to
+ mono-classlib-1.0" transistion.
+
+Package: mono-classlib-1.0
+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
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete .NET CLR including compiler and runtime, which can
+ produce and execute CIL bytecode (assemblies), and a .NET class library.
+ .
+ This package contains the Mono class library version 1.0
  (cross-platform CIL (.NET) libraries) that are used by nearly all CLI (.NET)
  programs on the system.
 
-Package: mono-assemblies-arch
+Package: mono-classlib-1.0-dbg
 Section: libs
-Architecture: i386 powerpc amd64
-Depends:  mono-assemblies-base-${mono:upversion}, ${gdi:Depends}, ${shlibs:Depends}
-Provides: mono-assemblies-arch-${mono:upversion}
-Description: architecture specific files for Mono's class library
+Architecture: all
+Replaces: mono-assemblies-base (<< 1.1.8)
+Depends: mono-common (= ${Source-Version}), 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.
  Mono provides a complete .NET CLR including compiler and runtime, which can
  produce and execute CIL bytecode (assemblies), and a .NET class library.
  .
- This package contains architecture specific files needed for
- mono-assemblies-base and depends on further packages that provide needed
- parts.
+ This package contains debug symbols (*.mdb) for Mono class library 1.0
 
+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
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete .NET CLR including compiler and runtime, which can
+ produce and execute CIL bytecode (assemblies), and a .NET class library.
+ .
+ This package contains the Mono class library version 2.0
+ (cross-platform CIL (.NET) libraries) that are used by nearly all CLI (.NET)
+ programs on the system.
+
+Package: mono-classlib-2.0-dbg
+Section: libs
+Architecture: all
+Depends: mono-common (= ${Source-Version}), mono-classlib-1.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.
+ Mono provides a complete .NET CLR including compiler and runtime, which can
+ produce and execute CIL bytecode (assemblies), and a .NET class library.
+ .
+ This package contains debug symbols (*.mdb) for Mono class library 2.0
+
 Package: mono-mcs
 Section: devel
 Architecture: all
-Depends:  mono-jit (>= ${mono:upversion}) | cli-virtual-machine, mono-jit (<< ${mono:next-upversion}) | cli-virtual-machine
+Depends: ${cli:Depends}
 Recommends: pkg-config
 Conflicts: pnet-compiler
 Provides: c-sharp-compiler, resource-file-generator, assembly-linker, strong-name-tool
@@ -150,11 +189,32 @@
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
  Mono provides a complete .NET CLR including compiler and runtime, which can
  produce and execute CIL bytecode (assemblies), and a .NET class library.
- 
+
+Package: mono-gmcs
+Section: devel
+Architecture: all
+Depends: ${cli:Depends}
+Recommends: pkg-config
+Conflicts: pnet-compiler
+Provides: c-sharp-2.0-compiler
+Description: Mono C# 2.0 compiler
+ This is the Mono C# (C-Sharp) 2.0 compiler, a platform-independent compiler
+ which produces CIL/.NET (Common Intermediate Language) binary executables.
+ The gmcs compiler supports the C# 2.0 featureset like generics, anonymous methods,
+ iterators, partial types and nullable types.
+ Warning: The C# 2.0 specification is not yet official (there is currently only
+ a draft), means no ISO nor EMCA standard yet and the specification may
+ change and breaks your code!
+ .
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete .NET CLR including compiler and runtime, which can
+ produce and execute CIL bytecode (assemblies), and a .NET class library.
+
 Package: mono-gac
 Section: devel
 Architecture: all
-Depends: mono-common (= ${Source-Version}), mono-jit | cli-virtual-machine, mono-assemblies-base
+Depends: mono-common (= ${Source-Version}), ${cli:Depends}
 Provides: global-assembly-cache-tool
 Description: Mono GAC tool
  Mono is a platform for running and developing applications based on the

Modified: mono/trunk/debian/libmono-dev.install
===================================================================
--- mono/trunk/debian/libmono-dev.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/libmono-dev.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,6 +1,5 @@
 debian/tmp/usr/lib/libmono*.a
-debian/tmp/usr/lib/libMono*.a
 debian/tmp/usr/lib/libmono*.so
-debian/tmp/usr/lib/libMono*.so
+debian/tmp/usr/lib/libMonoPosixHelper.a
 debian/tmp/usr/lib/pkgconfig/mono.pc
-debian/tmp/usr/include
+debian/tmp/usr/include/

Modified: mono/trunk/debian/libmono0.install
===================================================================
--- mono/trunk/debian/libmono0.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/libmono0.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/libmono*.so.*
-debian/tmp/usr/lib/libMono*.so.*
+debian/tmp/usr/lib/libMonoPosixHelper.so

Deleted: mono/trunk/debian/mono-assemblies-base.dirs
===================================================================
--- mono/trunk/debian/mono-assemblies-base.dirs	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-assemblies-base.dirs	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1 +0,0 @@
-usr/lib/mono/gac

Deleted: mono/trunk/debian/mono-assemblies-base.install
===================================================================
--- mono/trunk/debian/mono-assemblies-base.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-assemblies-base.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/mono/gac/
-debian/tmp/usr/lib/mono/1.0/

Added: mono/trunk/debian/mono-classlib-1.0-dbg.install
===================================================================
--- mono/trunk/debian/mono-classlib-1.0-dbg.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-classlib-1.0-dbg.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/mono/gac/*/1.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*.mdb
+debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/7.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/cscompmgd/7.0.*/*.mdb
+debian/tmp/usr/lib/mono/1.0/mscorlib.dll.mdb

Copied: mono/trunk/debian/mono-classlib-1.0.install (from rev 1631, mono/trunk/debian/mono-assemblies-base.install)
===================================================================
--- mono/trunk/debian/mono-assemblies-base.install	2005-04-16 18:05:39 UTC (rev 1631)
+++ mono/trunk/debian/mono-classlib-1.0.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/mono/gac/*/1.0.*/
+debian/tmp/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/
+debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.JScript/7.0.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/7.0.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/
+debian/tmp/usr/lib/mono/gac/cscompmgd/7.0.*/
+debian/tmp/usr/lib/mono/1.0/

Added: mono/trunk/debian/mono-classlib-2.0-dbg.install
===================================================================
--- mono/trunk/debian/mono-classlib-2.0-dbg.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-classlib-2.0-dbg.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -0,0 +1,10 @@
+debian/tmp/usr/lib/mono/gac/*/2.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*.mdb
+debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/8.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb
+debian/tmp/usr/lib/mono/gac/Mono.C5/0.5.*/*.mdb
+debian/tmp/usr/lib/mono/gac/cscompmgd/8.0.*/*.mdb
+debian/tmp/usr/lib/mono/2.0/mscorlib.dll.mdb

Added: mono/trunk/debian/mono-classlib-2.0.install
===================================================================
--- mono/trunk/debian/mono-classlib-2.0.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-classlib-2.0.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -0,0 +1,10 @@
+debian/tmp/usr/lib/mono/gac/*/2.0.*/
+debian/tmp/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/
+debian/tmp/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.JScript/8.0.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualBasic/8.0.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/
+debian/tmp/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/
+debian/tmp/usr/lib/mono/gac/Mono.C5/0.5.*/
+debian/tmp/usr/lib/mono/gac/cscompmgd/8.0.*/
+debian/tmp/usr/lib/mono/2.0/

Modified: mono/trunk/debian/mono-mcs.manpages
===================================================================
--- mono/trunk/debian/mono-mcs.manpages	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-mcs.manpages	2005-06-17 23:37:45 UTC (rev 1850)
@@ -7,7 +7,6 @@
 debian/tmp/usr/share/man/man1/disco.1
 debian/tmp/usr/share/man/man1/dtd2xsd.1
 debian/tmp/usr/share/man/man1/genxs.1
-debian/man/gmcs.1
 debian/tmp/usr/share/man/man1/ilasm.1
 debian/tmp/usr/share/man/man1/macpack.1
 debian/tmp/usr/share/man/man1/makecert.1
@@ -15,12 +14,10 @@
 debian/tmp/usr/share/man/man1/mcs.1
 debian/man/mjs.1
 debian/tmp/usr/share/man/man1/mkbundle.1
-debian/man/mono-find-provides.1
-debian/man/mono-find-requires.1
+debian/tmp/usr/share/man/man1/mono-service.1
+debian/tmp/usr/share/man/man1/mono-shlib-cop.1
 debian/tmp/usr/share/man/man1/monop.1
-debian/man/monoresgen.1
 debian/tmp/usr/share/man/man1/permview.1
-debian/tmp/usr/share/man/man1/prj2make.1
 debian/man/resgen.1
 debian/tmp/usr/share/man/man1/secutil.1
 debian/tmp/usr/share/man/man1/setreg.1
@@ -29,5 +26,4 @@
 debian/tmp/usr/share/man/man1/soapsuds.1
 debian/tmp/usr/share/man/man1/sqlsharp.1
 debian/tmp/usr/share/man/man1/wsdl.1
-debian/man/wsdl2.1
 debian/tmp/usr/share/man/man1/xsd.1

Modified: mono/trunk/debian/mono-utils.install
===================================================================
--- mono/trunk/debian/mono-utils.install	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-utils.install	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,6 +1,9 @@
-debian/dh_installxsp		/usr/bin
-debian/postrm-monoxsp		/usr/share/debhelper/autoscripts
-debian/postinst-monoxsp		/usr/share/debhelper/autoscripts
+debian/dh_installxsp			/usr/bin/
+debian/postrm-monoxsp			/usr/share/debhelper/autoscripts/
+debian/postinst-monoxsp			/usr/share/debhelper/autoscripts/
 debian/tmp/usr/bin/pedump
-debian/tmp/usr/bin/monodis
+mono/dis/.libs/monodis			/usr/bin/
 debian/tmp/usr/bin/monograph
+debian/tmp/usr/bin/monodiet
+debian/tmp/usr/bin/mono-find-provides
+debian/tmp/usr/bin/mono-find-requires

Modified: mono/trunk/debian/mono-utils.manpages
===================================================================
--- mono/trunk/debian/mono-utils.manpages	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/mono-utils.manpages	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,5 +1,7 @@
 debian/man/pedump.1
 debian/man/monodiet.1
 debian/man/monograph.1
+debian/man/mono-find-provides.1
+debian/man/mono-find-requires.1
 debian/tmp/usr/share/man/man1/monodis.1
-debian/dh_*.1
+debian/dh_installxsp.1

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/patches/00list	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1 +0,0 @@
-07_no_libc_fun

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2005-06-17 22:31:30 UTC (rev 1849)
+++ mono/trunk/debian/rules	2005-06-17 23:37:45 UTC (rev 1850)
@@ -1,6 +1,7 @@
 #!/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)
@@ -37,7 +38,7 @@
 	  --mandir=\$${prefix}/share/man \
 	  --infodir=\$${prefix}/share/info --sysconfdir=/etc \
 	  --with-sigaltstack=no --with-gc=included \
-	  --with-jit=yes --with-ikvm-native=yes
+	  --with-jit=yes --with-ikvm-native=no --with-preview=yes
 	$(MAKE)
 	touch build-stamp
 
@@ -65,6 +66,10 @@
 	rm -f debian/tmp/usr/lib/pkgconfig/mono-nunit.pc
 	rm -f debian/tmp/usr/lib/mono/1.0/nunit*.dll
 	rm -rf  debian/tmp/usr/lib/mono/gac/nunit*
+	# neither prj2make
+	rm -f debian/tmp/usr/bin/prj2make
+	rm -f debian/usr/share/man/man1/prj2make.1
+	rm -f debian/tmp/usr/lib/mono/1.0/prj2make.exe*
 	cd debian && \
 	  for x in dh_installxsp; \
 	    do chmod +x $$x; pod2man $$x > $$x.1 ; done
@@ -73,24 +78,32 @@
 	  $(MAKE) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
 	install -o root -g root -m 644 debian/cli.binfmt \
 	  debian/mono-common/usr/share/binfmts/cli
-	# MonoConventions: removing executable flag from .dll .mdb and .cs
+	# CLI Policy
 	cd debian && find -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" | xargs chmod -x
-	# MonoConventions: adding executable flag to .exes
 	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
-	dh_install -i -Xbin/mono -Xbin/monodiet -Xbin/monodis -Xbin/monograph -Xbin/pedump -Xbin/jay
+	# that exclude list are programs for arch-dep packages
+	dh_install -i -Xbin/monodiet -Xbin/monodis -Xbin/monograph -Xbin/mono-find-provides -Xbin/mono-find-requires -Xbin/pedump -Xbin/jay
+	# delete bin/mono from mono-mcs, no way to exclude it with dh_install,
+        # without exluding other things too which I do not want
+	rm -f debian/mono-mcs/usr/bin/mono
 	# delete gacutil from mono-mcs (this is already in mono-gac)
 	rm -f debian/mono-mcs/usr/bin/gacutil
 	rm -f debian/mono-mcs/usr/lib/mono/1.0/gacutil.exe*
-	# delete programs from mono-assemblies-base (those are already in mono-mcs)
-	rm -f debian/mono-assemblies-base/usr/lib/mono/1.0/*.exe*
-	# missing sqlite dll map
-	DIR=$$(echo $(CURDIR)/debian/mono-assemblies-base/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*); \
-	  echo "<dllmap dll=\"sqlite\" target=\"libsqlite.so.0\" />\n<dllmap dll=\"sqlite3\" target=\"libsqlite3.so.0\" />" > $$DIR/Mono.Data.SqliteClient.dll.config
+	# delete wsdl2 from mono-mcs (this is already in mono-gmcs)
+	rm -f debian/mono-mcs/usr/bin/wsdl2
+	# delete gmcs from mono-mcs (this is already in mono-gmcs)
+	rm -f debian/mono-mcs/usr/bin/gmcs
+	# delete *.mdb from mono-classlib-1.0/2.0
+	cd debian/mono-classlib-1.0 && find -type f -name "*.mdb" | xargs rm -f
+	cd debian/mono-classlib-2.0 && find -type f -name "*.mdb" | xargs rm -f
+	# delete programs from mono-classlib-1.0/2.0 (those are already in mono-mcs/mono-gmcs)
+	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/*.exe*
+	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/*.exe*
 	dh_link -i
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
@@ -98,8 +111,10 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_makeclilibs -i -m 1.0
-	dh_clideps -i
+	if [ ! $$BOOTSTRAP ]; then \
+	  dh_makeclilibs -i -m 1.0; \
+	  dh_clideps -i; \
+	fi
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i
@@ -120,7 +135,7 @@
 	dh_compress -s
 	dh_compress -s -Xskeleton.cs
 	dh_fixperms -s
-	if test -d debian/libmono0 ; then dh_makeshlibs -plibmono0 -V 'libmono-$(UPVERSION)' ; fi
+	dh_makeshlibs -plibmono0 -V libmono-$(UPVERSION)
 	dh_installdeb -s
 	dh_shlibdeps -s -Xlibmono-profiler-cov
 	dh_gencontrol -s -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)