[Pkg-mono-svn-commits] rev 2079 - in mono/trunk/debian: . patches
Mirco Bauer
meebey-guest at costa.debian.org
Sun Oct 16 19:05:54 UTC 2005
Author: meebey-guest
Date: 2005-10-16 19:05:51 +0000 (Sun, 16 Oct 2005)
New Revision: 2079
Removed:
mono/trunk/debian/dh_installxsp
mono/trunk/debian/postinst-monoxsp
mono/trunk/debian/postrm-monoxsp
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/mono-utils.install
mono/trunk/debian/patches/00list
mono/trunk/debian/patches/s390_compile_fix.dpatch
mono/trunk/debian/rules
Log:
- 1.1.9.2-1 release
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/changelog 2005-10-16 19:05:51 UTC (rev 2079)
@@ -1,3 +1,18 @@
+mono (1.1.9.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Mirco 'meebey' Bauer
+ + debian/patches/00list:
+ - Removed io_layer_fix_r50689, already applied upstream.
+ - Removed amd64_compile_fix_r50553, already applied upstream.
+ + debian/mono-utils.install:
+ - Removed dh_installxsp, postrm-monoxsp and postinst-monoxsp. Those files
+ will be in the XSP package (mono-xsp-base) instead.
+ + debian/patches/s390_compile_fix.dpatch:
+ - Updated the patch, one "break" was missing in an empty default label.
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org> Sun, 16 Oct 2005 14:01:28 +0200
+
mono (1.1.9.1-3) unstable; urgency=medium
* Mirco 'meebey' Bauer
Deleted: mono/trunk/debian/dh_installxsp
===================================================================
--- mono/trunk/debian/dh_installxsp 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/dh_installxsp 2005-10-16 19:05:51 UTC (rev 2079)
@@ -1,87 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_installxsp - install host files into /etc/xsp/conf.d and
-/etc/mono-server/conf.d
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_installxsp> [S<B<debhelper options>>] [B<--name=>I<name>]
-
-=head1 DESCRIPTION
-
-dh_installxsp is a debhelper program that will install host configuration
-files in /etc/xsp/conf.d and /etc/monoserver/conf.d. So, if xsp is
-install or will be installed, when xsp starts it automatically starts
-the daemon with the host file. The files debian/package.hostxsp are installed.
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<--name=>I<name>
-
-Look for files named debian/package.hostxsp and install them as
-/etc/xsp/conf.d/package/hostfile.
-
-=back
-
-=cut
-
-init();
-
-my $depname="cli:XspServer";
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
- my $tmp=tmpdir($package);
- my $hostfile=pkgfile($package,"hostxsp");
- if ($hostfile) {
- delsubstvar( $package, $depname ); # for idempotency
- addsubstvar( $package, $depname,
- "mono-xsp | mono-apache-server" );
- if( ! -d "$tmp/etc/xsp/conf.d" ) {
- doit("install","-d","$tmp/etc/xsp/conf.d");
- }
- if( ! -d "$tmp/etc/xsp/conf.d/".pkgfilename($package)) {
- doit("install","-d","$tmp/etc/xsp/conf.d/".pkgfilename($package));
- }
- doit("install","-m",644,$hostfile,"$tmp/etc/xsp/conf.d/".pkgfilename($package)."/10_".pkgfilename($package));
-
- if( ! -d "$tmp/etc/mono-server/conf.d" ) {
- doit("install","-d","$tmp/etc/mono-server/conf.d");
- }
- if( ! -d "$tmp/etc/mono-server/conf.d/".pkgfilename($package)) {
- doit("install","-d","$tmp/etc/mono-server/conf.d/".pkgfilename($package));
- }
-
- doit("install","-m",644,$hostfile,"$tmp/etc/mono-server/conf.d/".pkgfilename($package)."/10_".pkgfilename($package));
-
- if ($hostfile ne '') {
- if (! $dh{NOSCRIPTS}) {
- autoscript($package,"postinst","postinst-monoxsp",
- "s/#PACKAGE#/$package/");
- autoscript($package,"postrm","postrm-monoxsp",
- "s/#PACKAGE#/$package/");
- }
- }
-
- }
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of mono-utils.
-
-=head1 AUTHOR
-
-Pablo Fischer <pablo at pablo.com.mx>
-
-=cut
Modified: mono/trunk/debian/mono-utils.install
===================================================================
--- mono/trunk/debian/mono-utils.install 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/mono-utils.install 2005-10-16 19:05:51 UTC (rev 2079)
@@ -1,6 +1,3 @@
-debian/dh_installxsp /usr/bin/
-debian/postrm-monoxsp /usr/share/debhelper/autoscripts/
-debian/postinst-monoxsp /usr/share/debhelper/autoscripts/
debian/tmp/usr/bin/pedump
debian/tmp/usr/bin/monodis /usr/bin/
debian/tmp/usr/bin/monograph
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/patches/00list 2005-10-16 19:05:51 UTC (rev 2079)
@@ -1,6 +1,4 @@
remove_broken_dllmap_from_mono-shlib-cop
datetime_doparse_fix
s390_compile_fix
-io_layer_fix_r50689
-amd64_compile_fix_r50553
64bit_implicit_pointer_cast_fix
Modified: mono/trunk/debian/patches/s390_compile_fix.dpatch
===================================================================
--- mono/trunk/debian/patches/s390_compile_fix.dpatch 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/patches/s390_compile_fix.dpatch 2005-10-16 19:05:51 UTC (rev 2079)
@@ -5,10 +5,18 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-1.1.9.1~/mono/arch/s390/tramp.c mono-1.1.9.1/mono/arch/s390/tramp.c
---- mono-1.1.9.1~/mono/arch/s390/tramp.c 2004-06-18 22:03:01.000000000 +0200
-+++ mono-1.1.9.1/mono/arch/s390/tramp.c 2005-09-26 23:18:26.000000000 +0200
-@@ -1117,6 +1117,7 @@
+diff -urNad mono-1.1.9.2~/mono/arch/s390/tramp.c mono-1.1.9.2/mono/arch/s390/tramp.c
+--- mono-1.1.9.2~/mono/arch/s390/tramp.c 2005-10-16 19:55:57.000000000 +0200
++++ mono-1.1.9.2/mono/arch/s390/tramp.c 2005-10-16 20:01:35.000000000 +0200
+@@ -649,6 +649,7 @@
+ /* The callee has already placed the result */
+ /* in the required area */
+ /*------------------------------------------*/
++ break;
+ }
+ break;
+ case MONO_TYPE_VOID:
+@@ -1117,6 +1118,7 @@
/*-------------------------------------------------*/
/* stackval_to_data has placed data in result area */
/*-------------------------------------------------*/
Deleted: mono/trunk/debian/postinst-monoxsp
===================================================================
--- mono/trunk/debian/postinst-monoxsp 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/postinst-monoxsp 2005-10-16 19:05:51 UTC (rev 2079)
@@ -1,8 +0,0 @@
-if [ "$1" = "configure" ]; then
- if [ -x /usr/sbin/mono-xsp-update.conf ]; then
- mono-xsp-update.conf || true
- fi
- if [ -x /usr/sbin/mono-server-update.conf ]; then
- mono-server-update.conf || true
- fi
-fi
Deleted: mono/trunk/debian/postrm-monoxsp
===================================================================
--- mono/trunk/debian/postrm-monoxsp 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/postrm-monoxsp 2005-10-16 19:05:51 UTC (rev 2079)
@@ -1,9 +0,0 @@
-if [ "$1" = "remove" -o "$1" = "purge" ]; then
- if [ -x /usr/sbin/mono-xsp-update.conf ]; then
- mono-xsp-update.conf || true
- fi
- if [ -x /usr/sbin/mono-server-update.conf ]; then
- mono-server-update.conf || true
- fi
-fi
-
Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules 2005-10-16 18:34:23 UTC (rev 2078)
+++ mono/trunk/debian/rules 2005-10-16 19:05:51 UTC (rev 2079)
@@ -52,8 +52,6 @@
-cd debian/detector && $(MAKE) clean
rm -f cli-wrapper
rm -rf $(MONO_SHARED_DIR)/.wapi
- -cd debian && \
- rm -f dh_installxsp.1
dh_clean
install: build
@@ -76,9 +74,6 @@
rm -f debian/tmp/usr/bin/prj2make
rm -f debian/usr/share/man/man1/prj2make.1
rm -f debian/tmp/usr/lib/mono/1.0/prj2make.exe*
- cd debian && \
- for x in dh_installxsp; \
- do chmod +x $$x; pod2man $$x > $$x.1 ; done
install -D -m755 cli-wrapper debian/mono-common/usr/bin/cli-wrapper
cd debian/detector && \
$(MAKE) && install -D -m755 binfmt-detector-cli $(CURDIR)/debian/mono-common/usr/lib/cli/binfmt-detector-cli
More information about the Pkg-mono-svn-commits
mailing list