[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.7-5-43-g97c07fa

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 97c07fabe08a88ec07e5452ea95bf571cfc18c32
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jan 29 17:40:37 2011 +0100

    Removed obsolete doc dir symlinking removal code for Ubuntu

diff --git a/debian/preinst.ubuntu b/debian/preinst.ubuntu
deleted file mode 100644
index fff66db..0000000
--- a/debian/preinst.ubuntu
+++ /dev/null
@@ -1,6 +0,0 @@
-# revert Ubuntu doc dir symlinking to Debian style
-if [ "$1" = "upgrade" ]
-    then if dpkg --compare-versions $2 lt 2.4 && [ -L /usr/share/doc/#PACKAGENAME# ]
-        then rm -fr /usr/share/doc/#PACKAGENAME#
-    fi
-fi
diff --git a/debian/rules b/debian/rules
index 87763a4..e374355 100755
--- a/debian/rules
+++ b/debian/rules
@@ -277,13 +277,6 @@ binary-indep: build-stamp install-arch install-indep
 	debian/dh_clistrip -i --dbg-package=mono-dbg
 	dh_compress -i
 	
-	# Hack workaround to allow Ubuntu to run its own preinst (e.g. to kill symlinked docdirs)
-	if [ "$(DISTRO)" = "Ubuntu" ]; then \
-	  for p in $$(dh_listpackages -i); do \
-	    sed "s/#PACKAGENAME#/$$p/g" $(CURDIR)/debian/preinst.ubuntu >> debian/$$p.preinst.debhelper; \
-	  done; \
-	fi
-
 	dh_fixperms -i
 	debian/dh_clifixperms -i
 	dh_installdeb -i
@@ -364,13 +357,6 @@ binary-arch: build-stamp install-arch test-stamp
 	dh_strip -s -Xbin/mono-sgen
 	dh_compress -s -Xskeleton.cs
 
-	# Hack workaround to allow Ubuntu to run its own preinst (e.g. to kill symlinked docdirs)
-	if [ "$(DISTRO)" = "Ubuntu" ]; then \
-	  for p in $$(dh_listpackages -a); do \
-	    sed "s/#PACKAGENAME#/$$p/g" $(CURDIR)/debian/preinst.ubuntu >> debian/$$p.preinst.debhelper; \
-	  done; \
-	fi
-
 	dh_fixperms -s
 	dpkg-gensymbols -plibmono-2.0-1 -edebian/tmp/usr/lib/libmono-2.0.so.1 -c4
 	dh_makeshlibs -s -V

-- 
mono