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

[Denis Briand]

Author: narcan-guest
Date: 2010-03-30 21:04:05 +0000 (Tue, 30 Mar 2010)
New Revision: 367

Removed:
   trunk/debian/patches/debian/02_use_correct_smb_conf_path.patch
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/debian/08_use_sensible-editor.patch
   trunk/debian/patches/debian/09_uzip_broken_528239.patch
   trunk/debian/patches/series
Log:
-remove patch
-update patches
-bump standards
-update patches series
-update changelog


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-03-30 20:49:00 UTC (rev 366)
+++ trunk/debian/changelog	2010-03-30 21:04:05 UTC (rev 367)
@@ -5,8 +5,10 @@
 
   [Denis Briand]
   * New upstream version.
+  * Remove 02_use_correct_smb_conf_path.patch.
+  * bump standards version to 3.8.4.
 
- -- Yury V. Zaytsev <yury at shurup.com>  Sun, 17 Jan 2010 15:29:41 +0100
+ -- Denis Briand <denis at narcan.fr>  Tue, 30 Mar 2010 22:57:16 +0200
 
 mc (3:4.7.0.1-1) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-03-30 20:49:00 UTC (rev 366)
+++ trunk/debian/control	2010-03-30 21:04:05 UTC (rev 367)
@@ -5,7 +5,7 @@
 Uploaders: Patrick Winnertz <winnie at debian.org>, Denis Briand <denis at narcan.fr>, Yury V. Zaytsev <yury at shurup.com>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), libglib2.0-dev, libgpm-dev |not+linux-gnu, gettext, libslang2-dev, quilt, automake, binutils, cdbs, libtool
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.midnight-commander.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-mc
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mc

Deleted: trunk/debian/patches/debian/02_use_correct_smb_conf_path.patch
===================================================================
--- trunk/debian/patches/debian/02_use_correct_smb_conf_path.patch	2010-03-30 20:49:00 UTC (rev 366)
+++ trunk/debian/patches/debian/02_use_correct_smb_conf_path.patch	2010-03-30 21:04:05 UTC (rev 367)
@@ -1,15 +0,0 @@
-Use correct smb conf path
-==============================================
-Index: mc-4.6.2~git20090522/vfs/smbfs.c
-===================================================================
---- mc-4.6.2~git20090522.orig/vfs/smbfs.c	2009-05-24 10:14:19.000000000 +0200
-+++ mc-4.6.2~git20090522/vfs/smbfs.c	2009-05-24 10:15:52.000000000 +0200
-@@ -306,7 +306,7 @@
- static int
- smbfs_init (struct vfs_class * me)
- {
--    const char *servicesf = CONFIGDIR PATH_SEP_STR "smb.conf";
-+    const char *servicesf = CONFIGDIR PATH_SEP_STR "samba/smb.conf";
- 
-     /*  DEBUGLEVEL = 4; */
- 

Modified: trunk/debian/patches/debian/08_use_sensible-editor.patch
===================================================================
--- trunk/debian/patches/debian/08_use_sensible-editor.patch	2010-03-30 20:49:00 UTC (rev 366)
+++ trunk/debian/patches/debian/08_use_sensible-editor.patch	2010-03-30 21:04:05 UTC (rev 367)
@@ -1,11 +1,12 @@
 Description: Use sensible-editor to edit files
 Bug-Debian: http://bugs.debian.org/549202
 Author: Denis Briand <denis at narcan.fr>
-Index: mc-4.7.0-pre3/src/util.h
-===================================================================
---- mc-4.7.0-pre3.orig/src/util.h	2009-10-02 23:01:32.000000000 +0200
-+++ mc-4.7.0-pre3/src/util.h	2009-10-02 23:01:53.000000000 +0200
-@@ -228,7 +228,7 @@
+Author: Yury V. Zaytsev <yury at shurup.com>
+
+diff -Naur mc-4.7.0.3.orig/lib/util.h mc-4.7.0.3/lib/util.h
+--- mc-4.7.0.3.orig/lib/util.h	2010-02-26 10:31:38.000000000 +0100
++++ mc-4.7.0.3/lib/util.h	2010-03-17 10:38:58.000000000 +0100
+@@ -233,7 +233,7 @@
  #define PATH_ENV_SEP ':'
  #define TMPDIR_DEFAULT "/tmp"
  #define SCRIPT_SUFFIX ""

Modified: trunk/debian/patches/debian/09_uzip_broken_528239.patch
===================================================================
--- trunk/debian/patches/debian/09_uzip_broken_528239.patch	2010-03-30 20:49:00 UTC (rev 366)
+++ trunk/debian/patches/debian/09_uzip_broken_528239.patch	2010-03-30 21:04:05 UTC (rev 367)
@@ -1,10 +1,11 @@
-Fix fails to display zipfile contents after unzip update
-Bug #528239 mc: extfs/uzip broken after update to unzip-6.0
-thanks to Johannes Stezenbach for this patch.
-Index: mc-4.6.2~git20090529/vfs/extfs/uzip.in
-===================================================================
---- mc-4.6.2~git20090529.orig/vfs/extfs/uzip.in	2009-05-30 20:48:26.000000000 +0200
-+++ mc-4.6.2~git20090529/vfs/extfs/uzip.in	2009-05-30 20:49:08.000000000 +0200
+Description: Fix fails to display zip file contents after unzip update
+Bug-Debian: http://bugs.debian.org/528239
+Author: Johannes Stezenbach <js at sig21.net>
+Author: Yury V. Zaytsev <yury at shurup.com>
+
+diff -Naur mc-4.7.0.3.orig/lib/vfs/mc-vfs/extfs/uzip.in mc-4.7.0.3/lib/vfs/mc-vfs/extfs/uzip.in
+--- mc-4.7.0.3.orig/lib/vfs/mc-vfs/extfs/uzip.in	2010-02-25 11:51:39.000000000 +0100
++++ mc-4.7.0.3/lib/vfs/mc-vfs/extfs/uzip.in	2010-03-17 10:43:37.000000000 +0100
 @@ -19,7 +19,7 @@
  # Location of the unzip program
  my $app_unzip = "@UNZIP@";

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2010-03-30 20:49:00 UTC (rev 366)
+++ trunk/debian/patches/series	2010-03-30 21:04:05 UTC (rev 367)
@@ -1,4 +1,3 @@
-debian/02_use_correct_smb_conf_path.patch
 debian/03_use_awk.patch
 debian/04_add_gem_extension.patch
 debian/05_disable_internal_editor.patch