[Pkg-mono-svn-commits] rev 568 - monodoc/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-04-15 16:26:49 -0600 (Thu, 15 Apr 2004)
New Revision: 568

Modified:
   monodoc/trunk/debian/README.Debian
   monodoc/trunk/debian/changelog
   monodoc/trunk/debian/monodoc-http.postinst
   monodoc/trunk/debian/rules
Log:
Fixes of the paths rewritters and documented why /usr/lib/monodoc may be
problematic


Modified: monodoc/trunk/debian/README.Debian
===================================================================
--- monodoc/trunk/debian/README.Debian	2004-04-15 21:46:17 UTC (rev 567)
+++ monodoc/trunk/debian/README.Debian	2004-04-15 22:26:49 UTC (rev 568)
@@ -9,4 +9,15 @@
    capable HTTP server (currently mono-xsp or Apache with
    libapache-mod-mono) to run them.
 
- Mirco 'meebey' Bauer <mail@meebey.net> -- Thu, 03 Feb 2004 18:58:46 +0100
+If you expience problem with no longer visible documentation installed
+by third-party products, then there may be a problem with your
+/usr/lib/monodoc. The monodoc installation in Debian does not use this
+directory. If you install a fresh system, this directory will be just a
+compatiblity symlink to /usr/share/dotnet/monodoc (the symlink may be
+removed in the future, though). However, if your /usr/lib/monodoc has
+been poisoned with unexpected files during the system upgrade, dpkg
+will leave it as-is, not replacing with a symlink. You will have to
+move the contents of the old directory to /usr/share/dotnet/monodoc
+manually.
+
+ -- Eduard Bloch <blade@debian.org>  Fri, 16 Apr 2004 00:22:47 +0200

Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2004-04-15 21:46:17 UTC (rev 567)
+++ monodoc/trunk/debian/changelog	2004-04-15 22:26:49 UTC (rev 568)
@@ -1,3 +1,15 @@
+monodoc (0.13-2) unstable; urgency=low
+
+  * Pablo Fischer:
+    + integration of dh_monoxsp
+  * Eduard Bloch:
+    + fixed the path rewritting code in debian/rules to be applied on the
+      correct files (closes: #243833)
+    + also documented the possible results of mixtures of random files from
+      Debian and third-party packages in README.Debian
+
+ -- Eduard Bloch <blade@debian.org>  Sun, 11 Apr 2004 16:11:19 +0200
+
 monodoc (0.13-1) unstable; urgency=low
 
   * Mirco 'meebey' Bauer

Modified: monodoc/trunk/debian/monodoc-http.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-http.postinst	2004-04-15 21:46:17 UTC (rev 567)
+++ monodoc/trunk/debian/monodoc-http.postinst	2004-04-15 22:26:49 UTC (rev 568)
@@ -1,11 +1,10 @@
 #!/bin/sh -e
 
 case "$1" in
-    configure)
-	mono-xsp-update.conf || true
-	mono-server-update.conf || true
-	;;
-
+   configure)
+   mono-xsp-update.conf || true
+   mono-server-update.conf || true
+   ;;
 esac
 
 #DEBHELPER#

Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules	2004-04-15 21:46:17 UTC (rev 567)
+++ monodoc/trunk/debian/rules	2004-04-15 22:26:49 UTC (rev 568)
@@ -52,8 +52,8 @@
 	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
+	ln -sf monodoc $(CURDIR)/debian/monodoc-base/usr/share/dotnet/monodoc/mod
 	perl -ne ' \
 	   next if m/monohb/; \
 	   next if m/classlib-gtkmozembed/; \