[Pkg-mono-svn-commits] rev 2045 - mono/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2005-09-27 11:01:42 +0000 (Tue, 27 Sep 2005)
New Revision: 2045

Modified:
   mono/trunk/debian/control
   mono/trunk/debian/mono-common.postinst
   mono/trunk/debian/mono-common.prerm
   mono/trunk/debian/mono-jit.postinst
   mono/trunk/debian/mono.postinst
   mono/trunk/debian/rules
Log:
Lintian cleanups: bashisms, deleting rpath with chrpath


Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2005-09-27 09:59:14 UTC (rev 2044)
+++ mono/trunk/debian/control	2005-09-27 11:01:42 UTC (rev 2045)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Eduard Bloch <blade at debian.org>, Mirco Bauer <meebey at meebey.net>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev, dc
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.4), bison, libtool, dpatch, libxslt1-dev, dc, chrpath
 Build-Conflicts: pnet-compiler
 Standards-Version: 3.6.2.1
 

Modified: mono/trunk/debian/mono-common.postinst
===================================================================
--- mono/trunk/debian/mono-common.postinst	2005-09-27 09:59:14 UTC (rev 2044)
+++ mono/trunk/debian/mono-common.postinst	2005-09-27 11:01:42 UTC (rev 2045)
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 if [ configure = "$1" ] && [ -x /usr/sbin/update-binfmts ]; then
-  /usr/sbin/update-binfmts --import cli &> /dev/null
+  /usr/sbin/update-binfmts --import cli >/dev/null 2>&1
 fi
 
 if [ configure = "$1" ] && [ -d /usr/share/dotnet/mono/ ] && ! [ -L /usr/share/dotnet/mono ]; then

Modified: mono/trunk/debian/mono-common.prerm
===================================================================
--- mono/trunk/debian/mono-common.prerm	2005-09-27 09:59:14 UTC (rev 2044)
+++ mono/trunk/debian/mono-common.prerm	2005-09-27 11:01:42 UTC (rev 2045)
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-if [ remove = "$1" -a -x /usr/sbin/update-binfmts ]; then
-  /usr/sbin/update-binfmts --package mono-common --remove cli /usr/bin/cli &> /dev/null
+if test remove = "$1" && test -x /usr/sbin/update-binfmts ; then
+  /usr/sbin/update-binfmts --package mono-common --remove cli /usr/bin/cli >/dev/null 2>&1
 fi
 
 #DEBHELPER#

Modified: mono/trunk/debian/mono-jit.postinst
===================================================================
--- mono/trunk/debian/mono-jit.postinst	2005-09-27 09:59:14 UTC (rev 2044)
+++ mono/trunk/debian/mono-jit.postinst	2005-09-27 11:01:42 UTC (rev 2045)
@@ -2,7 +2,7 @@
 
 # if we're configuring, /usr/share/doc/mono-jit is a directory,
 # and isn't a symlink, replace it with a symlink to mono-common
-if [ "$1" = "configure" -a -d /usr/share/doc/mono-jit -a ! -h /usr/share/doc/mono-jit ]; then
+if test "$1" = "configure" && test -d /usr/share/doc/mono-jit && ! test -h /usr/share/doc/mono-jit ; then
         rmdir /usr/share/doc/mono-jit
         ln -s mono-common /usr/share/doc/mono-jit
 fi

Modified: mono/trunk/debian/mono.postinst
===================================================================
--- mono/trunk/debian/mono.postinst	2005-09-27 09:59:14 UTC (rev 2044)
+++ mono/trunk/debian/mono.postinst	2005-09-27 11:01:42 UTC (rev 2045)
@@ -2,7 +2,7 @@
 
 # if we're configuring, /usr/share/doc/mono is a directory,
 # and isn't a symlink, replace it with a symlink to mono-common
-if [ "$1" = "configure" -a -d /usr/share/doc/mono -a ! -h /usr/share/doc/mono ]; then
+if test "$1" = "configure" && test -d /usr/share/doc/mono && ! test -h /usr/share/doc/mono ; then
 	rmdir /usr/share/doc/mono
 	ln -s mono-common /usr/share/doc/mono
 fi

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2005-09-27 09:59:14 UTC (rev 2044)
+++ mono/trunk/debian/rules	2005-09-27 11:01:42 UTC (rev 2045)
@@ -65,6 +65,7 @@
 	# hack, the buildsystem of mono installs sometimes libtool wrapper
 	cp mono/dis/.libs/monodis debian/tmp/usr/bin/
 	cp mono/monograph/.libs/monograph debian/tmp/usr/bin/
+	chrpath -d $(CURDIR)/debian/tmp/usr/bin/monodis $(CURDIR)/debian/tmp/usr/bin/monograph
 	# we do not want nunit, it's a forked version
 	rm -f debian/tmp/usr/lib/pkgconfig/mono-nunit.pc
 	rm -f debian/tmp/usr/lib/mono/1.0/nunit*