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

[Eduard Bloch]

Author: blade
Date: 2004-04-15 16:40:21 -0600 (Thu, 15 Apr 2004)
New Revision: 569

Modified:
   monodoc/trunk/debian/changelog
   monodoc/trunk/debian/control
   monodoc/trunk/debian/monodoc-http.postinst
Log:
So, moved old monodoc-browser to Conflicts: since Replaces: does not
work, dpkg is getting confused during the upgrade because the
installation order is not guaranteed otherwise.

Also checking whether *update scripts are there before running them
(cosmetics).



Modified: monodoc/trunk/debian/changelog
===================================================================
--- monodoc/trunk/debian/changelog	2004-04-15 22:26:49 UTC (rev 568)
+++ monodoc/trunk/debian/changelog	2004-04-15 22:40:21 UTC (rev 569)
@@ -7,6 +7,8 @@
       correct files (closes: #243833)
     + also documented the possible results of mixtures of random files from
       Debian and third-party packages in README.Debian
+    + Replaces: was not enough to avoid the effect mentioned above, set
+      Conflicts: now (thanks to Cesar Eduardo Barros for investigation)
 
  -- Eduard Bloch <blade@debian.org>  Sun, 11 Apr 2004 16:11:19 +0200
 

Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control	2004-04-15 22:26:49 UTC (rev 568)
+++ monodoc/trunk/debian/control	2004-04-15 22:40:21 UTC (rev 569)
@@ -21,8 +21,7 @@
 Package: monodoc-base
 Architecture: all
 Depends: mono-jit (>> 0.29) | cli-virtual-machine
-Conflicts: normalize
-Replaces: monodoc-browser (<< 0.13)
+Conflicts: normalize, 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-http.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-http.postinst	2004-04-15 22:26:49 UTC (rev 568)
+++ monodoc/trunk/debian/monodoc-http.postinst	2004-04-15 22:40:21 UTC (rev 569)
@@ -2,8 +2,8 @@
 
 case "$1" in
    configure)
-   mono-xsp-update.conf || true
-   mono-server-update.conf || true
+   which mono-xsp-update.conf > /dev/null && mono-xsp-update.conf || true
+   which mono-server-update.conf > /dev/null && mono-server-update.conf || true
    ;;
 esac