[Pkg-mc-commits] r409 - trunk/debian

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2010-05-20 09:21:54 +0000 (Thu, 20 May 2010)
New Revision: 409

Modified:
   trunk/debian/changelog
   trunk/debian/mc.postinst
   trunk/debian/rules
Log:
Implemented the cons.saver solution by Sven Joachim (thanks!).



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-05-18 08:52:59 UTC (rev 408)
+++ trunk/debian/changelog	2010-05-20 09:21:54 UTC (rev 409)
@@ -1,3 +1,10 @@
+mc (3:4.7.0.5-2) UNRELEASED; urgency=low
+
+  [Yury V. Zaytsev]
+  * 
+
+ -- Yury V. Zaytsev <yury at shurup.com>  Thu, 20 May 2010 11:18:21 +0200
+
 mc (3:4.7.0.5-1) unstable; urgency=low
 
   [Yury V. Zaytsev]

Modified: trunk/debian/mc.postinst
===================================================================
--- trunk/debian/mc.postinst	2010-05-18 08:52:59 UTC (rev 408)
+++ trunk/debian/mc.postinst	2010-05-20 09:21:54 UTC (rev 409)
@@ -1,15 +1,6 @@
 #!/bin/sh
 set -e
 
-export DEB_HOST_GNU_SYSTEM=$(dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-
-if [ x"$DEB_HOST_GNU_SYSTEM" = "xlinux-gnu" ]; then
-	if ! dpkg-statoverride --list /usr/lib/mc/cons.saver >/dev/null 2>&1; then
-		chgrp tty /usr/lib/mc/cons.saver
-		chmod g+s /usr/lib/mc/cons.saver
-	fi
-fi
-
 case "$1" in
 	configure|abort-upgrade)
 		update-alternatives --install /usr/bin/view view /usr/bin/mcview-debian 25 \

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-05-18 08:52:59 UTC (rev 408)
+++ trunk/debian/rules	2010-05-20 09:21:54 UTC (rev 409)
@@ -13,6 +13,8 @@
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+DEB_FIXPERMS_EXCLUDE := /usr/lib/mc/cons.saver
+
 install/mc::
 	cp ./debian/extra/icon.xpm ./debian/mc/usr/share/pixmaps/mc.xpm
 
@@ -21,4 +23,7 @@
 	chmod 755 ./debian/mc/etc/mc/edit.spell.rc
 	chmod 755 ./debian/mc/etc/mc/edit.indent.rc
 
+	chgrp tty ./debian/usr/lib/mc/cons.saver
+	chmod g+s ./debian/usr/lib/mc/cons.saver
+
 	rmdir ./debian/mc/usr/share/man/sr/man8