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

Mirco Bauer meebey-guest at costa.debian.org
Sun Apr 2 22:44:07 UTC 2006


Author: meebey-guest
Date: 2006-04-02 22:44:05 +0000 (Sun, 02 Apr 2006)
New Revision: 2374

Added:
   mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config
   mono/trunk/debian/System.Windows.Forms.dll.config
   mono/trunk/debian/libmono-accessibility1.0-cil.install
   mono/trunk/debian/libmono-accessibility2.0-cil.install
   mono/trunk/debian/libmono-c5-0.5-cil.install
   mono/trunk/debian/libmono-cscompmgd7.0-cil.install
   mono/trunk/debian/libmono-cscompmgd8.0-cil.install
   mono/trunk/debian/libmono-data-tds1.0-cil.install
   mono/trunk/debian/libmono-data-tds2.0-cil.install
   mono/trunk/debian/libmono-ldap1.0-cil.install
   mono/trunk/debian/libmono-ldap2.0-cil.install
   mono/trunk/debian/libmono-microsoft-build2.0-cil.install
   mono/trunk/debian/libmono-microsoft7.0-cil.install
   mono/trunk/debian/libmono-microsoft8.0-cil.install
   mono/trunk/debian/libmono-oracle1.0-cil.install
   mono/trunk/debian/libmono-peapi1.0-cil.install
   mono/trunk/debian/libmono-peapi2.0-cil.install
   mono/trunk/debian/libmono-relaxng1.0-cil.install
   mono/trunk/debian/libmono-relaxng2.0-cil.install
   mono/trunk/debian/libmono-security1.0-cil.install
   mono/trunk/debian/libmono-security2.0-cil.install
   mono/trunk/debian/libmono-system-data1.0-cil.install
   mono/trunk/debian/libmono-system-data2.0-cil.install
   mono/trunk/debian/libmono-system-ldap1.0-cil.install
   mono/trunk/debian/libmono-system-ldap2.0-cil.install
   mono/trunk/debian/libmono-system-messaging1.0-cil.install
   mono/trunk/debian/libmono-system-messaging2.0-cil.install
   mono/trunk/debian/libmono-system-runtime1.0-cil.install
   mono/trunk/debian/libmono-system-runtime2.0-cil.install
   mono/trunk/debian/libmono-system-web1.0-cil.install
   mono/trunk/debian/libmono-system1.0-cil.install
   mono/trunk/debian/libmono-system2.0-cil.install
   mono/trunk/debian/libmono1.0-cil.install
   mono/trunk/debian/libmono2.0-cil.install
   mono/trunk/debian/shlibs.local
Removed:
   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
   mono/trunk/debian/mono-utils.dirs
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/dh_makeclilibs
   mono/trunk/debian/libmono-corlib1.0-cil.install
   mono/trunk/debian/libmono-corlib2.0-cil.install
   mono/trunk/debian/libmono-winforms1.0-cil.install
   mono/trunk/debian/libmono-winforms2.0-cil.install
   mono/trunk/debian/rules
Log:
- da final split!



Added: mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config
===================================================================
--- mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/FirebirdSql.Data.Firebird.dll.config	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,3 @@
+<configuration>
+	<dllmap dll="libfbembed" target="libfbembed.so.1"/>
+</configuration>

Added: mono/trunk/debian/System.Windows.Forms.dll.config
===================================================================
--- mono/trunk/debian/System.Windows.Forms.dll.config	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/System.Windows.Forms.dll.config	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,3 @@
+<configuration>
+	<dllmap dll="gdiplus" target="libgdiplus.so.0"/>
+</configuration>

Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/changelog	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,11 +1,69 @@
-mono (1.1.13.4-2) unstable; urgency=low
+mono (1.1.13.4-1pre12) unstable; urgency=low
 
-  * debian/patches/unix-end-point-equals.dpatch (SVN rev 57754:57757):
-    + Fix Equals() and GetHashCode() of Mono.Unix.UnixEndPoint.
-      http://bugzilla.ximian.com/show_bug.cgi?id=77747
+  * Mirco 'meebey' Bauer
+    + Splitted left libraries of mono-classlib-1.0 and mono-classlib-2.0
+      into own packages to avoid ABI breakages and meet the CLI Policy.
+      All libraries in a package must have the same version number
+      (required for versioned package names), see CLI Policy 0.4.0:
+      http://pkg-mono.alioth.debian.org/cli-policy/....
+      mono-classlib-1.0/2.0 are now empty transition packages.
+    + debian/mono-classlib-1.0.install
+      debian/mono-classlib-1.0-dbg.install
+      debian/mono-classlib-2.0.install
+      debian/mono-classlib-2.0-dbg.install:
+      - Removed, not needed anymore because of splitting.
+    + debian/control:
+      - Removed mono-classlib-1.0/2.0-dbg package
+        Removed mono-assemblies-base package:
+      - Changed mono-classlib-1.0/2.0 to have a minimum as depencies for the
+        transition to avoid a dependency hell.
+        All packages that have a binary dependency on
+        mono-classlib-1.0/2.0 must be rebuild!
+      - Removed pnet-compiler Build-Conflicts and Conflicts.
+      - Updated libgdiplus dependency of libmono-winforms1.0/2.0-cil
+        to >= 1.1.13.4
+      - Moved System.Drawing.Design and System.Design to
+        libmono-winforms1.0/2.0-cil
+      - Added mono-mbas package, to avoid GUI dependency chain
+      - Added mono-mjs package, to avoid GUI dependency chain
+      - Added libmono-corlib2.0-cil to mono-utils binary deps, required for
+        monodis to parse 2.0 libraries.
+      - Added libmono-system1.0-cil package
+      - Added libmono-system2.0-cil package
+      - Added libmono-system-data1.0-cil package
+      - Added libmono-system-data2.0-cil package
+      - Added libmono-system-ldap1.0-cil package
+      - Added libmono-system-ldap2.0-cil package
+      - Added libmono1.0-cil package
+      - Added libmono2.0-cil package
+      - Added libmono-data-tds1.0-cil package
+      - Added libmono-data-tds2.0-cil package
+      - Added libmono-accessibility1.0-cil package
+      - Added libmono-accessibility2.0-cil package
+      - Added libmono-c5-0.5-cil package
+      - Added libmono-cscompmgd7.0-cil package
+      - Added libmono-cscompmgd8.0-cil package
+      - Added libmono-ldap1.0-cil package
+      - Added libmono-ldap2.0-cil package
+      - Added libmono-microsoft-build2.0-cil package
+      - Added libmono-microsoft7.0-cil package
+      - Added libmono-microsoft8.0-cil package
+      - Added libmono-oracle1.0-cil package
+      - Added libmono-oracle2.0-cil package
+      - Added libmono-peapi1.0-cil package
+      - Added libmono-peapi2.0-cil package
+      - Added libmono-relaxng1.0-cil package
+      - Added libmono-relaxng2.0-cil package
+    + debian/rules:
+      - Added dh_makeclilibs call for 2.0 libraries, with tighter dependencies.
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Sun, 12 Mar 2006 16:11:47 +0100
+  * Sebastian Dröge
+    + debian/patches/unix-end-point-equals.dpatch (SVN rev 57754:57757):
+      - Fix Equals() and GetHashCode() of Mono.Unix.UnixEndPoint.
+        http://bugzilla.ximian.com/show_bug.cgi?id=77747
 
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 26 Mar 2006 19:22:47 +0100
+
 mono (1.1.13.4-1) unstable; urgency=low
 
   * New upstream release

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/control	2006-04-02 22:44:05 UTC (rev 2374)
@@ -4,7 +4,6 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>
 Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev, dc, libx11-dev, libxt-dev, libgc-dev [kfreebsd-i386]
-Build-Conflicts: pnet-compiler
 Standards-Version: 3.6.2.1
 
 Package: mono-common
@@ -39,7 +38,7 @@
 Package: mono
 Architecture: i386 powerpc amd64 ia64 arm armeb
 Depends: mono-common (= ${Source-Version}), mono-jit (= ${Source-Version})
-Recommends: libgdiplus
+Recommends: libgdiplus, libmono-corlib1.0-cil
 Description: Mono CLI (.NET) runtime
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -71,7 +70,7 @@
 Section: devel
 Architecture: i386 powerpc amd64 ia64 arm armeb
 Replaces: mono-mcs (<= 1.1.6-4)
-Depends: ${shlibs:Depends}, ${misc:Depends}, mono-classlib-1.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmono-corlib1.0-cil, libmono-corlib2.0-cil
 Provides: cil-disassembler
 Description: Mono utilities
  Mono is a platform for running and developing applications based on the
@@ -112,24 +111,52 @@
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
 
-Package: mono-assemblies-base
+Package: libmono1.0-cil
 Section: libs
 Architecture: all
-Depends: mono-classlib-1.0 (= ${Source-Version})
-Description: Mono class library - transistion package
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono libraries (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 CLR (Common Language Runtime) including compiler and
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
  .
- mono-assemblies-base is a metapackage for the "mono-assemblies-base to
- mono-classlib-1.0" transistion.
+ This package contains the Mono libraries.
 
+Package: libmono2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono libraries (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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono libraries.
+
+Package: libmono-c5-0.5-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono C5 library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono C5 library.
+
 Package: libmono-corlib1.0-cil
 Section: libs
 Architecture: all
-Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-1.0-dbg (<< 1.1.13.4-1)
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
 Depends: mono-jit (>= ${mono:upversion}), mono-jit (<< ${mono:next-upversion})
 Description: Mono core library (1.0)
  Mono is a platform for running and developing applications based on the
@@ -141,86 +168,281 @@
  This package contains the Core Library (mscorlib.dll) of Mono which is the
  glue between the Class Library and the JIT.
 
+Package: libmono-corlib2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: mono-jit (>= ${mono:upversion}), mono-jit (<< ${mono:next-upversion})
+Description: Mono core 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Core Library (mscorlib.dll) of Mono which is the
+ glue between the Class Library and the JIT.
+
 Package: mono-classlib-1.0
 Section: libs
 Architecture: all
 Replaces: mono-assemblies-base (<< 1.1.8)
+Depends: libmono-corlib1.0-cil (>= 1.0), libmono-system1.0-cil (>= 1.0), libmono1.0-cil (>= 1.1.13.4)
 Provides: mono-classlib-1.0-${mono:upversion}
-Depends: libmono-corlib1.0-cil (>= 1.0), libmono-sharpzip0.6-cil, libmono-sharpzip0.84-cil, libmono-npgsql1.0-cil, libmono-bytefx0.7.6.1-cil, libmono-firebirdsql1.7-cil, libmono-winforms1.0-cil, libmono-cairo1.0-cil, libmono-sqlite1.0-cil
-Description: Mono class library (1.0)
+Description: Mono class library (1.0) - transition 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 CLR (Common Language Runtime) including compiler and
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
  .
- This package contains the Mono class library version 1.0 that is used by
- nearly all CLI applications/libraries on the system.
+ This is an empty transition package, which will be removed once nothing
+ depends on it anymore.
 
-Package: mono-classlib-1.0-dbg
+Package: mono-classlib-2.0
 Section: libs
-Priority: extra
 Architecture: all
-Replaces: mono-assemblies-base (<< 1.1.8)
-Depends: mono-classlib-1.0 (= ${Source-Version})
-Description: Mono class library (1.0) - debug symbols
+Depends: libmono-corlib2.0-cil (>= 1.0), libmono-system2.0-cil (>= 1.0), libmono2.0-cil (>= 1.1.13.4)
+Provides: mono-classlib-2.0-${mono:upversion}
+Description: Mono class library (2.0) - transition 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 CLR (Common Language Runtime) including compiler and
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
  .
- This package contains debug symbols (*.mdb) for Mono class library 1.0
+ This is an empty transition package, which will be removed once nothing
+ depends on it anymore.
 
-Package: libmono-corlib2.0-cil
+Package: libmono-system1.0-cil
 Section: libs
 Architecture: all
-Replaces: mono-classlib-2.0 (<< 1.1.13.4-1), mono-classlib-2.0-dbg (<< 1.1.13.4-1)
-Depends: mono-jit (>= ${mono:upversion}), mono-jit (<< ${mono:next-upversion})
-Description: Mono core library (2.0)
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System libraries (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 CLR (Common Language Runtime) including compiler and
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
  .
- This package contains the Core Library (mscorlib.dll) of Mono which is the
- glue between the Class Library and the JIT.
+ This package contains the BCL (Base Class Libraries) of Mono.
 
-Package: mono-classlib-2.0
+Package: libmono-system2.0-cil
 Section: libs
 Architecture: all
-Provides: mono-classlib-2.0-${mono:upversion}
-Depends: libmono-corlib2.0-cil (>= 1.0), libmono-sharpzip2.6-cil, libmono-sharpzip2.84-cil, libmono-npgsql2.0-cil, libmono-bytefx0.7.6.2-cil, libmono-winforms2.0-cil, libmono-cairo2.0-cil, libmono-sqlite2.0-cil
-Description: Mono class library (2.0)
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System libraries (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 CLR (Common Language Runtime) including compiler and
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
  .
- This package contains the Mono class library version 2.0 that is used by
- nearly all CLI applications/libraries on the system.
+ This package contains the BCL (Base Class Libraries) of Mono.
 
-Package: mono-classlib-2.0-dbg
+Package: libmono-system-messaging1.0-cil
 Section: libs
-Priority: extra
 Architecture: all
-Depends: mono-classlib-2.0 (= ${Source-Version})
-Description: Mono class library (2.0) - debug symbols
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Messaging library
  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 CLR (Common Language Runtime) including compiler and
  runtime, which can produce and execute CIL (Common Intermediate Language)
  bytecode (aka assemblies), and a class library.
  .
- This package contains debug symbols (*.mdb) for Mono class library 2.0
+ This package contains the Mono System.Messaging library version 1.0.
 
+Package: libmono-system-messaging2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Messaging Library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Messaging library version 2.0.
+
+Package: libmono-security1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Security library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Security library version 1.0.
+
+Package: libmono-security2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Security library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Security library version 2.0.
+
+Package: libmono-data-tds1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Data library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Data library version 1.0.
+
+Package: libmono-data-tds2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Data Library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Data library version 2.0.
+
+Package: libmono-system-data1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Data library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Data library version 1.0.
+
+Package: libmono-system-data2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Data Library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Data library version 2.0.
+
+Package: libmono-system-web1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Web library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Web library version 1.0.
+
+Package: libmono-system-web2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Web Library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Web library version 2.0.
+
+Package: libmono-system-runtime1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Runtime library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Runtime library version 1.0.
+
+Package: libmono-system-runtime2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Runtime Library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.Runtime library version 2.0.
+
+Package: libmono-system-ldap1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.DirectoryServices library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.DirectoryServices library version 1.0.
+
+Package: libmono-system-ldap2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.DirectoryServices library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono System.DirectoryServices library version 2.0.
+
 Package: libmono-winforms1.0-cil
 Section: libs
 Architecture: all
-Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-1.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib1.0-cil (>= 1.0), mono-classlib-1.0 (>= 1.0), libgdiplus (>= 1.0)
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
 Description: Mono System.Windows.Forms library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -233,9 +455,9 @@
 Package: libmono-winforms2.0-cil
 Section: libs
 Architecture: all
-Replaces: mono-classlib-2.0 (<< 1.1.13.4-1), mono-classlib-2.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib2.0-cil (>= 1.0), mono-classlib-1.0 (>= 1.0), libgdiplus (>= 1.0)
-Description: Mono Sytem.Windows.Forms library
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono System.Windows.Forms library
  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 CLR (Common Language Runtime) including compiler and
@@ -248,7 +470,7 @@
 Section: libs
 Architecture: all
 Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-1.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib1.0-cil (>= 1.0), mono-classlib-1.0 (>= 1.0), libcairo2 (>= 1.0.2-2)
+Depends: ${cli:Depends}
 Description: Mono Cairo library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -262,8 +484,8 @@
 Section: libs
 Architecture: all
 Replaces: mono-classlib-2.0 (<< 1.1.13.4-1), mono-classlib-2.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib2.0-cil (>= 1.0), mono-classlib-2.0 (>= 1.0), libcairo2 (>= 1.0.2-2)
-Description: Mono Sytem.Windows.Forms library
+Depends: ${cli:Depends}
+Description: Mono Cairo library
  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 CLR (Common Language Runtime) including compiler and
@@ -360,7 +582,7 @@
 Section: libs
 Architecture: all
 Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-1.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib1.0-cil (>= 1.0), mono-classlib-1.0 (>= 1.0), libmono-sharpzip0.84-cil
+Depends: libmono-corlib1.0-cil (>= 1.0), libmono-sharpzip0.84-cil (>= 1.0), libmono-system-data1.0-cil (>= 1.0), libmono-system1.0-cil (>= 1.0), libmono1.0-cil (>= 1.1.13.4)
 Description: Mono ByteFX.Data library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -374,7 +596,7 @@
 Section: libs
 Architecture: all
 Replaces: mono-classlib-2.0 (<< 1.1.13.4-1), mono-classlib-2.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib2.0-cil (>= 1.0), mono-classlib-2.0 (>= 1.0), libmono-sharpzip2.84-cil
+Depends: libmono-corlib2.0-cil (>= 1.1.13.4), libmono-sharpzip2.84-cil (>= 1.0), libmono-system-data2.0-cil (>= 1.0), libmono-system2.0-cil (>= 1.1.13.4), libmono2.0-cil (>= 1.1.13.4)
 Description: Mono ByteFX.Data library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -388,7 +610,7 @@
 Section: libs
 Architecture: all
 Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-2.0 (<< 1.1.13.4-1), mono-classlib-2.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib1.0-cil (>= 1.0), mono-classlib-1.0 (>= 1.0), libfbembed1
+Depends: ${cli:Depends}
 Description: Mono FirebirdSql library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -398,11 +620,39 @@
  .
  This package contains the Mono FirebirdSql library.
 
+Package: libmono-oracle1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Oracle library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Oracle library version 1.0.
+
+Package: libmono-oracle2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Oracle library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Oracle library version 2.0.
+
 Package: libmono-sqlite1.0-cil
 Section: libs
 Architecture: all
 Replaces: mono-classlib-1.0 (<< 1.1.13.4-1), mono-classlib-1.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib1.0-cil (>= 1.0), mono-classlib-1.0 (>= 1.0), libsqlite0 (>= 2.8.16), libsqlite3-0 (>= 3.2.8)
+Depends: ${cli:Depends}
 Description: Mono Sqlite library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -416,7 +666,7 @@
 Section: libs
 Architecture: all
 Replaces: mono-classlib-2.0 (<< 1.1.13.4-1), mono-classlib-2.0-dbg (<< 1.1.13.4-1)
-Depends: libmono-corlib2.0-cil (>= 1.0), mono-classlib-2.0 (>= 1.0), libsqlite0 (>= 2.8.16), libsqlite3-0 (>= 3.2.8)
+Depends: ${cli:Depends}
 Description: Mono Sqlite library
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -426,12 +676,193 @@
  .
  This package contains the Mono Sqlite library version 2.0.
 
+Package: libmono-accessibility1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Accessibility library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Accessibility library version 1.0.
+
+Package: libmono-accessibility2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Accessibility library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Accessibility library version 2.0.
+
+Package: libmono-cscompmgd7.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono cscompmgd library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono cscompmgd library version 7.0.
+
+Package: libmono-cscompmgd8.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono cscompmgd library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono cscompmgd library version 8.0.
+
+Package: libmono-ldap1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono LDAP library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono LDAP library version 1.0.
+
+Package: libmono-ldap2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono LDAP library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono LDAP library version 2.0.
+
+Package: libmono-microsoft-build2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Microsoft.Build libraries
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Microsoft.Build libraries version 2.0.
+
+Package: libmono-microsoft7.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Microsoft libraries
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Microsoft libraries version 7.0.
+
+Package: libmono-microsoft8.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Microsoft libraries
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Microsoft libraries version 8.0.
+
+Package: libmono-peapi1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono PEAPI library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono PEAPI library version 1.0.
+
+Package: libmono-peapi2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono PEAPI library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono PEAPI library version 2.0.
+
+Package: libmono-relaxng1.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-1.0 (<< 1.1.13.4-2), mono-classlib-1.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Relaxng library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Relaxng library version 1.0.
+
+Package: libmono-relaxng2.0-cil
+Section: libs
+Architecture: all
+Replaces: mono-classlib-2.0 (<< 1.1.13.4-2), mono-classlib-2.0-dbg (<< 1.1.13.4-2)
+Depends: ${cli:Depends}
+Description: Mono Relaxng library
+ 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 CLR (Common Language Runtime) including compiler and
+ runtime, which can produce and execute CIL (Common Intermediate Language)
+ bytecode (aka assemblies), and a class library.
+ .
+ This package contains the Mono Relaxng library version 2.0.
+
 Package: mono-mcs
 Section: devel
 Architecture: all
 Depends: ${cli:Depends}
 Recommends: pkg-config
-Conflicts: pnet-compiler
 Provides: c-sharp-compiler, resource-file-generator, assembly-linker, strong-name-tool
 Description: Mono C# compiler
  This is the Mono C# (C-Sharp) compiler, a platform-independent compiler which
@@ -450,7 +881,6 @@
 Architecture: all
 Depends: ${cli:Depends}
 Recommends: pkg-config
-Conflicts: pnet-compiler
 Replaces: mono-mcs (>= 1.1.10), mono-mcs (<= 1.1.13)
 Provides: c-sharp-2.0-compiler
 Description: Mono C# 2.0 compiler

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/dh_clideps	2006-04-02 22:44:05 UTC (rev 2374)
@@ -66,11 +66,11 @@
 my $cli = '/usr/bin/cli';
 my $cli_version = `$cli --version 2>&1`;
 my $cli_parser;
+my $pwd=`pwd`;
+chomp $pwd;
 
 if (defined($ARGV[0]) && $ARGV[0] eq "internal-mono") {
     $clr = "mono";
-    my $pwd=`pwd`;
-    chomp $pwd;
     $cli_parser = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$pwd/debian/tmp/usr/lib/mono/1.0:$pwd/debian/tmp/usr/lib/mono/2.0 $pwd/debian/tmp/usr/bin/monodis";
     $cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`;
     verbose_print("Will use built Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
@@ -186,7 +186,7 @@
                 $key = $vers . "__" . lc($key);
                 my $compat = "$name/$key";
                 if (!defined($libdata{$compat})) {
-                    warning("Warning! No Debian dependency data for $name ($key)!");
+                    warning("Warning: No Debian dependency data for $name ($key)!");
                 } else {
                     push(@depkgs, $libdata{$compat});
                 }
@@ -200,7 +200,7 @@
                   } elsif ($vers eq "2.0.0.0") {
                     $needs_net_2_0 = 1;
                   } else {
-                    warning("Warning! Unknown mscorlib version: $vers!");
+                    warning("Warning: Unknown mscorlib version: $vers!");
                   }
                 } 
             }
@@ -252,9 +252,9 @@
         sort {
             # beautify the sort order, requested by meebey
             my $apkg;
-            $a=~/^\S+/;
+            $a =~ /^\S+/;
             $apkg=$&;
-            $b=~/^\S+/;
+            $b =~ /^\S+/;
             if($apkg eq $&) {
                return -1 if( ($a=~/>=/) && ($b=~/<</));
                return 1 if( ($b=~/>=/) && ($a=~/<</));
@@ -266,41 +266,33 @@
     addsubstvar($package, "cli:Depends", $deps);
 }
 
-sub resolveShlib {
-    our($file, $name, $outRef) = @_;
-    if (!%shlibdata) {
-        open($fh, "cat /var/lib/dpkg/info/*.shlibs debian/shlibs.local debian/*/DEBIAN/shlibs 2>/dev/null |");
-        while (<$fh>) {
-            /(\S+)\s+(\S+)\s+(\w.*)\n?/;
-            $shlibdata{"$1.so.$2"} = $3;
-        }
-    }
-    
-    if (-r "$file.config" &&
-        `cat $file.config` =~ /dll=\W*$name[^>]+\Wtarget\W*=\W*(\w[\w.\-_\d]+)/ &&
-        defined( $shlibdata{$1})) {
-        $$outRef = $shlibdata{$1};
-        return 1;
-    }
-    return 0;
-}
-
 sub extraDeps {
    my $config=$_[0].".config";
    return undef if (! -r $config);
    my $ret=undef;
 
    if (!%shlibdata) {
-      open($fh, "cat /var/lib/dpkg/info/*.shlibs debian/shlibs.local debian/*/DEBIAN/shlibs 2>/dev/null |");
+      open($fh, "cat /var/lib/dpkg/info/*.shlibs $pwd/debian/shlibs.local $pwd/debian/*/DEBIAN/shlibs 2>/dev/null |");
       while (<$fh>) {
-         /(\S+)\s+(\S+)\s+(\w.*)\n?/;
-         $shlibdata{"$1.so.$2"} = $3;
+          /(\S+)\s+(\S+)\s+(\w.*)\n?/;
+          my ($soname, $soversion, $dependency);
+          #chomp;
+          #my($soname, $soversion, $dependency) = split(/\s+/, $_, 3);
+          $soname = $1;    
+          $soversion = $2; 
+          $dependency = $3;
+          $shlibdata{"$soname.so.$soversion"} = $dependency;
       }
    }
 
    $config = `cat $config`;
-   while ($config=~s/\Wtarget\W*=\W*(\w[\w.\-\d]+)//) {
-      $ret.= (", ".$shlibdata{$1}) if(defined($shlibdata{$1}));
+   while ($config =~ s/\Wtarget\W*=\W*(\w[\w.\-\d]+\.so\.\d+)//) {
+       verbose_print("found $config: '$1'");
+       if (defined($shlibdata{$1})) {
+           $ret .= ", ".$shlibdata{$1};
+       } else {
+           warning("Warning: Missing shlibs entry for $1!");
+       }
    }
    $ret =~ s/^, // if $ret;
    return $ret;

Modified: mono/trunk/debian/dh_makeclilibs
===================================================================
--- mono/trunk/debian/dh_makeclilibs	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/dh_makeclilibs	2006-04-02 22:44:05 UTC (rev 2374)
@@ -279,28 +279,6 @@
     }
 }
 
-sub extraDeps {
-   my $config=$_[0].".config";
-   my $ret=undef;
-
-   if (!%shlibdata) {
-      open($fh, "cat /var/lib/dpkg/info/*.shlibs debian/shlibs.local debian/*/DEBIAN/shlibs 2>/dev/null |");
-      while (<$fh>) {
-         /(\S+)\s+(\S+)\s+(\w.*)\n?/;
-         $shlibdata{"$1.so.$2"} = $3;
-      }
-   }
-
-   if (-r $config) {
-      $config = `cat $config`;
-      while($config=~s/\Wtarget\W*=\W*(\w[\w.\-\d]+)//) {
-         $ret.= (", ".$shlibdata{$1}) if(defined($shlibdata{$1}));
-      }
-   }
-   $ret=~s/^, // if $ret;
-   return $ret;
-}
-
 =head1 SEE ALSO
 
 L<debhelper(7)>

Added: mono/trunk/debian/libmono-accessibility1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-accessibility1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-accessibility1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Accessibility/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Accessibility.dll

Added: mono/trunk/debian/libmono-accessibility2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-accessibility2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-accessibility2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Accessibility/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Accessibility.dll

Added: mono/trunk/debian/libmono-c5-0.5-cil.install
===================================================================
--- mono/trunk/debian/libmono-c5-0.5-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-c5-0.5-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.C5/0.5.*/
+debian/tmp/usr/lib/mono/2.0/Mono.C5.dll

Modified: mono/trunk/debian/libmono-corlib1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-corlib1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-corlib1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1 +1,3 @@
+debian/tmp/usr/lib/mono/gac/I18N*/1.0.*/
+debian/tmp/usr/lib/mono/1.0/I18N*.dll
 debian/tmp/usr/lib/mono/1.0/mscorlib.dll*

Modified: mono/trunk/debian/libmono-corlib2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-corlib2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-corlib2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1 +1,3 @@
+debian/tmp/usr/lib/mono/gac/I18N*/2.0.*/
+debian/tmp/usr/lib/mono/2.0/I18N*.dll
 debian/tmp/usr/lib/mono/2.0/mscorlib.dll*

Added: mono/trunk/debian/libmono-cscompmgd7.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-cscompmgd7.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-cscompmgd7.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/cscompmgd/7.0.*/
+debian/tmp/usr/lib/mono/1.0/cscompmgd.dll

Added: mono/trunk/debian/libmono-cscompmgd8.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-cscompmgd8.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-cscompmgd8.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/cscompmgd/8.0.*/
+debian/tmp/usr/lib/mono/2.0/cscompmgd.dll

Added: mono/trunk/debian/libmono-data-tds1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-data-tds1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-data-tds1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Mono.Data.Tds.dll

Added: mono/trunk/debian/libmono-data-tds2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-data-tds2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-data-tds2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Mono.Data.Tds.dll

Added: mono/trunk/debian/libmono-ldap1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-ldap1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-ldap1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Novell.Directory.Ldap.dll

Added: mono/trunk/debian/libmono-ldap2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-ldap2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-ldap2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Novell.Directory.Ldap.dll

Added: mono/trunk/debian/libmono-microsoft-build2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-microsoft-build2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-microsoft-build2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Microsoft.Build.*.dll

Added: mono/trunk/debian/libmono-microsoft7.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-microsoft7.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-microsoft7.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,8 @@
+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/1.0/Microsoft.JScript.dll
+debian/tmp/usr/lib/mono/1.0/Microsoft.VisualBasic.dll
+debian/tmp/usr/lib/mono/1.0/Microsoft.VisualC.dll
+debian/tmp/usr/lib/mono/1.0/Microsoft.Vsa.dll

Added: mono/trunk/debian/libmono-microsoft8.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-microsoft8.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-microsoft8.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,8 @@
+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/2.0/Microsoft.JScript.dll
+debian/tmp/usr/lib/mono/2.0/Microsoft.VisualBasic.dll
+debian/tmp/usr/lib/mono/2.0/Microsoft.VisualC.dll
+debian/tmp/usr/lib/mono/2.0/Microsoft.Vsa.dll

Added: mono/trunk/debian/libmono-oracle1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-oracle1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-oracle1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System.Data.OracleClient.dll

Added: mono/trunk/debian/libmono-peapi1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-peapi1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-peapi1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/PEAPI/1.0.*/
+debian/tmp/usr/lib/mono/1.0/PEAPI.dll

Added: mono/trunk/debian/libmono-peapi2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-peapi2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-peapi2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/PEAPI/2.0.*/
+debian/tmp/usr/lib/mono/2.0/PEAPI.dll

Added: mono/trunk/debian/libmono-relaxng1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-relaxng1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-relaxng1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll

Added: mono/trunk/debian/libmono-relaxng2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-relaxng2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-relaxng2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll

Added: mono/trunk/debian/libmono-security1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-security1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-security1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.Security/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Mono.Security.dll

Added: mono/trunk/debian/libmono-security2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-security2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-security2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.Security/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Mono.Security.dll

Added: mono/trunk/debian/libmono-system-data1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-data1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-data1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Data/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System.Data.dll

Added: mono/trunk/debian/libmono-system-data2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-data2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-data2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Data/2.0.*/
+debian/tmp/usr/lib/mono/2.0/System.Data.dll

Added: mono/trunk/debian/libmono-system-ldap1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-ldap1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-ldap1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.DirectoryServices/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System.DirectoryServices.dll

Added: mono/trunk/debian/libmono-system-ldap2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-ldap2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-ldap2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.DirectoryServices/2.0.*/
+debian/tmp/usr/lib/mono/2.0/System.DirectoryServices.dll

Added: mono/trunk/debian/libmono-system-messaging1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-messaging1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-messaging1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Messaging/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System.Messaging.dll

Added: mono/trunk/debian/libmono-system-messaging2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-messaging2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-messaging2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Messaging/2.0.*/
+debian/tmp/usr/lib/mono/2.0/System.Messaging.dll

Added: mono/trunk/debian/libmono-system-runtime1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-runtime1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-runtime1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Runtime.*/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System.Runtime.*.dll

Added: mono/trunk/debian/libmono-system-runtime2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-runtime2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-runtime2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System.Runtime.*/2.0.*/
+debian/tmp/usr/lib/mono/2.0/System.Runtime.*.dll

Added: mono/trunk/debian/libmono-system-web1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-web1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system-web1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/mono/gac/System.Web/1.0.*/
+debian/tmp/usr/lib/mono/gac/System.Web.Services/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System.Web.dll
+debian/tmp/usr/lib/mono/1.0/System.Web.Services.dll

Added: mono/trunk/debian/libmono-system1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System*/1.0.*/
+debian/tmp/usr/lib/mono/1.0/System*.dll

Added: mono/trunk/debian/libmono-system2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-system2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/System*/2.0.*/
+debian/tmp/usr/lib/mono/2.0/System*.dll

Modified: mono/trunk/debian/libmono-winforms1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-winforms1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-winforms1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,2 +1,6 @@
 debian/tmp/usr/lib/mono/gac/System.Windows.Forms/1.0.*/
+debian/tmp/usr/lib/mono/gac/System.Drawing.Design/1.0.*/
+debian/tmp/usr/lib/mono/gac/System.Design/1.0.*/
 debian/tmp/usr/lib/mono/1.0/System.Windows.Forms.dll
+debian/tmp/usr/lib/mono/1.0/System.Drawing.Design.dll
+debian/tmp/usr/lib/mono/1.0/System.Design.dll

Modified: mono/trunk/debian/libmono-winforms2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-winforms2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono-winforms2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,2 +1,6 @@
 debian/tmp/usr/lib/mono/gac/System.Windows.Forms/2.0.*/
+debian/tmp/usr/lib/mono/gac/System.Drawing.Design/2.0.*/
+debian/tmp/usr/lib/mono/gac/System.Design/2.0.*/
 debian/tmp/usr/lib/mono/2.0/System.Windows.Forms.dll
+debian/tmp/usr/lib/mono/2.0/System.Drawing.Design.dll
+debian/tmp/usr/lib/mono/2.0/System.Design.dll

Added: mono/trunk/debian/libmono1.0-cil.install
===================================================================
--- mono/trunk/debian/libmono1.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono1.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.*/1.0.*/
+debian/tmp/usr/lib/mono/1.0/Mono.*.dll

Added: mono/trunk/debian/libmono2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono2.0-cil.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/libmono2.0-cil.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/mono/gac/Mono.*/2.0.*/
+debian/tmp/usr/lib/mono/2.0/Mono.*.dll

Deleted: mono/trunk/debian/mono-classlib-1.0-dbg.install
===================================================================
--- mono/trunk/debian/mono-classlib-1.0-dbg.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/mono-classlib-1.0-dbg.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,6 +0,0 @@
-debian/tmp/usr/lib/mono/gac/*/1.0.*/*.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

Deleted: mono/trunk/debian/mono-classlib-1.0.install
===================================================================
--- mono/trunk/debian/mono-classlib-1.0.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/mono-classlib-1.0.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,9 +0,0 @@
-debian/tmp/usr/lib/mono/gac/*/1.0.*/
-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/
-debian/tmp/usr/lib/mono/compat-1.0/
-debian/tmp/usr/lib/pkgconfig/dotnet.pc

Deleted: mono/trunk/debian/mono-classlib-2.0-dbg.install
===================================================================
--- mono/trunk/debian/mono-classlib-2.0-dbg.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/mono-classlib-2.0-dbg.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,8 +0,0 @@
-debian/tmp/usr/lib/mono/gac/*/2.0.*/*.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/8.0.*/*.mdb
-debian/tmp/usr/lib/mono/gac/Microsoft.Build.*/2.*/*.mdb
-debian/tmp/usr/lib/mono/gac/Mono.C5/0.5.*/*.mdb
-debian/tmp/usr/lib/mono/gac/cscompmgd/8.0.*/*.mdb

Deleted: mono/trunk/debian/mono-classlib-2.0.install
===================================================================
--- mono/trunk/debian/mono-classlib-2.0.install	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/mono-classlib-2.0.install	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1,10 +0,0 @@
-debian/tmp/usr/lib/mono/gac/*/2.0.*/
-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/Microsoft.Build.*/2.*/
-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/
-debian/tmp/usr/lib/mono/compat-2.0/

Deleted: mono/trunk/debian/mono-utils.dirs
===================================================================
--- mono/trunk/debian/mono-utils.dirs	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/mono-utils.dirs	2006-04-02 22:44:05 UTC (rev 2374)
@@ -1 +0,0 @@
-/usr/share/debhelper/autoscripts/

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/rules	2006-04-02 22:44:05 UTC (rev 2374)
@@ -91,16 +91,25 @@
 	dh_testroot -i
 	# 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
 	install -m 644 debian/Mono.Cairo.dll.config debian/libmono-cairo1.0-cil/usr/lib/mono/gac/Mono.Cairo/1.0.*/
 	install -m 644 debian/Mono.Cairo.dll.config debian/libmono-cairo2.0-cil/usr/lib/mono/gac/Mono.Cairo/2.0.*/
 	install -m 644 debian/Mono.Data.SqliteClient.dll.config debian/libmono-sqlite1.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/
 	install -m 644 debian/Mono.Data.SqliteClient.dll.config debian/libmono-sqlite2.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/
-	# 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
+	install -m 644 debian/System.Windows.Forms.dll.config debian/libmono-winforms1.0-cil/usr/lib/mono/gac/System.Windows.Forms/1.0.*/
+	install -m 644 debian/System.Windows.Forms.dll.config debian/libmono-winforms2.0-cil/usr/lib/mono/gac/System.Windows.Forms/2.0.*/
+	install -m 644 debian/FirebirdSql.Data.Firebird.dll.config debian/libmono-firebirdsql1.7-cil/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/
 	# 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 mbas from mono-mcs (this is already in mono-mbas)
+	rm -f debian/mono-mcs/usr/bin/mbas
+	rm -f debian/mono-mcs/usr/lib/mono/1.0/mbas.exe*
+	# delete mjs from mono-mcs (this is already in mono-mjs)
+	rm -f debian/mono-mcs/usr/bin/mjs
+	rm -f debian/mono-mcs/usr/lib/mono/1.0/mjs.exe*
 	# 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)
@@ -111,49 +120,107 @@
 	rm -f debian/mono-mcs/usr/bin/ilasm2
 	# delete xbuild from mono-mcs (this is already in mono-gmcs)
 	rm -f debian/mono-mcs/usr/bin/xbuild
-	# delete *.mdb from mono-classlib-1.0/2.0 (those are already in mono-classlib-1.0/2.0-dbg)
-	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*
-	# delete mscorlib.dll from mono-classlib-1.0/2.0 (those are already in libmono-corlib1.0/2.0-cil)
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/mscorlib.dll*
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/mscorlib.dll*
-	# delete ICSharpCode.SharpZipLib from mono-classlib-1.0/2.0 (those are already in libmono-sharpzip*-cil)
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*
-	# delete Npgsql from mono-classlib-1.0/2.0 (those are already in libmono-npgsql*-cil)
-	rm -rf debian/mono-classlib-*/usr/lib/mono/gac/Npgsql/
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/Npgsql.dll
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/Npgsql.dll
-	# delete ByteFX.Data from mono-classlib-1.0/2.0 (those are already in libmono-bytefx*-cil)
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/ByteFX.Data.dll
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/ByteFX.Data.dll
-	# delete FirebirdSql.Data.Firebird from mono-classlib-1.0 (those are already in libmono-firebirdsql1.7-cil)
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll
-	# delete Mono.Data.SqliteClient from mono-classlib-1.0/2.0 (those are already in libmono-sqlite*-cil)
-	rm -rf debian/mono-classlib-*/usr/lib/mono/gac/Mono.Data.SqliteClient/
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll
-	# delete System.Windows.Forms from mono-classlib-1.0/2.0 (those are already in libmono-winforms*-cil)
-	rm -rf debian/mono-classlib-*/usr/lib/mono/gac/System.Windows.Forms/
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/System.Windows.Forms.dll
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/System.Windows.Forms.dll
-	# delete Mono.Cairo from mono-classlib-1.0/2.0 (those are already in libmono-cairo*-cil)
-	rm -rf debian/mono-classlib-*/usr/lib/mono/gac/Mono.Cairo/
-	rm -f debian/mono-classlib-1.0/usr/lib/mono/1.0/Mono.Cairo.dll
-	rm -f debian/mono-classlib-2.0/usr/lib/mono/2.0/Mono.Cairo.dll
+	# delete Mono.Data from libmono1.0/2.0-cil (those are already in libmono-data*-cil)
+	#rm -rf debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data/
+	#rm -rf debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data/
+	#rm -f debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Data.dll
+	#rm -f debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Data.dll
+	# delete Mono.Data.Tds from libmono1.0/2.0-cil (those are already in libmono-data*-cil)
+	rm -rf debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
+	rm -rf debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.Tds/
+	rm -f debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Data.Tds.dll
+	rm -f debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Data.Tds.dll
+	# delete Mono.Data.SqliteClient from libmono1.0/2.0-cil (those are already in libmono-sqlite*-cil)
+	rm -rf debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/
+	rm -rf debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Data.SqliteClient/
+	rm -f debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll
+	rm -f debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll
+	# delete Mono.Cairo from libmono1.0/2.0-cil (those are already in libmono-cairo*-cil)
+	rm -rf debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Cairo/
+	rm -rf debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Cairo/
+	rm -f debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Cairo.dll
+	rm -f debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Cairo.dll
+	# delete Mono.Security from libmono1.0/2.0-cil (those are already in libmono-security*-cil)
+	rm -rf debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Security/
+	rm -rf debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Security/
+	rm -f debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Security.dll
+	rm -f debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Security.dll
+	# delete Mono.C5 from libmono2.0-cil (those are already in libmono-c5-*-cil)
+	rm -rf debian/libmono2.0-cil/usr/lib/mono/gac/Mono.C5/
+	rm -f debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.C5.dll
+	# delete System.Windows.Forms from libmono-system1.0/2.0-cil (those are already in libmono-winforms*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Windows.Forms/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Windows.Forms/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Windows.Forms.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Windows.Forms.dll
+	# delete System.Drawing.Design from libmono-system1.0/2.0-cil (those are already in libmono-winforms*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Drawing.Design/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Drawing.Design/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Drawing.Design.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Drawing.Design.dll
+	# delete System.Design from libmono-system1.0/2.0-cil (those are already in libmono-winforms*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Design/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Design/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Design.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Design.dll
+	# delete System.Data.OracleClient from libmono-system1.0/2.0-cil (those are already in libmono-oracle*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Data.OracleClient/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Data.OracleClient/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Data.OracleClient.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Data.OracleClient.dll
+	# delete System.DirectoryServices from libmono-system1.0/2.0-cil (those are already in libmono-system-ldap*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.DirectoryServices/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.DirectoryServices/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.DirectoryServices.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.DirectoryServices.dll
+	# delete System.Data from libmono-system1.0/2.0-cil (those are already in libmono-system-data*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Data/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Data/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Data.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Data.dll
+	# delete System.Data from libmono-system1.0/2.0-cil (those are already in libmono-system-data*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Data.Tds/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Data.Tds/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Data.Tds.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Data.Tds.dll
+	# delete System.Web from libmono-system1.0/2.0-cil (those are already in libmono-system-web*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Web/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Web/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Web.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Web.dll
+	# delete System.Web.Services from libmono-system1.0/2.0-cil (those are already in libmono-system-web*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Web.Services/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Web.Services/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Web.Services.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Web.Services.dll
+	# delete System.Runtime from libmono-system1.0/2.0-cil (those are already in libmono-system-runtime*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Runtime.*/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Runtime.*/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Runtime.*.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Runtime.*.dll
+	# delete System.Messaging from libmono-system1.0/2.0-cil (those are already in libmono-system-messaging*-cil)
+	rm -rf debian/libmono-system1.0-cil/usr/lib/mono/gac/System.Messaging/
+	rm -rf debian/libmono-system2.0-cil/usr/lib/mono/gac/System.Messaging/
+	rm -f debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Messaging.*.dll
+	rm -f debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Messaging.*.dll
 	dh_link -i
-	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_installman -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
 	debian/dh_makeclilibs -i -m 1.0 internal-mono
+	# APIs that may grow need tighter deps
+	debian/dh_makeclilibs \
+	  -plibmono-corlib2.0-cil \
+	  -plibmono-system2.0-cil \
+	  -plibmono-microsoft8.0-cil \
+	  -plibmono-winforms1.0-cil \
+	  -plibmono-winforms2.0-cil \
+	  -plibmono1.0-cil \
+	  -plibmono2.0-cil \
+	  -m $(UPVERSION) internal-mono
 	debian/dh_clideps -i internal-mono
 	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
@@ -164,16 +231,16 @@
 	dh_testroot -s
 	dh_install -s
 	dh_link -s
-	dh_installchangelogs -s ChangeLog
+	dh_installchangelogs -s
 	dh_installchangelogs -pmono-jay $(CURDIR)/mcs/jay/ChangeLog
 	dh_installdocs -s
+	dh_installman -s
 	dh_installexamples -s
-	dh_installman -s
 	dh_installexamples -pmono-jay $(CURDIR)/mcs/jay/skeleton.cs
 	dh_strip -s
 	dh_compress -s -Xskeleton.cs
 	dh_fixperms -s
-	dh_makeshlibs -plibmono0 -V libmono-$(UPVERSION)
+	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)

Added: mono/trunk/debian/shlibs.local
===================================================================
--- mono/trunk/debian/shlibs.local	2006-04-02 21:29:54 UTC (rev 2373)
+++ mono/trunk/debian/shlibs.local	2006-04-02 22:44:05 UTC (rev 2374)
@@ -0,0 +1,5 @@
+libgdiplus 0 libgdiplus (>= 1.1.13.4)
+libcairo 2 libcairo2 (>= 1.0.2-2)
+libfbembed 1 libfbembed1
+libsqlite 0 libsqlite0 (>= 2.8.16)
+libsqlite3 0 libsqlite3-0 (>= 3.2.8)




More information about the Pkg-mono-svn-commits mailing list