[Pkg-mc-commits] r177 - in trunk/debian: . patches patches/vfs

[winnie at alioth.debian.org]

Author: winnie
Date: 2009-02-02 17:16:47 +0000 (Mon, 02 Feb 2009)
New Revision: 177

Modified:
   trunk/debian/changelog
   trunk/debian/patches/all.series
   trunk/debian/patches/vfs/07_srpm_support.patch
   trunk/debian/rocks
Log:
Some more changes for 4.6.2


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-02-02 16:39:39 UTC (rev 176)
+++ trunk/debian/changelog	2009-02-02 17:16:47 UTC (rev 177)
@@ -18,6 +18,7 @@
     + 04_fix_whitespace_via_fish.patch
   * Took mc-4.6.2-utf8.patch from upstream which is based on the former debian 
     patchset for utf8
+  * Removed autogen.sh run patch as this is not needed anymore
 
  -- Patrick Winnertz <winnie at debian.org>  Mon, 02 Feb 2009 16:50:32 +0100
 

Modified: trunk/debian/patches/all.series
===================================================================
--- trunk/debian/patches/all.series	2009-02-02 16:39:39 UTC (rev 176)
+++ trunk/debian/patches/all.series	2009-02-02 17:16:47 UTC (rev 177)
@@ -30,7 +30,6 @@
 vfs/07_srpm_support.patch
 vfs/08_improved_u7z_support.patch
 vfs/09_choose_correct_urar.patch
+utf8/mc-4.6.2-utf8.patch
 bugs/99_regexp-replace-fixed.patch
 bugs/99b_fix-regex-pattern-lengths.patch
-autgen-run.patch
-utf8/mc-4.6.2-utf8.patch

Modified: trunk/debian/patches/vfs/07_srpm_support.patch
===================================================================
--- trunk/debian/patches/vfs/07_srpm_support.patch	2009-02-02 16:39:39 UTC (rev 176)
+++ trunk/debian/patches/vfs/07_srpm_support.patch	2009-02-02 17:16:47 UTC (rev 177)
@@ -1,5 +1,7 @@
---- b/lib/mc.ext.in	2008-08-09 11:35:24.000000000 +0200
-+++ a/lib/mc.ext.in	2008-08-09 11:35:47.000000000 +0200
+Index: mc-4.6.2/lib/mc.ext.in
+===================================================================
+--- mc-4.6.2.orig/lib/mc.ext.in	2009-02-02 17:41:09.000000000 +0100
++++ mc-4.6.2/lib/mc.ext.in	2009-02-02 17:41:41.000000000 +0100
 @@ -206,7 +206,11 @@
  	View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
  
@@ -13,20 +15,11 @@
  	Open=%cd %p#rpm
  	View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
  
-@@ -493,7 +497,7 @@
- # StarOffice 6 and OpenOffice.org formats
- regex/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
- 	Open=(ooffice %f &)
--	View=%view{ascii} unzip -p %f content.xml | o3totxt
-+	View=%view{ascii} odt2txt
- 
- # AbiWord
- shell/.abw
-diff --git a/vfs/extfs/Makefile.am b/vfs/extfs/Makefile.am
-index e7efbe4..ee12065 100644
---- a/vfs/extfs/Makefile.am
-+++ b/vfs/extfs/Makefile.am
-@@ -4,7 +4,7 @@ extfsdir = $(pkgdatadir)/extfs
+Index: mc-4.6.2/vfs/extfs/Makefile.am
+===================================================================
+--- mc-4.6.2.orig/vfs/extfs/Makefile.am	2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/Makefile.am	2009-02-02 17:41:41.000000000 +0100
+@@ -4,7 +4,7 @@
  EXTFS_MISC  = README extfs.ini sfs.ini
  
  # Scripts hat don't need adaptation to the local system
@@ -35,11 +28,11 @@
  
  # Scripts that need adaptation to the local system - source files
  EXTFS_IN    = 			\
-diff --git a/vfs/extfs/extfs.ini b/vfs/extfs/extfs.ini
-index 4dbdf61..0470656 100644
---- a/vfs/extfs/extfs.ini
-+++ b/vfs/extfs/extfs.ini
-@@ -17,6 +17,7 @@ uar
+Index: mc-4.6.2/vfs/extfs/extfs.ini
+===================================================================
+--- mc-4.6.2.orig/vfs/extfs/extfs.ini	2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/extfs.ini	2009-02-02 17:41:41.000000000 +0100
+@@ -17,6 +17,7 @@
  
  # Packages from popular Linux distributions
  rpm
@@ -47,11 +40,10 @@
  deb
  
  # a: - mtools filesystem
-diff --git a/vfs/extfs/srpm b/vfs/extfs/srpm
-new file mode 100644
-index 0000000..e8affa3
---- /dev/null
-+++ b/vfs/extfs/srpm
+Index: mc-4.6.2/vfs/extfs/srpm
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2/vfs/extfs/srpm	2009-02-02 17:41:41.000000000 +0100
 @@ -0,0 +1,206 @@
 +#! /bin/sh
 +#

Modified: trunk/debian/rocks
===================================================================
--- trunk/debian/rocks	2009-02-02 16:39:39 UTC (rev 176)
+++ trunk/debian/rocks	2009-02-02 17:16:47 UTC (rev 177)
@@ -6,8 +6,8 @@
 	--enable-charset --without-samba --with-screen=slang
 
 deb-extra-clean::
-	rm -f config.sub config.guess
-	rm -f config/config.sub config/config.guess
+	#rm -f config.sub config.guess
+	#rm -f config/config.sub config/config.guess
 	-touch config/missing config/config.status
 	cd po && \
 		rm -f *.gmo