Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 1317fee7
mc (3:4.8.20-1) unstable; urgency=medium
* New upstream release.
+ fixed random crash at startup (Closes: #870728).
* rules: removed call to dpkg-parsechangelog.
* Debhelper & compat to version 11.
* Standards-Version: 4.1.3.
-- Dmitry Smirnov <onlyjob@debian.org> Sun, 04 Mar 2018 16:40:01 +1100
mc (3:4.8.19-1) unstable; urgency=low
* new upstream release
+ Closes: #866019
+ Closes: #808303
+ Closes: #825974
+ Closes: #866019 (crash On SFTP Upload).
+ Closes: #808303 (filtered view does not work).
+ Closes: #825974 (subshell no longer sees correct terminal size).
* remove merged patches:
+ uzip_528239.patch
......
debian/control
View file @ 1317fee7
......@@ -6,7 +6,7 @@ Uploaders: Yury V. Zaytsev <yury@shurup.com>
,Andreas Tille <tille@debian.org>
,Dmitry Smirnov <onlyjob@debian.org>
,Denis Briand <debian@denis-briand.fr>
Build-Depends: debhelper (>= 9.20160403~), dh-autoreconf, autopoint, intltool, bison
Build-Depends: debhelper (>= 11~), autopoint, intltool, bison
,check
,e2fslibs-dev
,gettext
......@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.20160403~), dh-autoreconf, autopoint, intltool, b
# mc determine zip mode from zip alternatives available at build-time(!)
# hence 'unzip' needed to set proper zip mode, see #661467
,unzip
Standards-Version: 4.0.0
Standards-Version: 4.1.3
Homepage: https://www.midnight-commander.org
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/mc.git
Vcs-Git: https://anonscm.debian.org/git/collab-maint/mc.git
......
debian/copyright
View file @ 1317fee7
......@@ -8,7 +8,7 @@ Comment:
Paul Seelig <pseelig@mail.uni-mainz.de>.
Files: *
Copyright: 1991-1992,1994-2016 Free Software Foundation
Copyright: 1991-1992,1994-2017 Free Software Foundation
1996 andrey joukov <2:5020/337.13@fidonet.org>
2002 ARJ Software Russia
2003 Alexander Serkov <serkov@ukrpost.net>
......@@ -52,7 +52,7 @@ Copyright:
2011 Andreas Tille <tille@debian.org>
2002 Colin Watson <cjwatson@debian.org>
2008-2015 Denis Briand <debian@denis-briand.fr>
2012-2016 Dmitry Smirnov <onlyjob@debian.org>
2012-2018 Dmitry Smirnov <onlyjob@debian.org>
1997 Fernando Alegre <alegre@debian.org>
2004-2007 Ludovic Drolez <ldrolez@debian.org>
1999-2001 Martin Bialasinski <martinb@debian.org>
......
debian/patches/2987.patch
View file @ 1317fee7
......@@ -12,7 +12,8 @@ Description: clear unfinished text before 'cd' to avoid accidental execution
--- a/src/subshell/common.c
+++ b/src/subshell/common.c
@@ -1286,7 +1286,7 @@
@@ -1287,9 +1287,9 @@
}
/* The initial space keeps this out of the command history (in bash
because we set "HISTCONTROL=ignorespace") */
......@@ -21,3 +22,4 @@ Description: clear unfinished text before 'cd' to avoid accidental execution
if (vpath != NULL)
{
const char *translate;
debian/patches/863984.diff deleted 100644 → 0
View file @ 36995e50
Author: Yuriy M. Kaminskiy <yumkam+debian@gmail.com>
Bug-Debian: https://bugs.debian.org/863984
Forwarded: https://midnight-commander.org/ticket/3840
Reviewed-by: Denis Briand <debian@denis-briand.fr>
Description: fix error message when you gzip or bzip files from user menu
--- a/misc/mc.menu.in
+++ b/misc/mc.menu.in
@@ -241,7 +241,8 @@ y Gzip or gunzip current file
case %f in
*.gz|*.[zZ]) DECOMP=-d;;
esac
- gzip "$DECOMP" -v %f
+ # do *not* add quotes around $DECOMP!
+ gzip $DECOMP -v %f
+ t t
Y Gzip or gunzip tagged files
@@ -250,7 +251,7 @@ Y Gzip or gunzip tagged files
case "$i" in
*.gz|*.[zZ]) DECOMP=-d;;
esac
- gzip "$DECOMP" -v "$i"
+ gzip $DECOMP -v "$i"
done
+ ! t t
@@ -259,7 +260,7 @@ b Bzip2 or bunzip2 current file
case %f in
*.bz2) DECOMP=-d;;
esac
- bzip2 "$DECOMP" -v %f
+ bzip2 $DECOMP -v %f
+ t t
B Bzip2 or bunzip2 tagged files
@@ -268,7 +269,7 @@ B Bzip2 or bunzip2 tagged files
case "$i" in
*.bz2) DECOMP=-d;;
esac
- bzip2 "$DECOMP" -v "$i"
+ bzip2 $DECOMP -v "$i"
done
+ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t
debian/patches/alt_editor.patch
View file @ 1317fee7
......@@ -14,12 +14,14 @@ Description: Detect that mc was launched from alternatives symlink
--- a/src/args.c
+++ b/src/args.c
@@ -767,7 +767,7 @@ mc_setup_by_args (int argc, char **argv,
@@ -635,9 +635,9 @@
const char *base;
base = x_basename (argv[0]);
tmp = (argc > 0) ? argv[1] : NULL;
- if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0)
+ if (strncmp (base, "mce", 3) == 0 || strcmp (base, "vi") == 0 || strcmp (base, "editor") == 0)
{
/* mce* or vi is link to mc */
mc_global.mc_run_mode = MC_RUN_EDITOR;
}
debian/patches/series
View file @ 1317fee7
## UPSTREAM / FORWARDED:
863984.diff
spelling-error-in-manpage.diff
## DEBIAN FIXES AND ENHANCEMENTS:
2987.patch
......
debian/patches/spelling-error-in-manpage.diff deleted 100644 → 0
View file @ 36995e50
Author: Denis Briand <debian@denis-briand.fr>
Forwarded: https://midnight-commander.org/ticket/3839
Description: fix some spelling errors in manpage.
--- a/doc/man/mc.1.in.orig 2017-07-09 16:43:05.624760216 +0200
+++ b/doc/man/mc.1.in 2017-07-09 16:43:46.028758517 +0200
@@ -1440,7 +1440,7 @@
to "..".
.PP
The 'Enable ignore directories' checkbox and input field below it
-allow to set up the list of directories that should be skip during the search
+allow one to set up the list of directories that should be skip during the search
files (for example, you may want to avoid searches on a CD\-ROM or on a NFS
directory that is mounted across a slow link). List components must be separated
with a colon, here is an example:
@@ -2003,10 +2003,10 @@
of screen above panels. Enabled by default.
.PP
.I Command prompt.
-If enabled, command line is avalable. Enabled by default.
+If enabled, command line is available. Enabled by default.
.PP
.I Keybar visible.
-If enabled, 10 lables associated with F1\-F10 keys are located at the bottom
+If enabled, 10 labels associated with F1\-F10 keys are located at the bottom
row of screen. Enabled by default.
.PP
.I Hintbar visible.
debian/rules
View file @ 1317fee7
......@@ -65,7 +65,7 @@ override_dh_strip:
.PHONY: get-orig-source
## http://wiki.debian.org/onlyjob/get-orig-source
include /usr/share/dpkg/pkg-info.mk
PKD = $(abspath $(dir $(MAKEFILE_LIST)))
VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
get-orig-source:
uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(DEB_VERSION_UPSTREAM) $(PKD)
debian/source/lintian-overrides
View file @ 1317fee7
#Upstream doesn't provide GPG signature
debian-watch-may-check-gpg-signature
debian-watch-does-not-check-gpg-signature