[Pkg-mono-svn-commits] rev 421 - monodoc/trunk/debian
Mirco Bauer
meebey-guest@haydn.debian.org
Mon, 15 Mar 2004 11:46:13 -0700
Author: meebey-guest
Date: 2004-03-15 11:46:10 -0700 (Mon, 15 Mar 2004)
New Revision: 421
Modified:
monodoc/trunk/debian/changelog
monodoc/trunk/debian/monodoc-base.links
monodoc/trunk/debian/monodoc-browser.postrm
monodoc/trunk/debian/monodoc-http-script
monodoc/trunk/debian/monodoc-http.install
monodoc/trunk/debian/monodoc-http.postinst
monodoc/trunk/debian/monodoc-http.prerm
monodoc/trunk/debian/rules
Log:
- MonoConvetions, finally for monodoc!
Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/changelog 2004-03-15 18:46:10 UTC (rev 421)
@@ -1,9 +1,15 @@
monodoc (0.11-1) unstable; urgency=low
* Mirco 'meebey' Bauer
+ + removed documentation links which are not shipped
+ + MonoConventions conform
+ + added version checks for gtk-sharp to monodoc-browser dependencies.
+ + added lynx to monodoc-browser dependencies.
+ new upstream release
* Eduard Bloch
+ don't run xsp.exe in monodoc-http script, run xsp
+ * Teófilo Ruiz Suárez
+ + added xsp and mono-server root dir hooks
-- Mirco 'meebey' Bauer <mail@meebey.net> Mon, 10 Mar 2004 22:47:56 +0100
Modified: monodoc/trunk/debian/monodoc-base.links
===================================================================
--- monodoc/trunk/debian/monodoc-base.links 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/monodoc-base.links 2004-03-15 18:46:10 UTC (rev 421)
@@ -1 +1,2 @@
-etc/mono/monodoc.config usr/lib/monodoc.config
+etc/mono/monodoc.config usr/share/dotnet/monodoc/monodoc.config
+usr/share/dotnet/monodoc/monodoc.dll usr/share/dotnet/lib/monodoc.dll
Modified: monodoc/trunk/debian/monodoc-browser.postrm
===================================================================
--- monodoc/trunk/debian/monodoc-browser.postrm 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/monodoc-browser.postrm 2004-03-15 18:46:10 UTC (rev 421)
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ -f /usr/lib/monodoc/monodoc.index ]; then
- rm /usr/lib/monodoc/monodoc.index
- rmdir /usr/lib/monodoc 2> /dev/null || true
+if [ -f /usr/share/dotnet/monodoc/monodoc.index ]; then
+ rm /usr/share/dotnet/monodoc/monodoc.index
+ rmdir /usr/share/dotnet/monodoc 2> /dev/null || true
fi
Modified: monodoc/trunk/debian/monodoc-http-script
===================================================================
--- monodoc/trunk/debian/monodoc-http-script 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/monodoc-http-script 2004-03-15 18:46:10 UTC (rev 421)
@@ -14,4 +14,4 @@
(sleep 5 ; sensible-browser http://localhost:$port/ ) &
-exec xsp --root /usr/share/monodoc-http --port $port
+exec xsp --root /usr/share/dotnet/monodoc/web --port $port
Modified: monodoc/trunk/debian/monodoc-http.install
===================================================================
--- monodoc/trunk/debian/monodoc-http.install 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/monodoc-http.install 2004-03-15 18:46:10 UTC (rev 421)
@@ -1 +1 @@
-browser/web/* usr/share/monodoc-http
+browser/web/* usr/share/dotnet/monodoc/web
Modified: monodoc/trunk/debian/monodoc-http.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-http.postinst 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/monodoc-http.postinst 2004-03-15 18:46:10 UTC (rev 421)
@@ -1,11 +1,11 @@
#!/bin/sh -e
if [ -x /usr/bin/xsp.exe -a -d /etc/xsp-snapshot ]; then
- echo "Updating Root Servers..."
- echo "/monodoc:/usr/share/monodoc-http" >> /etc/xsp-snapshot/virtual.conf
+ echo "Updating XSP root dirs..."
+ echo "/monodoc:/usr/share/dotnet/monodoc/web" >> /etc/xsp-snapshot/virtual.conf
fi
if [ -x /usr/bin/mod-mono-server.exe -a -d /etc/mono-server-snapshot ]; then
- echo "Updating Root Servers..."
- echo "/monodoc:/usr/share/monodoc-http" >> /etc/mono-server-snapshot/virtual.conf
+ echo "Updating Mono Server root dirs..."
+ echo "/monodoc:/usr/share/dotnet/monodoc/web" >> /etc/mono-server-snapshot/virtual.conf
fi
Modified: monodoc/trunk/debian/monodoc-http.prerm
===================================================================
--- monodoc/trunk/debian/monodoc-http.prerm 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/monodoc-http.prerm 2004-03-15 18:46:10 UTC (rev 421)
@@ -2,14 +2,14 @@
if [ -f /etc/xsp-snapshot/virtual.conf ]; then
tempfile=`/bin/tempfile`
- sed s/\\/monodoc:\\/usr\\/share\\/monodoc-http/ /etc/xsp-snapshot/virtual.conf > $tempfile
+ sed s/\\/monodoc:\\/usr\\/share\\/dotnet\\/monodoc\\/web/ /etc/xsp-snapshot/virtual.conf > $tempfile
cp $tempfile /etc/xsp-snapshot/virtual.conf
rm -f /etc/xsp-snapshot/virtual.conf
fi
if [ -f /etc/mono-server-snapshot/virtual.conf ]; then
tempfile=`/bin/tempfile`
- sed s/\\/samples:\\/usr\\/share\\/monodoc-http/ /etc/xsp-snapshot/virtual.conf > $tempfile
+ sed s/\\/samples:\\/usr\\/share\\/dotnet\\/monodoc\\/web/ /etc/mono-server-snapshot/virtual.conf > $tempfile
cp $tempfile /etc/mono-server-snapshot/virtual.conf
rm -f /etc/mono-server-snapshot/virtual.conf
fi
Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules 2004-03-14 18:52:42 UTC (rev 420)
+++ monodoc/trunk/debian/rules 2004-03-15 18:46:10 UTC (rev 421)
@@ -38,7 +38,6 @@
$(CURDIR)/browser/web
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
mv $(CURDIR)/debian/tmp/usr/lib/monodoc.config $(CURDIR)/debian/monodoc-base/etc/mono
- cp $(CURDIR)/debian/monodoc-http-script $(CURDIR)/debian/monodoc-http/usr/bin/monodoc-http
binary-indep: build install
dh_testdir -i
@@ -46,9 +45,19 @@
dh_movefiles -i
dh_link -i
dh_install -i
+ cp $(CURDIR)/debian/monodoc-http-script $(CURDIR)/debian/monodoc-http/usr/bin/monodoc-http
# fix upstream file permissions
- find $(CURDIR)/debian/monodoc-http/usr/share/monodoc-http -type f -exec chmod 644 {} \;
- find $(CURDIR)/debian/monodoc-http/usr/share/monodoc-http -type d -exec chmod 755 {} \;
+ find $(CURDIR)/debian/monodoc-http/usr/share/dotnet/monodoc/web -type f -exec chmod 644 {} \;
+ find $(CURDIR)/debian/monodoc-http/usr/share/dotnet/monodoc/web -type d -exec chmod 755 {} \;
+ perl -pe 's,/usr/lib/monodoc,/usr/share/dotnet/monodoc,;' -i $(CURDIR)/debian/monodoc-base/etc/mono/monodoc.config
+ perl -pe 's,mono --debug,/usr/bin/cli,; s,/usr/lib/monodoc,/usr/share/dotnet/monodoc,; s,mono ,/usr/bin/cli ,;' -i $(CURDIR)/debian/monodoc-browser/usr/share/dotnet/monodoc/mod
+ perl -pe 's,mono --debug,/usr/bin/cli,; s,/usr/lib/monodoc,/usr/share/dotnet/monodoc,; s,mono ,/usr/bin/cli ,;' -i $(CURDIR)/debian/monodoc-browser/usr/share/dotnet/monodoc/monodoc
+ perl -ne ' \
+ next if m/monohb/; \
+ next if m/classlib-gtkmozembed/; \
+ next if m/classlib-diacanvas/; \
+ next if m/various/; print \
+ ' -i $(CURDIR)/debian/monodoc-manual/usr/share/dotnet/monodoc/monodoc.xml #perl -pe 'undef \\$_ if \
dh_installchangelogs -i ChangeLog
dh_installdocs -i
dh_installman -i