[Pkg-mono-svn-commits] rev 552 - monodoc/trunk/debian
Eduard Bloch
blade@haydn.debian.org
Sun, 11 Apr 2004 07:11:05 -0600
Author: blade
Date: 2004-04-11 07:10:55 -0600 (Sun, 11 Apr 2004)
New Revision: 552
Modified:
monodoc/trunk/debian/changelog
monodoc/trunk/debian/control
monodoc/trunk/debian/monodoc-base.install
monodoc/trunk/debian/monodoc-base.links
monodoc/trunk/debian/monodoc-browser.install
monodoc/trunk/debian/monodoc-browser.links
monodoc/trunk/debian/monodoc-http.postinst
monodoc/trunk/debian/monodoc-http.postrm
Log:
- Finally moved files around
- removed conffiles handling non-sense
<Zomb> pabl0: do. not. overwrite. conffiles. just. for. fun.
<Zomb> pabl0: do. not. remove. conffiles. in. the. remove. action.
Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/changelog 2004-04-11 13:10:55 UTC (rev 552)
@@ -13,7 +13,9 @@
* Eduard Bloch
+ don't run xsp.exe in monodoc-http script, run xsp
+ monodoc-http-script check for ports <=1024
- + moved assembler.exe and mod.exe to the monodoc-base package
+ + moved assembler, mod, normalize to the monodoc-base package and set
+ conflicts with the normalize package because of the filename colision
+ + wrote or rewrote parts of the xsp config installation parts
* Teófilo Ruiz Suárez
+ added xsp and mono-server root dir hooks
Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/control 2004-04-11 13:10:55 UTC (rev 552)
@@ -21,6 +21,8 @@
Package: monodoc-base
Architecture: all
Depends: mono-jit (>> 0.29) | cli-virtual-machine
+Conflicts: normalize
+Replaces: monodoc-browser (<< 0.13)
Description: shared MonoDoc binaries
The MonoDoc Project is the documentation framework of the MONO project which
provides detailed API documentation for all MONO components and the MONO .NET
Modified: monodoc/trunk/debian/monodoc-base.install
===================================================================
--- monodoc/trunk/debian/monodoc-base.install 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/monodoc-base.install 2004-04-11 13:10:55 UTC (rev 552)
@@ -1,2 +1,7 @@
debian/tmp/usr/lib/monodoc.dll usr/share/dotnet/monodoc
monodoc.png usr/share/pixmaps
+debian/tmp/usr/bin/mod usr/share/dotnet/monodoc
+debian/tmp/usr/bin/monodoc usr/share/dotnet/monodoc
+debian/tmp/usr/lib/monodoc/assembler.exe usr/share/dotnet/monodoc
+debian/tmp/usr/lib/monodoc/mod.exe usr/share/dotnet/monodoc
+debian/tmp/usr/lib/monodoc/normalize.exe usr/share/dotnet/monodoc
Modified: monodoc/trunk/debian/monodoc-base.links
===================================================================
--- monodoc/trunk/debian/monodoc-base.links 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/monodoc-base.links 2004-04-11 13:10:55 UTC (rev 552)
@@ -1,2 +1,9 @@
etc/mono/monodoc.config usr/share/dotnet/monodoc/monodoc.config
usr/share/dotnet/monodoc/monodoc.dll usr/share/dotnet/lib/monodoc.dll
+usr/share/dotnet/monodoc usr/lib/monodoc
+usr/share/dotnet/monodoc/mod usr/bin/mod
+usr/share/dotnet/monodoc/monodoc usr/bin/monodoc
+usr/bin/cli-wrapper usr/bin/assembler
+usr/bin/cli-wrapper usr/bin/normalize
+usr/share/dotnet/monodoc usr/share/dotnet/bin/assembler
+usr/share/dotnet/monodoc usr/share/dotnet/bin/normalize
Modified: monodoc/trunk/debian/monodoc-browser.install
===================================================================
--- monodoc/trunk/debian/monodoc-browser.install 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/monodoc-browser.install 2004-04-11 13:10:55 UTC (rev 552)
@@ -1,7 +1,2 @@
-debian/tmp/usr/bin/mod usr/share/dotnet/monodoc
-debian/tmp/usr/bin/monodoc usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/assembler.exe usr/share/dotnet/monodoc
debian/tmp/usr/lib/monodoc/browser.exe usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/mod.exe usr/share/dotnet/monodoc
-debian/tmp/usr/lib/monodoc/normalize.exe usr/share/dotnet/monodoc
monodoc.desktop usr/share/gnome/apps/Development
Modified: monodoc/trunk/debian/monodoc-browser.links
===================================================================
--- monodoc/trunk/debian/monodoc-browser.links 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/monodoc-browser.links 2004-04-11 13:10:55 UTC (rev 552)
@@ -1,8 +1,2 @@
-usr/share/dotnet/monodoc/mod usr/bin/mod
-usr/share/dotnet/monodoc/monodoc usr/bin/monodoc
-usr/bin/cli-wrapper usr/bin/assembler
usr/bin/cli-wrapper usr/bin/browser
-usr/bin/cli-wrapper usr/bin/normalize
-usr/share/dotnet/monodoc usr/share/dotnet/bin/assembler
usr/share/dotnet/monodoc usr/share/dotnet/bin/browser
-usr/share/dotnet/monodoc usr/share/dotnet/bin/normalize
Modified: monodoc/trunk/debian/monodoc-http.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-http.postinst 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/monodoc-http.postinst 2004-04-11 13:10:55 UTC (rev 552)
@@ -1,23 +1,10 @@
#!/bin/sh -e
-package="monodoc"
-
-make_config_host() {
- echo "# This is the configuration file"
- echo "# for the $package virtualhost"
- echo "path = /usr/share/dotnet/monodoc/web"
- echo "alias = /monodoc"
-}
-
update() {
daemon="$1"
cfg_dir="$2"
which mono-$daemon-update.conf || return 0
if [ -d "/etc/$cfg_dir" ]; then
- #Create the config host dir
- mkdir -p "/etc/$cfg_dir/conf.d/$package"
- #Add the file
- make_config_host > "/etc/$cfg_dir/conf.d/$package/10_$package"
#Update..
mono-$daemon-update.conf || true
fi
@@ -30,12 +17,6 @@
update server mono-server
;;
- abort-upgrade|abort-remove|abort-deconfigure)
- #Do nothing..
- ;;
-
- *)
- ;;
esac
#DEBHELPER#
Modified: monodoc/trunk/debian/monodoc-http.postrm
===================================================================
--- monodoc/trunk/debian/monodoc-http.postrm 2004-04-11 01:11:55 UTC (rev 551)
+++ monodoc/trunk/debian/monodoc-http.postrm 2004-04-11 13:10:55 UTC (rev 552)
@@ -1,14 +1,10 @@
#!/bin/sh -e
-package="monodoc"
-
update() {
daemon="$1"
cfg_dir="$2"
which mono-$daemon-update.conf || return 0
if [ -d "/etc/$cfg_dir" ]; then
- #Remove the config host dir
- rm -Rf "/etc/$cfg_dir/conf.d/$package"
#Update..
mono-$daemon-update.conf || true
fi
@@ -21,12 +17,6 @@
update server mono-server
;;
- abort-upgrade|abort-remove|abort-deconfigure)
- #Do nothing..
- ;;
-
- *)
- ;;
esac
#DEBHELPER#