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

Eduard Bloch blade@haydn.debian.org
Fri, 09 Apr 2004 13:33:40 -0600


Author: blade
Date: 2004-04-09 13:33:37 -0600 (Fri, 09 Apr 2004)
New Revision: 523

Added:
   monodoc/trunk/debian/10_monodochttp
Removed:
   monodoc/trunk/debian/monodoc.desktop
   monodoc/trunk/debian/monodoc.png
Modified:
   monodoc/trunk/debian/control
   monodoc/trunk/debian/monodoc-http.install
   monodoc/trunk/debian/monodoc-http.postinst
Log:
Removed the png file (comes from upstream), moved conffile to a real
conffile instead of postinst hacks


Added: monodoc/trunk/debian/10_monodochttp
===================================================================
--- monodoc/trunk/debian/10_monodochttp	2004-04-09 17:09:00 UTC (rev 522)
+++ monodoc/trunk/debian/10_monodochttp	2004-04-09 19:33:37 UTC (rev 523)
@@ -0,0 +1,4 @@
+# This is the configuration file
+# for the monodoc-http
+path = /usr/share/dotnet/monodoc/web
+alias = /monodoc

Modified: monodoc/trunk/debian/control
===================================================================
--- monodoc/trunk/debian/control	2004-04-09 17:09:00 UTC (rev 522)
+++ monodoc/trunk/debian/control	2004-04-09 19:33:37 UTC (rev 523)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade@debian.org>, Mirco 'meebey' Bauer <mail@meebey.net>
-Build-Depends: debhelper (>= 4.0.0), sharutils, mono-mcs | c-sharp-compiler, gtk-sharp (>= 0.18), gtk-sharp (<< 0.19), glade-sharp (>= 0.18), glade-sharp (<< 0.19)
+Build-Depends: debhelper (>= 4.0.0), sharutils, mono-mcs | c-sharp-compiler, gtk-sharp (>= 0.18), gtk-sharp (<< 0.19), glade-sharp
 Standards-Version: 3.6.1
 
 Package: monodoc

Modified: monodoc/trunk/debian/monodoc-http.install
===================================================================
--- monodoc/trunk/debian/monodoc-http.install	2004-04-09 17:09:00 UTC (rev 522)
+++ monodoc/trunk/debian/monodoc-http.install	2004-04-09 19:33:37 UTC (rev 523)
@@ -1 +1,2 @@
 browser/web/* usr/share/dotnet/monodoc/web
+debian/10_monodochttp /etc/xsp/conf.d/monodoc

Modified: monodoc/trunk/debian/monodoc-http.postinst
===================================================================
--- monodoc/trunk/debian/monodoc-http.postinst	2004-04-09 17:09:00 UTC (rev 522)
+++ monodoc/trunk/debian/monodoc-http.postinst	2004-04-09 19:33:37 UTC (rev 523)
@@ -2,12 +2,6 @@
 
 if test -x /usr/bin/update-menus; then update-menus; fi
 
-monodochttp_xspconfd="/etc/xsp/conf.d/monodoc"
-monodochttp_xspconffile="$monodochttp_xspconfd/10_monodochttp"
-
-monodochttp_monoserverconfd="/etc/mono-server/conf.d/monodoc"
-monodochttp_monoserverconffile="$monodochttp_monoserverconfd/10_monodochttp"
-
 restart_xsp() {
     #XSP is running?
     if [ -f /var/run/mono-xsp ]; then
@@ -34,74 +28,22 @@
     fi
 }
 
-make_conffile() {
-    echo "# This is the configuration file"
-    echo "# for the monodoc-http"
-    echo "path = /usr/share/dotnet/monodoc/web"
-    echo "alias = /monodoc"
-}
-
-
 case "$1" in
-    configure)
-	if [ -x /usr/share/dotnet/bin/xsp.exe -a -d /etc/xsp ]; then
-            #Ok, we have the monodoc conf directory?
-	    if [ -d $monodochttp_xspconfd ]; then
-		# Ok, we have these files?
-		if [ -f $monodochttp_xspconffile ]; then
-		    # Ok, different checksum?
-		    checksum=`md5sum $monodochttp_xspconffile | awk '{print $1}'`
-		    if [ $checksum != "8cbfb5601113849fa64f0691344ca2c3" ]; then
-			echo "Updating Root Servers..."
-			make_conffile > "$monodochttp_xspconffile"		
-		    fi
-		else
-		    echo "Updating Root Servers..."
-		    make_conffile > "$monodochttp_xspconffile"		
-		fi
-	    else
-		mkdir -p $monodochttp_xspconfd
-		echo "Updating Root Servers..."
-		make_conffile > "$monodochttp_xspconffile"		
-	    fi
-	    #Update the BIG file.. mm.. Big Fish :)
-	    mono-xsp-update.conf
-	    #Restart XSP
-	    restart_xsp
-	fi
+   configure)
 
-	if [ -x /usr/share/dotnet/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
-            #Ok, we have the monodoc conf directory?
-	    if [ -d $monodochttp_monoserverconfd ]; then
-		# Ok, we have these files?
-		if [ -f $monodochttp_monoserverconffile ]; then
-		    # Ok, different checksum?
-		    checksum=`md5sum $monodochttp_monoserverconffile | awk '{print $1}'`
-		    if [ $checksum != "b1aad45b5d1ba55edb114d33ccbfb751" ]; then
-			echo "Updating Root Servers..."
-			make_conffile > "$monodochttp_monoserverconffile"		
-		    fi
-		else
-		    echo "Updating Root Servers..."
-		    make_conffile > "$monodochttp_monoserverconffile"		
-		fi
-	    else
-		mkdir -p $monodochttp_monoserverconfd
-		echo "Updating Root Servers..."
-		make_conffile > "$monodochttp_monoserverconffile"		
-	    fi
-	    #Update the BIG File.. 
-	    mono-server-update.conf
-	    #Restart MonoServer
-	    restart_monoserver
-	fi
+   if [ -x "`which mono-xsp-update.conf`" 2>/dev/null -a -d /etc/xsp ]; then
+      restart_xsp
+   fi
+   if [ -x /usr/share/dotnet/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
+      restart_monoserver
+   fi
 
-	;;
-    
-    abort-upgrade|abort-remove|abort-deconfigure)
-        #Do nothing..
-    ;;
+   ;;
 
+   abort-upgrade|abort-remove|abort-deconfigure)
+   #Do nothing..
+   ;;
+
     *)
 	;;
 esac

Deleted: monodoc/trunk/debian/monodoc.desktop
===================================================================
--- monodoc/trunk/debian/monodoc.desktop	2004-04-09 17:09:00 UTC (rev 522)
+++ monodoc/trunk/debian/monodoc.desktop	2004-04-09 19:33:37 UTC (rev 523)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Monodoc
-Comment[de]=Unterlagen Projektor von Mono
-Comment[es]=Documentaicón de Mono
-Comment[fr]=Visionneuse de documentation de mono
-Comment[pt_BR]=Visor da documentação de mono
-Comment[en]=Mono Documentation Library Viewer
-Comment=Mono Documentation Library Viewer
-Exec=monodoc
-Icon=monodoc.png
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Development

Deleted: monodoc/trunk/debian/monodoc.png
===================================================================
(Binary files differ)