[Pkg-mc-commits] r196 - in branch/cdbs/debian: . patches patches/bugs

[Denis Briand]

Author: narcan-guest
Date: 2009-05-29 20:50:05 +0000 (Fri, 29 May 2009)
New Revision: 196

Added:
   branch/cdbs/debian/patches/bugs/
   branch/cdbs/debian/patches/bugs/01_bashism.patch
Modified:
   branch/cdbs/debian/changelog
   branch/cdbs/debian/mc.install
   branch/cdbs/debian/patches/series
   branch/cdbs/debian/rules
Log:
-add patch and fix bashism #530137.
-new upstream git snapshot 20090529
-fix a mistake in debian/rules


Modified: branch/cdbs/debian/changelog
===================================================================
--- branch/cdbs/debian/changelog	2009-05-29 16:57:25 UTC (rev 195)
+++ branch/cdbs/debian/changelog	2009-05-29 20:50:05 UTC (rev 196)
@@ -1,4 +1,4 @@
-mc (3:4.6.2~git20090526-1) unstable; urgency=low
+mc (3:4.6.2~git20090529-1) unstable; urgency=low
 
   [ Patrick Winnertz ]
   * Change Section for -dbg package to debug 
@@ -19,6 +19,7 @@
   * Add ${misc:Depends} in debian/control
   * Change deprecated dh_clean -k into dh_prep in debian/rules
   * Fix FTBFS issue: unrepresentable changes to source (Closes: #528983)
+  * Fix bashism in vfs/extfs/u7z script (Closes: #530137)
 
  -- Denis Briand <denis at narcan.fr>  Fri, 22 May 2009 18:29:00 +0200
 

Modified: branch/cdbs/debian/mc.install
===================================================================
--- branch/cdbs/debian/mc.install	2009-05-29 16:57:25 UTC (rev 195)
+++ branch/cdbs/debian/mc.install	2009-05-29 20:50:05 UTC (rev 196)
@@ -2,6 +2,10 @@
 usr/lib/mc/mc/cons.saver
 usr/lib/mc/mc/mc* usr/share/mc/bin
 etc/mc/mc.* etc/mc	
+etc/mc/edit.indent.rc usr/share/mc
+etc/mc/extfs
+etc/mc/edit.spell.rc usr/share/mc
+etc/mc/cedit.menu usr/share/mc
 usr/share/mc/mc.h*
 usr/share/mc/extfs/*
 usr/share/mc/syntax/*
@@ -14,9 +18,6 @@
 usr/share/man/hu/*
 usr/share/man/man1/*
 usr/share/locale/*
-etc/mc/edit.indent.rc usr/share/mc
-etc/mc/extfs
-etc/mc/edit.spell.rc usr/share/mc
 usr/share/mc/mc.menu.sr
 ./debian/extra/mcedit-debian usr/bin
 ./debian/extra/mcview-debian usr/bin

Added: branch/cdbs/debian/patches/bugs/01_bashism.patch
===================================================================
--- branch/cdbs/debian/patches/bugs/01_bashism.patch	                        (rev 0)
+++ branch/cdbs/debian/patches/bugs/01_bashism.patch	2009-05-29 20:50:05 UTC (rev 196)
@@ -0,0 +1,26 @@
+Index: mc-4.6.2~git20090529/vfs/extfs/u7z
+===================================================================
+--- mc-4.6.2~git20090529.orig/vfs/extfs/u7z	2009-05-29 21:32:48.000000000 +0200
++++ mc-4.6.2~git20090529/vfs/extfs/u7z	2009-05-29 22:20:23.000000000 +0200
+@@ -45,8 +45,8 @@
+ 	#first we check if we have old p7zip archive with prefix ./ in filename
+ 	$P7ZIP l "$1" "$2" | grep -q "0 files" && \
+ 	EXFNAME=*./"$2" || EXFNAME="$2"
+-	$P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL &> /dev/null && \
+-	{ echo -e "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
++	$P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
++	{ printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
+ }
+ 
+ mcu7zip_rmdir ()
+@@ -54,8 +54,8 @@
+ 	#first we check if we have old p7zip archive with prefix ./ in filename
+ 	$P7ZIP l "$1" "$2" | grep -q "0 files" && \
+ 	EXFNAME=*./"$2" || EXFNAME="$2"
+-	$P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL &> /dev/null && \
+-	{ echo -e "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
++	$P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
++	{ printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
+ }
+ 
+ # override any locale for dates

Modified: branch/cdbs/debian/patches/series
===================================================================
--- branch/cdbs/debian/patches/series	2009-05-29 16:57:25 UTC (rev 195)
+++ branch/cdbs/debian/patches/series	2009-05-29 20:50:05 UTC (rev 196)
@@ -7,3 +7,4 @@
 vfs/01_ftpfs_symlink.patch
 vfs/02_ignore_ftp_chmod_error.patch
 vfs/09_choose_correct_urar.patch
+bugs/01_bashism.patch

Modified: branch/cdbs/debian/rules
===================================================================
--- branch/cdbs/debian/rules	2009-05-29 16:57:25 UTC (rev 195)
+++ branch/cdbs/debian/rules	2009-05-29 20:50:05 UTC (rev 196)
@@ -9,13 +9,13 @@
 cleanbuilddir/mc::
 	rm -f po/*.gmo
 	rm -f po/stamp-po
-	rm -f FAQ TODO HACKING
+#	rm -f FAQ TODO HACKING
 
 makebuilddir/mc::
 	if [ ! -f configure ]; then sh autogen.sh; fi
-	if [ ! -f FAQ ]; then cp doc/FAQ FAQ; fi
-	if [ ! -f TODO ]; then cp doc/TODO TODO; fi
-	if [ ! -f HACKING ]; then cp doc/HACKING HACKING; fi
+#	if [ ! -f FAQ ]; then cp doc/FAQ FAQ; fi
+#	if [ ! -f TODO ]; then cp doc/TODO TODO; fi
+#	if [ ! -f HACKING ]; then cp doc/HACKING HACKING; fi
 
 install/mc::
 	cp ./debian/extra/icon.xpm ./debian/mc/usr/share/pixmaps/mc.xpm