[Pkg-mono-svn-commits] rev 1554 - in mono/branches/1.1/debian: . man patches

Mirco Bauer meebey-guest at costa.debian.org
Mon Apr 3 07:24:38 UTC 2006


Author: meebey-guest
Date: 2005-04-09 12:35:36 +0000 (Sat, 09 Apr 2005)
New Revision: 1554

Added:
   mono/branches/1.1/debian/mono-jit.postinst
Removed:
   mono/branches/1.1/debian/TODO
   mono/branches/1.1/debian/config.in
   mono/branches/1.1/debian/dh_makenetlibs
   mono/branches/1.1/debian/dh_netdeps
   mono/branches/1.1/debian/libmint-dev.install
   mono/branches/1.1/debian/lintian
   mono/branches/1.1/debian/man/monosn.1
   mono/branches/1.1/debian/mono-jit.postinst.head
   mono/branches/1.1/debian/mono-jit.postinst.mint-setup
   mono/branches/1.1/debian/mono-jit.postinst.mono-setup
   mono/branches/1.1/debian/mono-jit.postinst.old
   mono/branches/1.1/debian/mono-mint.install
   mono/branches/1.1/debian/mono-mint.links
   mono/branches/1.1/debian/mono-mint.postinst
   mono/branches/1.1/debian/mono-mint.prerm
Modified:
   mono/branches/1.1/debian/MAINTAINERS
   mono/branches/1.1/debian/NEWS
   mono/branches/1.1/debian/changelog
   mono/branches/1.1/debian/control
   mono/branches/1.1/debian/copyright
   mono/branches/1.1/debian/dh_installxsp
   mono/branches/1.1/debian/mono-common.install
   mono/branches/1.1/debian/mono-common.postinst
   mono/branches/1.1/debian/mono-common.preinst
   mono/branches/1.1/debian/mono-jit.install
   mono/branches/1.1/debian/mono-utils.install
   mono/branches/1.1/debian/mono-utils.manpages
   mono/branches/1.1/debian/patches/00list
   mono/branches/1.1/debian/rules
Log:
- erm, changelog? EVERYTHING changed, done.



Modified: mono/branches/1.1/debian/MAINTAINERS
===================================================================
--- mono/branches/1.1/debian/MAINTAINERS	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/MAINTAINERS	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,4 +1,6 @@
-Current maintainers of the mono packages are:
+The Debian Mono Group maintains the Mono packages in Debian.
+In this group are prefered maintainers for certain packages.
 
+Current maintainers of the "mono" packages are:
+
 Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-

Modified: mono/branches/1.1/debian/NEWS
===================================================================
--- mono/branches/1.1/debian/NEWS	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/NEWS	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,3 +1,12 @@
+mono (1.1.6-0pre1) experimental; urgency=low
+
+  * This package release of mono is a new milestone for the Debian Mono Packages.
+    Here the most important changes:
+
+    - foo
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sat, 2 Apr 2005 16:45:15 +0200
+
 mono (0.96-1) unstable; urgency=low
 
   * It has been quite a while since the last Mono release in Debian and

Deleted: mono/branches/1.1/debian/TODO
===================================================================
--- mono/branches/1.1/debian/TODO	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/TODO	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,8 +0,0 @@
-TODO soon:
-
- - enable IPv6 in machine.config!
-
- - look over the AOD package
-
- - (pabl0) package some other .NET programs like evolution-sharp, beagle, mbloggy, daybook and dashboard when they are available
-

Modified: mono/branches/1.1/debian/changelog
===================================================================
--- mono/branches/1.1/debian/changelog	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/changelog	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,3 +1,25 @@
+mono (1.1.6-0pre1) experimental; urgency=low
+
+  * New upstream release
+    + New build system, using one source tarball.
+    + Almost all programs have a manpage now.
+    + Mono 1.1.x branch supports AMD64 architecture.
+  * Mirco 'meebey' Bauer
+    + Upstream merged mcs and mono into one mono tarball, this makes the
+      build process a lot easier.
+    + Dropping /usr/share/dotnet structure with this release, upstream
+      provides now a FHS conform solution.
+    + Added versioned mono-common dependency to mono, makes lintian happy.
+    + Added cli-common to build-dependencies.
+    + Added transition code to mono-common.postinst for moving
+      /usr/share/dotnet/mono to /usr/lib/mono
+    + Removed a lot of hacks in debian/rules, not required anymore.
+    + Removed old Conflicts/Replaces.
+    + Removed icu28-dev from buil-dependencies (ICU is not recommended by
+      upstream anymore, and does break things).
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sat, 2 Apr 2005 12:48:09 +0200
+
 mono (1.0.5-2) unstable; urgency=high
 
   * Mirco 'meebey' Bauer

Deleted: mono/branches/1.1/debian/config.in
===================================================================
--- mono/branches/1.1/debian/config.in	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/config.in	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,29 +0,0 @@
-<configuration> 
-	<dllmap dll="cygwin1.dll" target="@LIBC@" />
-	<dllmap dll="libc" target="@LIBC@" />
-	<dllmap dll="libxslt.dll" target="libxslt.so.1" />
-	<dllmap dll="libmySQL.dll" target="libmysqlclient.so.12" />
-	<dllmap dll="odbc32.dll" target="libodbc.so" />
-	<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" />
-	<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" />
-	<dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0.so.0" />
-	<dllmap dll="libpango-1.0-0.dll" target="libpango-1.0.so.0" />
-	<dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0" />
-	<dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" />
-	<dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0" />
-	<dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" />
-	<dllmap dll="libglade-2.0-0.dll" target="libglade-2.0.so.0" />
-	<dllmap dll="oci" target="clntsh" />
-	<dllmap dll="gtkhtml-3.0" target="libgtkhtml-3.0.so.4" />
-	<dllmap dll="db2cli" target="libdb2_36.so"/>
-	<dllmap dll="gnome-2" target="libgnome-2.so.0" />
-	<dllmap dll="gconf-2" target="libgconf-2.so.4" />
-	<dllmap dll="gstreamer" target="libgstreamer-0.6.so.0" />
-	<dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0.so.0">
-	<dllmap dll="gnomeui-2" target="libgnomeui-2.so.0" />
-	<dllmap dll="gobject-2" target="libgobject-2.0.so.0" />
-	<dllmap dll="gobject-2.0" target="libgobject-2.0.so.0" />
-	<dllmap dll="gnomevfs-2" target="libgnomevfs-2.so.0" />  
-	<dllmap dll="gnomecanvas-2" target="libgnomecanvas-2.so.0" />
-	<dllmap dll="gnome-print2-2" target="libgnomeprint-2-2.so.0" />
-</configuration>

Modified: mono/branches/1.1/debian/control
===================================================================
--- mono/branches/1.1/debian/control	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/control	2005-04-09 12:35:36 UTC (rev 1554)
@@ -2,86 +2,162 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-Uploaders: Eduard Bloch <blade at debian.org>, Teófilo Ruiz Suárez <teo at debian.org>, Mirco Bauer <meebey at meebey.net>
-Build-Depends: debhelper (>> 3.0.0), libglib2.0-dev, bison, libtool, dpatch, libicu28-dev
-Build-Conflicts: libmint-dev
+Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>
+Build-Depends: debhelper (>> 4.0.0), cli-common (>= 0.1), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev
 Standards-Version: 3.6.1
 
 Package: mono-common
-Provides: cli-common
 Architecture: i386 powerpc
-Depends: binfmt-support (>= 1.1.2)
-Conflicts: binfmt-detector-cli, cli-common
-Replaces: mono-jit (<< 0.16), binfmt-detector-cli
-Description: common files for the Mono CLI runtimes
- The Mono Project is an open development initiative sponsored by Ximian that is
- working to develop an open source, Linux-based version of the Microsoft .NET
- development platform.
+Depends: cli-common (>= 0.1), binfmt-support (>= 1.1.2), 
+Description: common files 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.
+ 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 base configuration files and configures the
- system to run .NET executables as native applications.
+ system to run CIL executables as native applications.
 
 Package: mono-jit
 Provides: cli-virtual-machine
 Architecture: i386 powerpc
 Depends: ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}, mono-common (= ${Source-Version})
-Description: fast CLI/.NET JIT compiler for Mono
- The Mono Project is an open development initiative sponsored by Ximian that is
- working to develop an open source, Linux-based version of the Microsoft .NET
- development platform.
+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.
+ 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 Virtual Execution Environment and code
- generator (Just-in-Time and Ahead-of-Time) "mono" which runs CLI/.NET
+ generator (Just-in-Time and Ahead-of-Time) "mono" which runs CLI (.NET)
  applications, currently available for i386 and powerpc architectures
  only.
 
 Package: mono
 Architecture: i386 powerpc
-Depends: mono-jit (= ${Source-Version}), mono-utils (= ${Source-Version}), mono-mcs, mono-assemblies-arch
-Description: Mono .NET development environment
- The Mono Project is an open development initiative sponsored by Ximian that is
- working to develop an open source, Linux-based version of the Microsoft .NET
- development platform.
+Depends: mono-common (= ${Source-Version}), mono-jit (= ${Source-Version}), mono-utils (= ${Source-Version}), mono-mcs, mono-assemblies-arch
+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.
+ Mono provides a complete .NET CLR including compiler and runtime, which can
+ produce and execute CIL bytecode (assemblies), and a .NET class library.
  .
  mono is a metapackage containing dependencies for the components of
  Mono. If you do not need all of them (or try to work around X11
- dependencies), install the core packages manually: mono-jit (or
- mono-mint if JIT is not available), mono-mcs, mono-utils.
+ dependencies), install the core packages manually: mono-jit, mono-mcs or
+ mono-utils.
 
 Package: mono-utils
 Section: devel
 Architecture: i386 powerpc
 Depends: ${shlibs:Depends}, mono-assemblies-base
 Description: Mono utilities
- The Mono Project is an open development initiative sponsored by Ximian that is
- working to develop an open source, Linux-based version of the Microsoft .NET
- development platform.
+ 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 includes various tools useful for .NET developers, like
+ This package includes various tools useful for CLI (.NET) developers, like
  pedump, monodis, monograph and monosn.
 
 Package: libmono0
 Section: libs
 Architecture: i386 powerpc
 Depends: ${shlibs:Depends}
-Conflicts: libmint0
 Provides: libmono-${mono:upversion}
-Description: libraries for the Mono interpreter
+Description: libraries for the Mono JIT
  Shared libraries for Mono, used for embedding/hosting of the
  JIT. The package also contains libmono-profiler-cov used for
  optimisation work.
  .
- The Mono Project is an open development initiative sponsored by Ximian that is
- working to develop an open source, Linux-based version of the Microsoft .NET
- development platform.
+ 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: libmono-dev
 Section: devel
 Architecture: i386 powerpc
 Depends: libmono0 (= ${Source-Version}), libglib2.0-dev
-Description: libraries for the Mono interpreter - Development files
+Description: libraries for the Mono JIT - Development files
  Header files and static libraries for libmono and libmono-profiler-conv.
  .
- The Mono Project is an open development initiative sponsored by Ximian that is
- working to develop an open source, Linux-based version of the Microsoft .NET
- development platform.
+ 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-assemblies-base
+Section: libs
+Architecture: all
+Depends: ${cli:Depends}
+Recommends: mono-assemblies-arch
+Provides: mono-assemblies-base-${mono:upversion}
+Description: Mono class 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 .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 
+ (cross-platform CIL (.NET) libraries) that are used by nearly all CLI (.NET)
+ programs on the system.
+
+Package: mono-assemblies-arch
+Section: libs
+Architecture: i386 powerpc
+Depends: ${gdi:Depends}, ${shlibs:Depends}, mono-assemblies-base-${mono:upversion}
+Provides: mono-assemblies-arch-${mono:upversion}
+Description: architecture specific files for Mono's class 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 .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.
+
+Package: mono-mcs
+Section: devel
+Architecture: all
+Depends: mono-jit (>= ${mono:upversion}) | cli-virtual-machine, mono-jit (<< ${mono:next-upversion}) | cli-virtual-machine
+Provides: c-sharp-compiler
+Description: Mono C# compiler
+ This is the Mono C# (C-Sharp) compiler, a platform-independent compiler which
+ produces CIL/.NET (Common Intermediate Language) binary executables, and th
+ most development tools around it like ilassemble, wsdl stub generator, assembly
+ linker and security tools.
+ .
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ 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
+Architecture: all
+Depends: mono-jit | cli-virtual-machine, mono-assemblies-base
+Description: Mono GAC tool
+ 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 includes the Global Assembly Cache (GAC) Tool (gacutil)
+ used by Mono to store shared CIL/.NET (Common Intermediate Language) libraries.
+
+Package: mono-jay
+Section: devel
+Architecture: i386 powerpc
+Depends: ${shlibs:Depends}
+Description: LALR(1) parser generator oriented to Java/.NET
+ Mono is a platform for running and developing applications based on the
+ ECMA/ISO Standards. Mono is an open source effort led by Novell.
+ Mono provides a complete .NET CLR including compiler and runtime, which can
+ produce and execute CIL bytecode (assemblies), and a .NET class library.
+ .
+ Jay is a Yacc implementation oriented to Java-like input syntax. It
+ takes a grammar, specified in BNF and augmented with semantic actions,
+ and generates tables and an interpreter which recognizes the language
+ defined by the grammar and executes the semantic actions as their
+ corresponding phrases are recognized.

Modified: mono/branches/1.1/debian/copyright
===================================================================
--- mono/branches/1.1/debian/copyright	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/copyright	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,26 +1,40 @@
 This package was debianized by Alp Toker <alp at atoker.com> using the Monodeb
 build system.
 
-It was downloaded via CVS from http://www.go-mono.com/
+This package was re-debianized and merged with "mcs" by Mirco Bauer <meebey at meebey.net>
 
+It was downloaded from http://www.mono-project.com/Downloads
+
 Upstream Authors:
 Miguel de Icaza (miguel at ximian.com)
 Paolo Molaro (lupus at ximian.com)
 Dietmar Maurer (dietmar at ximian.com)
 
+C# Compiler:
+        Miguel de Icaza (miguel at ximian.com)
+
+Class Libraries:
+        Patrik Torstensson <patrik.torstensson at labs2.com>
+        Gaurav Vaish <gvaish at iitk.ac.in>
+        Jeff Stedfast (fejj at ximian.com)
+        Joe Shaw (joe at ximian.com)
+        Miguel de Icaza (miguel at ximian.com)
+        Sean MacIsaac (macisaac at ximian.com)
+        Vladimir Vukicevic (vladimir at ximian.com)
+        Garrett Rooney (rooneg at electricjellyfish.net)
+        Bob Smith (bob at thestuff.net)
+        John Barnette (jbarn at httcb.net)
+
 Copyright:
 
-You are free to distribute this software under the terms of the GNU General
-Public License and GNU Library General Public License.  On Debian systems, the
-complete text of the GNU General Public License can be found in
-/usr/share/common-licenses/GPL file.  On Debian systems, the complete text of
-the GNU Library General Public License can be found in
-/usr/share/common-licenses/LGPL file.
+The C# Compiler is released under the terms of the GNU GPL.
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
 
 The class libraries are released under the terms of the MIT X11
 license:
 
-Copyright (c) 2001-2004 Novell
+Copyright (c) 2001-2005 Novell
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
@@ -52,5 +66,3 @@
 
 Distributed on the terms of the GNU General Public License which can
 be found in the file /usr/share/common-licenses/GPL on Debian systems.
-
-

Modified: mono/branches/1.1/debian/dh_installxsp
===================================================================
--- mono/branches/1.1/debian/dh_installxsp	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/dh_installxsp	2005-04-09 12:35:36 UTC (rev 1554)
@@ -36,7 +36,7 @@
 
 init();
 
-my $depname="net:XspServer";
+my $depname="cli:XspServer";
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);

Deleted: mono/branches/1.1/debian/dh_makenetlibs
===================================================================
--- mono/branches/1.1/debian/dh_makenetlibs	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/dh_makenetlibs	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,292 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_makenetlibs - automatically create netlibs file
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_makenetlibs> [S<I<debhelper options>>] [B<-r>] [B<-V>I<[dependancies]>] [B<-m>I<minversion>] [B<-l>I<nextincompatible>] [B<-X>I<item>]
-
-=head1 DESCRIPTION
-
-dh_makenetlibs is a debhelper program that automatically scans for
-versioned .NET assemblies, and generates a netlibs file for the
-libraries it finds.
-
-By default, dh_makenetlibs scans the DLL files in the package
-directories and writes the discovered compatibility data (major/minor,
-build, token) to "netlibs" files int he appropriate packages.
-
-However, if a file like debian/package.netlibs is found, this one will
-be installed and no scanning is performed.
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<-V>, B<-V>I<dependancies>
-
-=item B<--version-info>, B<--version-info=>I<dependancies>
-
-By default, the netlibs file generated by this program does not make packages
-depend on any particular version of the package containing the assembly.
-It may be necessary for you to add some version dependancy
-information to the netlibs file. If -V is specified with no dependancy
-information, the current version of the package is plugged into a
-dependancy that looks like "packagename (>= packageversion)". If -V is
-specified with parameters, the parameters can be used to specify the exact
-dependancy information needed (be sure to include the package name).
-
-Beware of using -V without any parameters; this is a conservative setting
-that always ensures that other packages' shared library dependencies are at
-least as tight as they need to be, so that if the maintainer screws up then
-they won't break. The flip side is that packages might end up with
-dependencies that are too tight and so find it harder to be upgraded.
-
-=item B<-m>I<minversion>
-
-Like -V, but specifies only the version string, the package name comes
-from the package that is actually processed. This option is more
-flexible if you try to set a range of valid versions for different
-assembly packages coming from one source package.
-
-=item B<-l>I<nextincompatible>
-
-Specifies the (expected) version of this package when the compatibility
-to the current assemblies will break.
-
-=item B<-r>
-
-An experimental option to automaticaly guess the next incompatible
-upstream version and insert them (like working with -l and -m options,
-see above). Do not expect the guessed values to be always correct -
-normally, the usualy assumed version string has the form
-generation.major.minor where versions with changes in "minor" are
-compatible and "major" versions break with compatibility.
-
-=item B<-X>I<item>, B<--exclude=>I<item>
-
-Exclude files that contain "item" anywhere in their filename or directory 
-from being treated as shared libraries.
-
-=back
-
-=head1 EXAMPLES
-
- dh_makenetlibs
-
-Assuming this is a package named libfoobar0.9x-cil, generates a netlibs file that
-looks something like:
- libfoobar  1.0.2345.0_23a12f34  libfoobar0.9x-cil
-
- dh_makenetlibs -V
-
-Assuming the current version of the package is 0.93-3, generates a netlibs
-file that looks something like:
- libfoobar 1.0.2345.0_23a12f34 libfoobar0.9x-cil (>= 0.93-3)
-
- dh_makenetlibs -V 'libfoobar0.9x-cil (>= 0.92)'
-
-Generates a netlibs file that looks something like:
-  libfoobar 1.0.2345.0_23a12f34 libfoobar0.9x-cil (>= 0.92)
-
-Assuming that your package creates libfoobar-cil and liblafasel-cil,
-which are compatible to 0.92 versions but the upstream is going to break
-compatibility in the next version, 0.94:
-
- dh_makenetlibs -m 0.92 -l 0.94
-
-Generates netlibs file that looks something like:
-
-  libfoobar 1.0.2345.0_23a12f34 libfoobar-cil (>= 0.92), libfoobar-cil (<< 0.94)
-
-and
-
-  liblafasel 1.0.2345.0_23a12f34 liblafasel-cil (>= 0.92), liblafasel-cil (<< 0.94)
-
-=cut
-
-init();
-
-if ( system "egrep -q \"Build-Depends: .*mono-utils \(>= 1\.[0-9.-]+\)\" debian/control" ) {
-    warning("Warning! No Build-Depends on mono-utils (>= 1.0)!");
-}
-
-my $fh;
-my %shlibdata;
-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;
-}
-
-foreach my $package ( @{ $dh{DOPACKAGES} } ) {
-    next if is_udeb($package);
-
-    my $tmp = tmpdir($package);
-
-    my %seen;
-    my $need_ldconfig = 0;
-
-    doit( "rm", "-f", "$tmp/DEBIAN/netlibs" );
-    if ( -e "debian/$package.netlibs" ) {
-        complex_doit("cat debian/$package.netlibs >$tmp/DEBIAN/netlibs");
-    }
-    else {
-
-        # So, we look for files or links to existing files with names that
-        # match "*.so*". Matching *.so.* is not good enough because of
-        # broken crap like db3. And we only look at real files not
-        # symlinks, so we don't accidentually add netlibs data to -dev
-        # packages. This may have a few false positives, which is ok,
-        # because only if we can get a library name and a major number from
-        # objdump is anything actually added.
-        my $exclude = '';
-        if ( defined( $dh{EXCLUDE_FIND} ) && $dh{EXCLUDE_FIND} ne '' ) {
-            $exclude = "! \\( $dh{EXCLUDE_FIND} \\) ";
-        }
-        open( FIND, "find $tmp -type f \\( -name '*.dll' \\) $exclude |" );
-        dll: while (<FIND>) {
-            chomp;
-            my ( $library, $ver, $libfile );
-            $libfile = $_;
-            my $sig = `sn -T $_ 2>/dev/null`;
-            $sig =~ s/.*key token: (\w+).*/$1/is;
-            if($sig=~/\s/) {
-               warning "$libfile has no valid signature, ignoring";
-               next dll;
-            }
-            my $dis = `monodis --assembly $libfile 2>&1`;
-            if($dis =~ m/Name:\s+(\S+)/) {
-               $library = $1;
-               $dis =~ m/Version:\s+(\S+)/;
-               $ver = $1;
-            }
-            else {
-               # completely broken code, we need a mature app not
-               # depending on assembly loading
-               # verbose_print("trouble parsing monodis output, components not installed? Fallback to parsing the pure monodis output.");
-               # $dis = `monodis $libfile 2>&1`;
-               # $dis =~ /^module (\S+)/is;
-               # $library = $1;
-               # $library =~ s/'|"//;
-               warning("monodis could not open $libfile, maybe some components not installed yet. Using filename to guess the assembly name :(");
-               $libfile=~ m,/(\d+\.\d+.\d+.\d+)__(\w+)/([^/]+)\.dll$,is;
-#               print "moo: $1, $2, $3";
-               next dll if (! ($1 && $2 && $3));
-               $ver=$1;
-               $sig=$2;
-               $library=$3;
-            }
-
-            if ( !-d "$tmp/DEBIAN" ) {
-                doit( "install", "-d", "$tmp/DEBIAN" );
-            }
-            my $deps = $package;
-
-            # Call isnative becuase it sets $dh{VERSION}
-            # as a side effect.
-            isnative($package);
-            my $version = $dh{VERSION};
-
-            # Old compatibility levels include the
-            # debian revision, while new do not.
-            if ( !compat(3) ) {
-
-                # Remove debian version, if any.
-                $version =~ s/-[^-]+$//;
-            }
-
-            if ( defined( $dh{M_PARAMS} ) && $dh{M_PARAMS} ne '' ) {
-                $version = $dh{M_PARAMS};
-            }
-            if ( $dh{V_FLAG_SET} ) {
-                if ( $dh{V_FLAG} ne '' ) {
-                    $deps = $dh{V_FLAG};
-                }
-                else {
-                    $deps = "$package (>= $version)";
-                }
-            }
-            if ( defined( $dh{R_FLAG} ) ) {
-                $version =~ s/-[^-]+$//;
-                my @uvers = split ( /\./, $version );
-                $uvers[1]++;
-                $deps =
-                  "$package (>= $version), $package (<< "
-                  . join ( ".", @uvers ) . ")";
-            }
-            if ( defined( $dh{M_PARAMS} ) ) {
-                $deps = "$package (>= " . $dh{M_PARAMS} . ")";
-            }
-            if ( defined( $dh{L_PARAMS} ) ) {
-                $deps .= ", $package (<< " . $dh{L_PARAMS} . ")";
-            }
-            if ( defined($library)
-                && defined($ver)
-                && defined($deps)
-                && $library ne ''
-                && $ver ne ''
-                && $deps ne '' )
-            {
-
-                # Prevent duplicate lines from entering the file.
-                my $line = "$library $ver" . "__$sig $deps";
-
-                # extra dependencies are to be resolved by dh_netlibs,
-                # don't forward the dependency libs to the apps where it
-                # does not belong to
-#                if ( my $extra = extraDeps ($libfile) )   { $line .= ", $extra";  }
-                if ( !$seen{$line} ) {
-                    $seen{$line} = 1;
-                    complex_doit("echo '$line' >>$tmp/DEBIAN/netlibs");
-                }
-            }
-        }
-    }
-    close FIND;
-
-    if ( -e "$tmp/DEBIAN/netlibs" ) {
-        doit( "chmod", 644,   "$tmp/DEBIAN/netlibs" );
-        doit( "chown", "0:0", "$tmp/DEBIAN/netlibs" );
-    }
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of mono-utils.
-
-=head1 KNOWN BUGS
-
-Will possibly not work correctly with DH_COMPAT levels 1 and 2.
-
-=head1 AUTHOR
-
-Eduard Bloch <blade at debian.org>, inspired by dh_makeshlibs by Joey Hess <joeyh at debian.org>
-
-=cut
-

Deleted: mono/branches/1.1/debian/dh_netdeps
===================================================================
--- mono/branches/1.1/debian/dh_netdeps	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/dh_netdeps	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,271 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_netdeps - calculates .NET dependencies
-
-=cut
-
-use strict;
-use File::Find;
-use Debian::Debhelper::Dh_Lib;
-
-#eval 'use Debian::Debhelper::Dh_Lib';
-#print "You need to install the debhelper package in order to use this program!" if $@;
-
-=head1 SYNOPSIS
-
-B<dh_netdeps> [S<I<debhelper options>>]
-
-=head1 DESCRIPTION
-
-dh_netdeps is a debhelper program that is responsible for generating the
-${net:Depends} substitutions and adding them to substvars files.
-
-The program will look at .dll/.exe and .config files in your package, and
-will use the embedded dependency information to generate a dependency
-strings on assembly and shared libs packages, including the setting of
-version ranges (as declared by the shlibs/netlibs files of the used
-packages). The dependency on a certain Mono version will be also added
-to the final variable.
-
-Note: the dependencies on shared libraries may be not resolved correctly
-if there are no .config files associated with the the .exe/.dll file
-which refers to the particular shared library (by its SONAME).
-
-If you use this program, your package should build-depend on mono-utils
-(>= 1.0).
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<-d>
-
-Attempt to predict and avoid duplicates that may appear if you package
-both, native shared libraries and DLL assemblies in one package.
-The list of possibly duplicating candidates is expected to be in the
-variable shlib:Depends from debian/package.substvars.
-
-=item B<-r>
-
-Don't set a strong versioned dependy on mono-jit or mono-mint packages.
-This option can be used to specify a relaxed dependency on the VM
-by-hand in the control file, eg. "mono-jit | cli-virtual-machine".
-
-=cut
-
-init();
-
-my $cli = '/usr/bin/cli';
-
-# The current python major version
-# my $python_major;
-my $mono_version = `$cli -V 2>&1`;
-
-if ( !-x "/usr/bin/monodis" ) {
-    error(
-"Package mono-utils is not installed, aborting. (Probably forgot to Build-Depend on mono-utils.)"
-    );
-}
-
-if ( system "egrep -q \"Build-Depends: .*mono-utils \(>= 1\.[0-9.-]+\)\" debian/control" ) {
-    warning("Warning! No Build-Depends on mono-utils (>= 1.0)!");
-}
-
-if ( !defined $mono_version || $mono_version eq "" ) {
-    error( "Mono is not installed, aborting. (Probably forgot to
-  Build-Depend on cli-virtual-machine.)"
-    );
-}
-elsif ( $mono_version =~ /(mint|version)\ ([\d\.]+)/ ) {
-    $mono_version = "$2";
-}
-else {
-    error("Unable to parse Mono version out of \"$mono_version\".");
-}
-
-# The next python version
-#my $python_nextversion = $python_version + 0.1;
-#my $python_nextmajor = $python_major + 1;
-#
-#my @python_allversions = ('1.5','2.1','2.2','2.3');
-#foreach (@python_allversions) {
-#	s/^/python/;
-#}
-
-# Check for -V
-my $usemono = $mono_version;
-if ( $dh{V_FLAG_SET} ) {
-    $usemono = $dh{V_FLAG};
-}
-
-# Cleaning the paths given on the command line
-foreach (@ARGV) {
-    s#/$##;
-    s#^/##;
-}
-
-my $fh;
-my %libdata;
-open( $fh, "cat /var/lib/dpkg/info/*.netlibs debian/*/DEBIAN/netlibs 2>/dev/null |" );
-while (<$fh>) {
-    /(\S+)\s+(\S+)\s+(\w.*)\n?/;
-    $libdata{"$1/$2"} = $3;
-}
-
-my %shlibdata;
-
-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} ) )
-    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 |" );
-      while (<$fh>) {
-         /(\S+)\s+(\S+)\s+(\w.*)\n?/;
-         $shlibdata{"$1.so.$2"} = $3;
-      }
-   }
-
-   $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;
-}
-foreach my $package ( @{ $dh{DOPACKAGES} } ) {
-    my $tmp = tmpdir($package);
-    my %deps;
-    my @depkgs;
-
-    delsubstvar( $package, "net:Depends" );    # for idempotency
-
-    # find binaries
-    find sub {
-        my $vers;
-        return unless -f and /\.(exe|dll)$/;
-        local *F;
-        my $file = $_;
-        return unless open F, "LANG=C monodis --assemblyref $file 2>&1 |";
-        if ( my $extra = extraDeps ($file) ) {
-           push ( @depkgs, $extra );
-        }
-        our( $vers, $name, $key );
-        while (<F>) {
-            $vers = $1 if /Version=(.*)\n/;
-            $name = $1 if /Could not find assembly ([^,]+),/;
-            $name = $1 if /Name=(.*)\n/;
-            $vers = "$1.$2" if /Major\/Minor:\s*(\d+),(\d+)/;
-            $vers .= ".$1.$2" if /Build:\s*(\d+),(\d+)/;
-
-            if (/0x\S+:.([ABCDEF0123456789 ]+)\n/ || /Token:\s*(\w+)/) {
-                $key = $1;
-                $key =~ s/\ //g;
-                $key = $vers . "__" . lc($key);
-                my $compat = "$name/$key";
-                if ( !defined( $libdata{$compat} ) ) {
-
-                    # reuse the key variable
-                    #if ( resolveShlib( $file, $name, \$key ) ) {
-                    #    push ( @depkgs, $key );
-                    #}
-                    #else
-                    {
-                        warning(
-"Warning! No Debian dependency data for $name ($key)!"
-                        );
-                    }
-                }
-                else {
-                    push ( @depkgs, $libdata{$compat} );
-                }
-
-                #print "ok, ".$deps{ "$name/$vers" . "__" . lc($key) };
-            }
-        }
-        close F;
-     }, $tmp;
-    my %depkgsFiltered;
-    for (@depkgs) {
-       for ( split ( /\s*,\s*/, $_ ) ) {
-          # filter dupes and don't depend on this package
-          /^(\S+)/;
-          $depkgsFiltered{$_} = 1 if($1 ne $package);
-       }
-    }
-    # now filter the dupes coming from shlibs
-    if ( defined( $dh{D_FLAG} ) ) {
-       if(open( $fh, "<debian/$package.substvars" )) {
-          while (<$fh>) {
-             if (/^shlibs:Depends=(.*)\n?/) {
-                for ( split ( /\s*,\s*/, $1 ) ) {
-                   delete $depkgsFiltered{$_};
-                }
-             }
-          }
-       }
-       else
-       {
-          verbose_print(
-             "Could not read debian/$package.substvars"
-          );
-       }
-    }
-
-    addsubstvar( $package, "net:Depends",
-        ( (defined($dh{R_FLAG})) ? "" : "mono-jit (>= $mono_version) | mono-mint (>= $mono_version)" )
-        . join ( ", ", "", sort {
-           # beautify the sort order, requested by meebey
-           my $apkg;
-           $a=~/^\S+/;
-           $apkg=$&;
-           $b=~/^\S+/;
-           if($apkg eq $&) {
-              return -1 if( ($a=~/>=/) && ($b=~/<</));
-              return 1 if( ($b=~/>=/) && ($a=~/<</));
-           }
-           $a cmp $b;
-        } ( keys %depkgsFiltered ) ) );
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of mono-utils.
-
-=head1 AUTHOR
-
-Eduard Bloch <blade at debian.org>, partialy based on code from Brendan O'Dea <bod at debian.org>.
-
-=cut
-

Deleted: mono/branches/1.1/debian/libmint-dev.install
===================================================================
--- mono/branches/1.1/debian/libmint-dev.install	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/libmint-dev.install	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,4 +0,0 @@
-debian/tmp/usr/lib/libmint*.a
-debian/tmp/usr/lib/libmint*.so
-debian/tmp/usr/lib/pkgconfig/mint.pc
-debian/tmp/usr/include

Deleted: mono/branches/1.1/debian/lintian
===================================================================
--- mono/branches/1.1/debian/lintian	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/lintian	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,3 +0,0 @@
-# we refresh the crap after clean, and stop bothering about standards version
-mono: outdated-autotools-helper-file config.guess 2001-09-04
-mono: outdated-autotools-helper-file config.sub 2001-09-07

Deleted: mono/branches/1.1/debian/man/monosn.1
===================================================================
--- mono/branches/1.1/debian/man/monosn.1	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/man/monosn.1	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,11 +0,0 @@
-.TH UNDOCUMENTED 1 "January 15th, 2004" "Debian GNU/Linux" "Mono Manual"
-.SH NAME
-undocumented \- No manpage for this program.
-.SH DESCRIPTION
-This
-.B program
-does not have a manpage. Run this command with the
-.B help
-switch to see what it does. For further information, refer to the .NET
-documentation from the Mono project, located on
-.B http://www.go-mono.com:8080/

Modified: mono/branches/1.1/debian/mono-common.install
===================================================================
--- mono/branches/1.1/debian/mono-common.install	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-common.install	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,3 +1,2 @@
 debian/tmp/etc/mono
-debian/tmp/usr/share/man/man5/mono-config.5
 debian/tmp/usr/share/mono/cil/cil-opcodes.xml

Modified: mono/branches/1.1/debian/mono-common.postinst
===================================================================
--- mono/branches/1.1/debian/mono-common.postinst	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-common.postinst	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,7 +1,26 @@
 #!/bin/sh -e
 
-if [ configure = "$1" -a -x /usr/sbin/update-binfmts ]; then
+if [ configure = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then
   /usr/sbin/update-binfmts --import cli &> /dev/null
 fi
 
+if [ configure = "$1" ] && [ -d /usr/share/dotnet/mono/ ]; then
+  if [ -s /usr/lib/mono ]; then
+    rm /usr/lib/mono
+  fi
+  if ! ( mkdir -p /usr/lib/mono && cp -af /usr/share/dotnet/mono/. /usr/lib/mono/ ); then
+    # unwind in case of error
+    rm -rf /usr/lib/mono
+    ln -s ../share/dotnet/mono /usr/lib/mono
+    exit 1
+  fi
+  rm -rf /usr/share/dotnet/mono
+  ln -s ../../lib/mono /usr/share/dotnet/mono
+fi
+
+if [ configure = "$1" ] && ! [ -L /usr/share/dotnet/mono ]; then
+  mkdir -p /usr/share/dotnet
+  ln -s ../../lib/mono /usr/share/dotnet/mono
+fi
+
 #DEBHELPER#

Modified: mono/branches/1.1/debian/mono-common.preinst
===================================================================
--- mono/branches/1.1/debian/mono-common.preinst	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-common.preinst	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,10 +1,3 @@
 #!/bin/sh -e
 
-if [ configure = "$1" ] && [ -d /usr/lib/mono ] ; then
-   mkdir -p /usr/share/dotnet/mono
-   cp -af /usr/lib/mono/. /usr/share/dotnet/mono/
-   rm -rf /usr/lib/mono
-fi
-
 #DEBHELPER#
-

Modified: mono/branches/1.1/debian/mono-jit.install
===================================================================
--- mono/branches/1.1/debian/mono-jit.install	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-jit.install	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,2 +1 @@
 debian/tmp/usr/bin/mono
-debian/tmp/usr/share/man/man1/mono.1

Copied: mono/branches/1.1/debian/mono-jit.postinst (from rev 1549, mono/branches/1.1/debian/mono-jit.postinst.mono-setup)
===================================================================
--- mono/branches/1.1/debian/mono-jit.postinst.mono-setup	2005-04-02 10:45:13 UTC (rev 1549)
+++ mono/branches/1.1/debian/mono-jit.postinst	2005-04-09 12:35:36 UTC (rev 1554)
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+
+# if we're configuring, /usr/share/doc/mono-jit is a directory,
+# and isn't a symlink, replace it with a symlink to mono-common
+if [ "$1" = "configure" -a -d /usr/share/doc/mono-jit -a ! -h /usr/share/doc/mono-jit ]; then
+        rmdir /usr/share/doc/mono-jit
+        ln -s mono-common /usr/share/doc/mono-jit
+fi
+
+update-alternatives --install /usr/bin/cli cli /usr/bin/mono 14 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
+
+#DEBHELPER#

Deleted: mono/branches/1.1/debian/mono-jit.postinst.head
===================================================================
--- mono/branches/1.1/debian/mono-jit.postinst.head	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-jit.postinst.head	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-# if we're configuring, /usr/share/doc/mono-jit is a directory,
-# and isn't a symlink, replace it with a symlink to mono-common
-if [ "$1" = "configure" -a -d /usr/share/doc/mono-jit -a ! -h /usr/share/doc/mono-jit ]; then
-	rmdir /usr/share/doc/mono-jit
-	ln -s mono-common /usr/share/doc/mono-jit
-fi
-

Deleted: mono/branches/1.1/debian/mono-jit.postinst.mint-setup
===================================================================
--- mono/branches/1.1/debian/mono-jit.postinst.mint-setup	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-jit.postinst.mint-setup	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,3 +0,0 @@
-update-alternatives --install /usr/bin/cli cli /usr/bin/mono 9 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-
-#DEBHELPER#

Deleted: mono/branches/1.1/debian/mono-jit.postinst.mono-setup
===================================================================
--- mono/branches/1.1/debian/mono-jit.postinst.mono-setup	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-jit.postinst.mono-setup	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,3 +0,0 @@
-	update-alternatives --install /usr/bin/cli cli /usr/bin/mono 14 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-
-#DEBHELPER#

Deleted: mono/branches/1.1/debian/mono-jit.postinst.old
===================================================================
--- mono/branches/1.1/debian/mono-jit.postinst.old	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-jit.postinst.old	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-# if we're configuring, /usr/share/doc/mono-jit is a directory,
-# and isn't a symlink, replace it with a symlink to mono-common
-if [ "$1" = "configure" -a -d /usr/share/doc/mono-jit -a ! -h /usr/share/doc/mono-jit ]; then
-	rmdir /usr/share/doc/mono-jit
-	ln -s mono-common /usr/share/doc/mono-jit
-fi
-
-ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
-if [[ "$ARCH" = "i386" || "$ARCH" = "powerpc" || "$ARCH" = "s390" ]]; then
-	update-alternatives --install /usr/bin/cli cli /usr/bin/mono 14 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-else
-	update-alternatives --install /usr/bin/cli cli /usr/bin/mono 9 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mono.1.gz
-fi
-
-#DEBHELPER#

Deleted: mono/branches/1.1/debian/mono-mint.install
===================================================================
--- mono/branches/1.1/debian/mono-mint.install	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-mint.install	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,4 +0,0 @@
-debian/tmp/usr/bin/mint
-debian/tmp/usr/lib/libmint.so.*
-debian/tmp/usr/lib/pkgconfig/mint.pc
-debian/tmp/usr/share/man/man1/mint.1

Deleted: mono/branches/1.1/debian/mono-mint.links
===================================================================
--- mono/branches/1.1/debian/mono-mint.links	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-mint.links	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1 +0,0 @@
-usr/share/doc/mono-common usr/share/doc/mono-mint

Deleted: mono/branches/1.1/debian/mono-mint.postinst
===================================================================
--- mono/branches/1.1/debian/mono-mint.postinst	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-mint.postinst	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-# if we're configuring, /usr/share/doc/mono-mint is a directory,
-# and isn't a symlink, replace it with a symlink to mono-common
-if [ "$1" = "configure" -a -d /usr/share/doc/mono-mint -a ! -h /usr/share/doc/mono-mint ]; then
-	rmdir /usr/share/doc/mono-mint
-	ln -s mono-common /usr/share/doc/mono-mint
-fi
-
-update-alternatives --install /usr/bin/cli cli /usr/bin/mint 10 --slave /usr/share/man/man1/cli.1.gz cli.1.gz /usr/share/man/man1/mint.1.gz
-
-#DEBHELPER#

Deleted: mono/branches/1.1/debian/mono-mint.prerm
===================================================================
--- mono/branches/1.1/debian/mono-mint.prerm	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-mint.prerm	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-
-if [ "$1" = remove ]; then
-update-alternatives --remove cli /usr/bin/mint
-fi
-
-#DEBHELPER#

Modified: mono/branches/1.1/debian/mono-utils.install
===================================================================
--- mono/branches/1.1/debian/mono-utils.install	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-utils.install	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,5 +1,3 @@
-debian/dh_makenetlibs		/usr/bin
-debian/dh_netdeps		/usr/bin
 debian/dh_installxsp		/usr/bin
 debian/postrm-monoxsp		/usr/share/debhelper/autoscripts
 debian/postinst-monoxsp		/usr/share/debhelper/autoscripts

Modified: mono/branches/1.1/debian/mono-utils.manpages
===================================================================
--- mono/branches/1.1/debian/mono-utils.manpages	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/mono-utils.manpages	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1,4 +1,5 @@
 debian/man/pedump.1
+debian/man/monodiet.1
 debian/man/monograph.1
 debian/tmp/usr/share/man/man1/monodis.1
 debian/dh_*.1

Modified: mono/branches/1.1/debian/patches/00list
===================================================================
--- mono/branches/1.1/debian/patches/00list	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/patches/00list	2005-04-09 12:35:36 UTC (rev 1554)
@@ -1 +0,0 @@
-05_lib_linker

Modified: mono/branches/1.1/debian/rules
===================================================================
--- mono/branches/1.1/debian/rules	2005-04-03 16:33:00 UTC (rev 1553)
+++ mono/branches/1.1/debian/rules	2005-04-09 12:35:36 UTC (rev 1554)
@@ -5,6 +5,7 @@
 
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,')
+NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -17,6 +18,7 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+# Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
 cli-wrapper: debian/cli-wrapper.c
@@ -25,16 +27,13 @@
 build: patch build-stamp
 build-stamp: cli-wrapper
 	dh_testdir
-	./configure $(confflags) --prefix=/usr --with-gc=included \
+	./configure $(confflags) --prefix=/usr \
 	  --mandir=\$${prefix}/share/man \
-	  --infodir=\$${prefix}/share/info \
-	  --sysconfdir=/etc --with-sigaltstack=no \
-	  --with-tls=pthread --with-nptl=no
-	# we don't install precompiled stuff
-	# (getting those build by the mcs source package)
-	perl -pe 's,\ runtime\ ,  ,' -i Makefile
+	  --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+	  --with-sigaltstack=no --with-tls=pthread --with-gc=included \
+	  --with-jit=yes --with-ikvm-native=yes
+	# --with-icu=yes 
 	$(MAKE)
-	( cat debian/mono-jit.postinst.head; ARCH= ; case $(DEB_HOST_ARCH) in i386|powerpc) cat debian/mono-jit.postinst.mono-setup ;; *) cat debian/mono-jit.postinst.mint-setup ;; esac ) > debian/mono-jit.postinst
 	touch build-stamp
 
 clean: unpatch
@@ -42,10 +41,11 @@
 	dh_testroot
 	rm -f build-stamp
 	-$(MAKE) distclean
-	-cd $(CURDIR)/debian/detector && $(MAKE) clean
+	-cd debian/detector && $(MAKE) clean
 	rm -f cli-wrapper
-	-cd $(CURDIR)/debian && \
-	  rm -f mono-jit.postinst dh_netdeps.1 dh_makenetlibs.1 dh_installxsp.1
+	rm -rf $(CURDIR)/.wapi
+	-cd debian && \
+	  rm -f dh_installxsp.1
 	dh_clean
 
 install: build
@@ -53,21 +53,37 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) $(ATG) install DESTDIR=$(CURDIR)/debian/tmp
-	cd $(CURDIR)/debian && \
-	  for x in dh_netdeps dh_makenetlibs dh_installxsp ; \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	# we do not want nunit, it's a slightly modified version
+	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*
+	cd debian && \
+	  for x in dh_installxsp; \
 	    do chmod +x $$x; pod2man $$x > $$x.1 ; done
-	install -D -m755 cli-wrapper $(CURDIR)/debian/mono-common/usr/bin/cli-wrapper
-	cd $(CURDIR)/debian/detector && \
-	  $(MAKE) $(ATG) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
+	install -D -m755 cli-wrapper debian/mono-common/usr/bin/cli-wrapper
+	cd debian/detector && \
+	  $(MAKE) && install -D -m755 binfmt-detector-cli 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
+	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
+	dh_install -i -Xbin/mono -Xbin/monodiet -Xbin/monodis -Xbin/monograph -Xbin/pedump -Xbin/jay
+	# 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
 	dh_link -i
 	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
@@ -75,7 +91,9 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION)
+	dh_makeclilibs -i -m 1.0
+	dh_clideps -i
+	dh_gencontrol -i -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -85,21 +103,22 @@
 	dh_testroot -s
 	dh_install -s
 	dh_link -s
-	install -m644 -D debian/lintian debian/mono/usr/share/lintian/overrides/mono
-	dh_installchangelogs -s
+	dh_installchangelogs -s ChangeLog
+	dh_installchangelogs -pmono-jay $(CURDIR)/mcs/jay/ChangeLog
 	dh_installdocs -s
 	dh_installexamples -s
 	dh_installman -s
+	dh_installexamples -pmono-jay $(CURDIR)/mcs/jay/skeleton.cs
 	dh_strip -s
 	dh_compress -s
+	dh_compress -s -Xskeleton.cs
 	dh_fixperms -s
-	if test -d debian/libmono0 ; then dh_makeshlibs -plibmono0 -V 'libmono-$(UPVERSION)' ;fi
+	if test -d debian/libmono0 ; then dh_makeshlibs -plibmono0 -V 'libmono-$(UPVERSION)' ; fi
 	dh_installdeb -s
 	dh_shlibdeps -s -Xlibmono-profiler-cov
-	dh_gencontrol -s -- -Vmono:upversion=$(UPVERSION)
+	dh_gencontrol -s -- -Vmono:upversion=$(UPVERSION) -Vmono:next-upversion=$(NEXT_UPVERSION)
 	dh_md5sums -s
 	dh_builddeb -s
 
-#binary: binary-indep binary-arch
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-indep binary-arch
+.PHONY: clean build binary-indep binary-arch install binary patch unpatch




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