[Pkg-mc-devel] Reorganisation of MC packaging team

Stefano Rivera stefanor at ubuntu.com
Mon Feb 20 19:56:44 UTC 2012 

Hi Yury (2012.02.20_21:46:16_+0200)
> I'd rather have "not at all".
> 
> Ubuntu has been carrying broken mc for 2 consecutive versions if the
> memory isn't cheating on me, and it took me quite some effort to get it
> to the point where it was at least usable.

This is unfortunately not uncommon. Which is why we love it when
packages are in sync with Debian, where there are maintainers who care
about their packages.

> The upcoming release is going to be LTS in as far as I understand and if
> there is no 99% certainty that the update will be flawless I wouldn't
> rush into pushing it out.

If you'd consider sponsoring (or approving the sponsoring of, as I'm
happy to sponsor it) the currently proposed upload in Ubuntu that
launched this discussion, I'd be over the moon :)
If that could happen within a few days, it'd avoid going out of sync in
Ubuntu.

The current debdiff (excluding upstream changes) is attached.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  H: +27 21 465 6908 C: +27 72 419 8559
-------------- next part --------------
--- mc-4.7.0.9/contrib/dist/debian/Makefile.in	2010-09-07 06:53:37.000000000 +0000
+++ mc-4.8.1/contrib/dist/debian/Makefile.in	2011-12-13 10:10:52.000000000 +0000
@@ -59,13 +59,16 @@
 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
 	$(top_srcdir)/m4.include/mc-cflags.m4 \
 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
-	$(top_srcdir)/m4.include/mc-mcserver.m4 \
-	$(top_srcdir)/m4.include/ac-get-fs-info.m4 \
+	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+	$(top_srcdir)/m4.include/fstypename.m4 \
+	$(top_srcdir)/m4.include/fsusage.m4 \
+	$(top_srcdir)/m4.include/mountlist.m4 \
+	$(top_srcdir)/m4.include/mc-get-fs-info.m4 \
 	$(top_srcdir)/m4.include/mc-use-termcap.m4 \
 	$(top_srcdir)/m4.include/mc-with-screen.m4 \
 	$(top_srcdir)/m4.include/mc-with-screen-ncurses.m4 \
 	$(top_srcdir)/m4.include/mc-with-screen-slang.m4 \
-	$(top_srcdir)/m4.include/ac-g-module-supported.m4 \
+	$(top_srcdir)/m4.include/ac-glib.m4 \
 	$(top_srcdir)/m4.include/mc-vfs.m4 \
 	$(top_srcdir)/m4.include/vfs/rpc.m4 \
 	$(top_srcdir)/m4.include/vfs/socket.m4 \
@@ -76,10 +79,9 @@
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-mcfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-samba.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-mvfs.m4 \
 	$(top_srcdir)/m4.include/mc-version.m4 \
+	$(top_srcdir)/m4.include/mc-tests.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -87,12 +89,19 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -103,6 +112,8 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHECK_CFLAGS = @CHECK_CFLAGS@
+CHECK_LIBS = @CHECK_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -111,6 +122,7 @@
 DEPDIR = @DEPDIR@
 DISTR_RELEASE = @DISTR_RELEASE@
 DISTR_VERSION = @DISTR_VERSION@
+DLLTOOL = @DLLTOOL@
 DOC_LINGUAS = @DOC_LINGUAS@
 DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 DSYMUTIL = @DSYMUTIL@
@@ -175,6 +187,8 @@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMC_RELEASE = @LIBMC_RELEASE@
+LIBMC_VERSION = @LIBMC_VERSION@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -186,9 +200,10 @@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANDOC = @MANDOC@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MAN_DATE = @MAN_DATE@
 MAN_FLAGS = @MAN_FLAGS@
 MCLIBS = @MCLIBS@
-MCSERVLIBS = @MCSERVLIBS@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -211,6 +226,8 @@
 PCRE_LIBS = @PCRE_LIBS@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -235,6 +252,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -249,7 +267,6 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
-configdir = @configdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -268,7 +285,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -278,6 +294,7 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+smbconfigdir = @smbconfigdir@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
--- mc-4.7.0.9/debian/changelog	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/changelog	2012-02-20 19:52:30.000000000 +0000
@@ -1,3 +1,20 @@
+mc (3:4.8.1-0ubuntu1) precise; urgency=low
+
+  * debian/watch: Updated to find newer versions
+  * New upstream release (LP: #905610, LP: #314614, LP: #410031, 
+    LP: #562361, LP: #632816, LP: #713630, LP: #770673, LP: #837163)
+    + Removed 99_enable_reading_debs.patch: got applied upstream
+    + Refreshed all other patches
+    + Updated debian/mc.install(.linux) and debian/mc.postrm
+    + Updated debian/rules: man8 is not available anymore
+  * Changed/Added debian/mc.{preinst,postinst,postrm} to fix files in /etc/mc/:
+    + remove obsolete Syntax, mc.charsets and mc.lib files, the default
+      config files are moved to /usr/share/mc, /etc/mc can be used to override the
+      default settings now.
+    + rename cedit.menu to mcedit.menu
+
+ -- Maarten Bezemer <maarten.bezemer at gmail.com>  Sun, 19 Feb 2012 17:49:58 +0100
+
 mc (3:4.7.0.9-2) unstable; urgency=low
 
   * debian/desktopfiles: Added desktop file and icon from
--- mc-4.7.0.9/debian/control	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/control	2012-02-20 19:52:30.000000000 +0000
@@ -13,6 +13,7 @@
 
 Package: mc
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: mime-support
 Suggests: perl, zip, unzip, bzip2, links | w3m | lynx, arj, file, xpdf-reader | pdf-viewer, dbview, odt2txt, gv, catdvi, djvulibre-bin, imagemagick, python, python-boto, python-tz
--- mc-4.7.0.9/debian/mc.install	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/mc.install	2012-02-20 19:52:30.000000000 +0000
@@ -1,8 +1,7 @@
-etc/mc/cedit.menu
+etc/mc/mcedit.menu
 etc/mc/*.ini
 etc/mc/*.rc
 etc/mc/mc.*
-etc/mc/Syntax
 usr/bin/mc*
 usr/lib/mc/extfs.d/*
 usr/lib/mc/mc*sh usr/share/mc/bin
@@ -14,9 +13,11 @@
 usr/share/man/pl/*
 usr/share/man/ru/*
 usr/share/man/sr/*
+usr/share/mc/help/*
 usr/share/mc/mc.*
 usr/share/mc/skins/*.ini
 usr/share/mc/syntax/*.syntax
+usr/share/mc/syntax/Syntax
 debian/extra/icon/mc.xpm usr/share/pixmaps
 debian/lintian/mc usr/share/lintian/overrides
 debian/desktopfiles/mc.desktop            usr/share/applications
--- mc-4.7.0.9/debian/mc.install.linux	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/mc.install.linux	2012-02-20 19:52:30.000000000 +0000
@@ -1,8 +1,7 @@
-etc/mc/cedit.menu
+etc/mc/mcedit.menu
 etc/mc/*.ini
 etc/mc/*.rc
 etc/mc/mc.*
-etc/mc/Syntax
 usr/bin/mc*
 usr/lib/mc/cons.saver
 usr/lib/mc/extfs.d/*
@@ -15,9 +14,11 @@
 usr/share/man/pl/*
 usr/share/man/ru/*
 usr/share/man/sr/*
+usr/share/mc/help/*
 usr/share/mc/mc.*
 usr/share/mc/skins/*.ini
 usr/share/mc/syntax/*.syntax
+usr/share/mc/syntax/Syntax
 debian/extra/icon/mc.xpm usr/share/pixmaps
 debian/lintian/mc usr/share/lintian/overrides
 debian/desktopfiles/mc.desktop            usr/share/applications
--- mc-4.7.0.9/debian/mc.postinst	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/mc.postinst	2012-02-20 19:52:30.000000000 +0000
@@ -1,6 +1,12 @@
 #!/bin/sh
 set -e
 
+# Location of default Syntax file is changed since 4.7.5-pre1
+dpkg-maintscript-helper rm_conffile /etc/mc/Syntax 3:4.7.4 -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/mc/mc.charsets 3:4.7.4 -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/mc/mc.lib 3:4.7.4 -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/mc/cedit.menu /etc/mc/mcedit.menu 3:4.7.4 -- "$@"
+
 case "$1" in
 	configure|abort-upgrade)
 		update-alternatives --install /usr/bin/view view /usr/bin/mcview 25 \
--- mc-4.7.0.9/debian/mc.postrm	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/mc.postrm	2012-02-20 19:52:30.000000000 +0000
@@ -1,15 +1,20 @@
 #!/bin/sh
 set -e
 
+# Location of default Syntax file is changed since 4.7.5-pre1
+dpkg-maintscript-helper rm_conffile /etc/mc/Syntax 3:4.7.4 -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/mc/mc.charsets 3:4.7.4 -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/mc/mc.lib 3:4.7.4 -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/mc/cedit.menu /etc/mc/mcedit.menu 3:4.7.4 -- "$@"
+
 case "$1" in
 	purge)
 
 		rm -f \
-			/etc/mc/cedit.menu \
+			/etc/mc/mcedit.menu \
 			/etc/mc/*.ini \
 			/etc/mc/mc.* \
 			/etc/mc/*.rc \
-			/etc/mc/Syntax
 
 		rmdir /etc/mc 2>/dev/null || true
 
--- mc-4.7.0.9/debian/mc.preinst	1970-01-01 00:00:00.000000000 +0000
+++ mc-4.8.1/debian/mc.preinst	2012-02-20 19:52:30.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Location of default Syntax file is changed since 4.7.5-pre1
+dpkg-maintscript-helper rm_conffile /etc/mc/Syntax 3:4.7.4 -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/mc/mc.charsets 3:4.7.4 -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/mc/mc.lib 3:4.7.4 -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/mc/cedit.menu /etc/mc/mcedit.menu 3:4.7.4 -- "$@"
+
+#DEBHELPER#
+
+exit 0
--- mc-4.7.0.9/debian/patches/debian/03_use_awk.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/03_use_awk.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,9 +2,11 @@
 Bug-Debian: http://bugs.debian.org/499723
 Author: Patrick Winnertz <winnie at debian.org>
 
---- a/configure	2009-08-04 20:22:13.000000000 +0200
-+++ b/configure	2009-08-04 20:22:29.000000000 +0200
-@@ -2544,7 +2544,7 @@
+Index: mc/configure
+===================================================================
+--- mc.orig/configure	2012-02-18 23:02:06.983615853 +0100
++++ mc/configure	2012-02-18 23:02:09.827615934 +0100
+@@ -3167,7 +3167,7 @@
    */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
  esac
  
--- mc-4.7.0.9/debian/patches/debian/04_add_gem_extension.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/04_add_gem_extension.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,14 +2,16 @@
 Bug-Debian: http://bugs.debian.org/541673
 Author: Patrick Winnertz <winnie at debian.org>
 
---- a/misc/mc.ext.in
-+++ b/misc/mc.ext.in
-@@ -107,7 +107,7 @@
+Index: mc/misc/mc.ext.in
+===================================================================
+--- mc.orig/misc/mc.ext.in	2012-02-18 23:02:06.947615852 +0100
++++ mc/misc/mc.ext.in	2012-02-18 23:02:27.019616420 +0100
+@@ -113,7 +113,7 @@
  ### Archives ###
  
  # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk
 -regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk$
 +regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk|\.gem$
- 	Open=%cd %p#utar
+ 	Open=%cd %p/utar://
  	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
  
--- mc-4.7.0.9/debian/patches/debian/05_disable_internal_editor.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/05_disable_internal_editor.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,14 +2,16 @@
 Bug-Debian: http://bugs.debian.org/413258
 Author: Patrick Winnertz <winnie at debian.org>
 
---- mc-4.6.2~git20090522.orig/src/cmd.c	2009-05-22 17:22:37.000000000 +0200
-+++ mc-4.6.2~git20090522/src/cmd.c	2009-05-24 10:19:36.000000000 +0200
-@@ -84,7 +84,7 @@
- int output_starts_shell = 0;
- 
+Index: mc/src/main.c
+===================================================================
+--- mc.orig/src/main.c	2012-02-18 23:02:06.887615850 +0100
++++ mc/src/main.c	2012-02-18 23:02:30.051616505 +0100
+@@ -94,7 +94,7 @@
+ /* If true use the internal viewer */
+ int use_internal_view = 1;
  /* If set, use the builtin editor */
 -int use_internal_edit = 1;
 +int use_internal_edit = 0;
  
- /* Automatically fills name with current selected item name on mkdir */
- int auto_fill_mkdir_name = 1;
+ char *mc_run_param0 = NULL;
+ char *mc_run_param1 = NULL;
--- mc-4.7.0.9/debian/patches/debian/06_use_default_pdf_viewer.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/06_use_default_pdf_viewer.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,9 +2,11 @@
 Bug-Debian: http://bugs.debian.org/544054
 Author: Andreas Tille <tillea at rki.de>
 
---- mc-4.7.0-pre1.orig/misc/mc.ext.in	2009-08-28 17:29:19.000000000 +0200
-+++ mc-4.7.0-pre1/misc/mc.ext.in	2009-08-28 17:30:06.000000000 +0200
-@@ -468,7 +468,7 @@
+Index: mc/misc/mc.ext.in
+===================================================================
+--- mc.orig/misc/mc.ext.in	2012-02-18 23:02:27.019616420 +0100
++++ mc/misc/mc.ext.in	2012-02-18 23:02:31.139616537 +0100
+@@ -499,7 +499,7 @@
  
  # PDF
  type/^PDF
--- mc-4.7.0.9/debian/patches/debian/08_use_sensible-editor.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/08_use_sensible-editor.patch	2012-02-20 19:52:30.000000000 +0000
@@ -3,14 +3,16 @@
 Author: Denis Briand <denis at narcan.fr>
 Author: Yury V. Zaytsev <yury at shurup.com>
 
---- 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 @@
+Index: mc/lib/global.h
+===================================================================
+--- mc.orig/lib/global.h	2012-02-18 23:02:06.759615846 +0100
++++ mc/lib/global.h	2012-02-18 23:02:32.151616565 +0100
+@@ -126,7 +126,7 @@
  #define PATH_ENV_SEP ':'
  #define TMPDIR_DEFAULT "/tmp"
  #define SCRIPT_SUFFIX ""
 -#define get_default_editor() "vi"
 +#define get_default_editor() "sensible-editor"
  #define OS_SORT_CASE_SENSITIVE_DEFAULT 1
- #define STRCOMP strcmp
- #define STRNCOMP strncmp
+ #define UTF8_CHAR_LEN 6
+ 
--- mc-4.7.0.9/debian/patches/debian/09_uzip_broken_528239.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/09_uzip_broken_528239.patch	2012-02-20 19:52:30.000000000 +0000
@@ -3,8 +3,10 @@
 Author: Johannes Stezenbach <js at sig21.net>
 Author: Yury V. Zaytsev <yury at shurup.com>
 
---- 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
+Index: mc/src/vfs/extfs/helpers/uzip.in
+===================================================================
+--- mc.orig/src/vfs/extfs/helpers/uzip.in	2012-02-18 23:02:06.727615845 +0100
++++ mc/src/vfs/extfs/helpers/uzip.in	2012-02-18 23:02:33.211616596 +0100
 @@ -19,7 +19,7 @@
  # Location of the unzip program
  my $app_unzip = "@UNZIP@";
--- mc-4.7.0.9/debian/patches/debian/10_use_default_images_viewer.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/10_use_default_images_viewer.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,9 +2,11 @@
 Bug-Debian: http://bugs.debian.org/544058
 Author: Andreas Tille <tillea at rki.de>
 
---- mc-4.7.0-pre4.orig/misc/mc.ext.in	2009-12-17 19:51:51.000000000 +0100
-+++ mc-4.7.0-pre4/misc/mc.ext.in	2009-12-17 19:53:00.000000000 +0100
-@@ -387,7 +387,7 @@
+Index: mc/misc/mc.ext.in
+===================================================================
+--- mc.orig/misc/mc.ext.in	2012-02-18 23:02:31.139616537 +0100
++++ mc/misc/mc.ext.in	2012-02-18 23:02:34.147616622 +0100
+@@ -403,7 +403,7 @@
  	Include=image
  
  include/image
--- mc-4.7.0.9/debian/patches/debian/20_wrong_path_to_wrappers.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/20_wrong_path_to_wrappers.patch	2012-02-20 19:52:30.000000000 +0000
@@ -3,14 +3,17 @@
 Author: Denis Briand <denis at narcan.fr>
 Author: Jindřich Makovička <makovick at gmail.com>
 
---- mc-4.7.0-pre1.orig/contrib/mc.csh.in	2009-08-07 13:18:42.000000000 +0200
-+++ mc-4.7.0-pre1/contrib/mc.csh.in	2009-08-07 13:19:20.000000000 +0200
+Index: mc/contrib/mc.csh.in
+===================================================================
+--- mc.orig/contrib/mc.csh.in	2012-02-18 23:02:06.627615843 +0100
++++ mc/contrib/mc.csh.in	2012-02-18 23:02:35.127616650 +0100
 @@ -1 +1 @@
 -alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
 +alias mc 'source /usr/share/mc/bin/mc-wrapper.csh'
-
---- mc-4.7.0-pre1.orig/contrib/mc.sh.in	2009-08-07 13:19:37.000000000 +0200
-+++ mc-4.7.0-pre1/contrib/mc.sh.in	2009-08-07 13:20:07.000000000 +0200
+Index: mc/contrib/mc.sh.in
+===================================================================
+--- mc.orig/contrib/mc.sh.in	2012-02-18 23:02:06.619615842 +0100
++++ mc/contrib/mc.sh.in	2012-02-18 23:02:35.127616650 +0100
 @@ -1,3 +1,3 @@
  # Don't define aliases in plain Bourne shell
  [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
--- mc-4.7.0.9/debian/patches/debian/84_use_dvicat_instead_of_dvi2tty.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/84_use_dvicat_instead_of_dvi2tty.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,9 +2,11 @@
 Bug-Debian: http://bugs.debian.org/543202
 Author: Denis Briand <denis at narcan.fr>
 
---- mc-4.7.0-pre2~git20090919.orig/misc/mc.ext.in	2009-09-21 21:44:49.000000000 +0200
-+++ mc-4.7.0-pre2~git20090919/misc/mc.ext.in	2009-09-21 21:47:02.000000000 +0200
-@@ -527,8 +527,8 @@
+Index: mc/misc/mc.ext.in
+===================================================================
+--- mc.orig/misc/mc.ext.in	2012-02-18 23:02:34.147616622 +0100
++++ mc/misc/mc.ext.in	2012-02-18 23:02:36.075616676 +0100
+@@ -555,8 +555,8 @@
  
  # DVI
  regex/\.([dD][vV][iI])$
--- mc-4.7.0.9/debian/patches/debian/99_detect_alt_editor.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/debian/99_detect_alt_editor.patch	2012-02-20 19:52:30.000000000 +0000
@@ -2,14 +2,16 @@
 Bug-Debian: http://bugs.debian.org/592208
 Author: Yury V. Zaytsev <yury at shurup.com>
 
---- a/src/main.c
-+++ b/src/main.c
-@@ -2018,7 +2018,7 @@ mc_main__setup_by_args (int argc, char *argv[])
+Index: mc/src/args.c
+===================================================================
+--- mc.orig/src/args.c	2012-02-18 23:02:06.551615840 +0100
++++ mc/src/args.c	2012-02-18 23:02:37.039616704 +0100
+@@ -433,7 +433,7 @@
      base = x_basename (argv[0]);
      tmp = (argc > 0) ? argv[1] : NULL;
  
--    if (!STRNCOMP (base, "mce", 3) || !STRCOMP (base, "vi")) {
-+    if (!STRNCOMP (base, "mce", 3) || !STRCOMP (base, "editor") || !STRCOMP (base, "vi")) {
- 	edit_one_file = "";
- 	if (tmp) {
- 	    /*
+-    if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
++    if (strncmp (base, "mce", 3) == 0 || strcmp (base, "editor") == 0 || strcmp (base, "vi") == 0)
+     {
+         /* mce* or vi is link to mc */
+ 
--- mc-4.7.0.9/debian/patches/pending/99_enable_reading_debs.patch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/pending/99_enable_reading_debs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Description: Enable reading *.deb files again
-Closes: #626171, #628762
---- mc-4.7.0.9.orig/lib/vfs/mc-vfs/extfs/deb.in
-+++ mc-4.7.0.9/lib/vfs/mc-vfs/extfs/deb.in
-@@ -46,7 +46,7 @@ sub mcdebfs_list
- 	{
- 		while(<PIPEIN>)
- 		{
--			split;
-+			@_ = split;
- 
- 			$perm=$_[0]; $owgr=$_[1]; $size=$_[2];
- 			if($_[3] =~ /^\d\d\d\d\-/) { # New tar format
-@@ -100,7 +100,7 @@ sub mcdebfs_list
-         {
-                while(<PIPEIN>)
-                {
--                       split;
-+                       @_ = split;
-                        $size=$_[0];
-                        last if $size =~ /:/;
-                        next if $size !~ /\d+/;
--- mc-4.7.0.9/debian/patches/series	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/patches/series	2012-02-20 19:52:30.000000000 +0000
@@ -8,4 +8,3 @@
 debian/20_wrong_path_to_wrappers.patch
 debian/84_use_dvicat_instead_of_dvi2tty.patch
 debian/99_detect_alt_editor.patch
-pending/99_enable_reading_debs.patch
--- mc-4.7.0.9/debian/rules	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/rules	2012-02-20 19:52:30.000000000 +0000
@@ -22,5 +22,3 @@
 
 	chgrp tty ./debian/mc/usr/lib/mc/cons.saver || true
 	chmod g+s ./debian/mc/usr/lib/mc/cons.saver || true
-
-	rmdir ./debian/mc/usr/share/man/sr/man8
--- mc-4.7.0.9/debian/watch	2012-02-20 19:53:36.000000000 +0000
+++ mc-4.8.1/debian/watch	2012-02-20 19:52:30.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://www.midnight-commander.org/downloads/mc-(.+\.0\.?[^\.]*)\.tar\.gz
+http://www.midnight-commander.org/downloads/mc-(.+)\.tar\.bz2

More information about the Pkg-mc-devel mailing list