[Pkg-mono-svn-commits] rev 1562 - in mono/branches/1.1/debian: . detector

[Mirco Bauer]

Author: meebey-guest
Date: 2005-04-09 18:11:56 +0000 (Sat, 09 Apr 2005)
New Revision: 1562

Modified:
   mono/branches/1.1/debian/detector/Makefile
   mono/branches/1.1/debian/mono-common.postinst
   mono/branches/1.1/debian/rules
Log:
- ups, transistion will fail when /usr/share/dotnet/mono is just a symlink.



Modified: mono/branches/1.1/debian/detector/Makefile
===================================================================
--- mono/branches/1.1/debian/detector/Makefile	2005-04-09 16:44:49 UTC (rev 1561)
+++ mono/branches/1.1/debian/detector/Makefile	2005-04-09 18:11:56 UTC (rev 1562)
@@ -4,3 +4,4 @@
 
 clean:
 	rm binfmt-detector-cli
+	rm debian/ -rf

Modified: mono/branches/1.1/debian/mono-common.postinst
===================================================================
--- mono/branches/1.1/debian/mono-common.postinst	2005-04-09 16:44:49 UTC (rev 1561)
+++ mono/branches/1.1/debian/mono-common.postinst	2005-04-09 18:11:56 UTC (rev 1562)
@@ -4,8 +4,9 @@
   /usr/sbin/update-binfmts --import cli &> /dev/null
 fi
 
-if [ configure = "$1" ] && [ -d /usr/share/dotnet/mono/ ]; then
-  if [ -s /usr/lib/mono ]; then
+if [ configure = "$1" ] && [ -d /usr/share/dotnet/mono/ ] && ! [ -L /usr/share/dotnet/mono ]; then
+  if [ -L /usr/lib/mono ]; then
+    # it's a symlink
     rm /usr/lib/mono
   fi
   if ! ( mkdir -p /usr/lib/mono && cp -af /usr/share/dotnet/mono/. /usr/lib/mono/ ); then
@@ -19,6 +20,7 @@
 fi
 
 if [ configure = "$1" ] && ! [ -L /usr/share/dotnet/mono ]; then
+  # it's not a symlink
   mkdir -p /usr/share/dotnet
   ln -s ../../lib/mono /usr/share/dotnet/mono
 fi

Modified: mono/branches/1.1/debian/rules
===================================================================
--- mono/branches/1.1/debian/rules	2005-04-09 16:44:49 UTC (rev 1561)
+++ mono/branches/1.1/debian/rules	2005-04-09 18:11:56 UTC (rev 1562)
@@ -41,6 +41,8 @@
 	dh_testroot
 	rm -f build-stamp
 	-$(MAKE) distclean
+	# mono's distclean is not perfect
+	#-find -name "*.mdb" -or -name "*.resources" | xargs rm -f
 	-cd debian/detector && $(MAKE) clean
 	rm -f cli-wrapper
 	rm -rf $(CURDIR)/.wapi