Merging debian version 3:4.8.31-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 81 insertions, 1483 deletions

diff --git a/debian/changelog b/debian/changelog
index 54027e3..003361e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mc (3:4.8.31-1) unstable; urgency=medium
+
+  * New upstream release.
+    + Improve glib compatibility (Closes: #1051489).
+      Thanks, Jeremy Bícha.
+  * Standards-Version: 4.7.0
+  * Make thin skins on build time (Closes: #1063373)
+    Thanks, Shmerl.
+  * Added various packages to Suggests, providing binaries recognised in
+    various MC scripts. Thanks, John Mullee.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 May 2024 20:54:55 +1000
+
 mc (3:4.8.30-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 0a79526..1a5c553 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 12), autopoint, intltool, bison
 # 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.6.2
+Standards-Version: 4.7.0
 Rules-Requires-Root: binary-targets
 Homepage: https://www.midnight-commander.org
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/mc
@@ -37,27 +37,77 @@ Recommends: ${misc:Recommends}
     ,perl
     ,sensible-utils
     ,unzip
-Suggests: arj
+Suggests: antiword
+         ,arc | arcanist
+         ,arj
+         ,binutils
          ,bzip2
+         ,cabextract
+         ,catdoc
          ,catdvi | texlive-binaries
+         ,clzip | lunzip | lzd | lzip | lziprecover | minilzip | pdlzip | plzip
+         ,cpio
+         ,ctorrent
          ,dbview
+         ,default-jdk-headless
+         ,djview4
          ,djvulibre-bin
-         ,epub-utils
+         ,elinks
+         ,epub-utils | ncbi-entrez-direct
+         ,exif
          ,file
          ,genisoimage
+         ,gettext
+         ,ghostscript
+         ,glade
+         ,gputils
+         ,groff-base
          ,gv
          ,imagemagick
+         ,info
+         ,jlha-utils | lhasa
+         ,kchmviewer
          ,libaspell-dev
+         ,libbatik-java
+         ,libchm-bin
+         ,liblz4-tool
+         ,libxml2-utils
+         ,links2
          ,links | w3m | lynx
-         ,odt2txt
+         ,lyx
+         ,lzma | xz-utils
+         ,man-db
+         ,mikmod
+         ,mpg321
+         ,mplayer
+         ,odt2txt | unoconv
+         ,p7zip-full
+         ,par2
+         ,poedit | potool
          ,poppler-utils
-         ,python
-         ,python-boto
-         ,python-tz
+         ,procyon-decompiler
+         ,python3:any
+         ,python3-boto
+         ,python3-tz
+         ,rar
+         ,rpm
+         ,sox
+         ,sqlite3
+         ,texlive-binaries
+         ,timidity
+         ,unace | unace-nonfree
+         ,unalz
          ,unar
+         ,unrar | unrar-free
+         ,unzip
+         ,vorbis-tools
          ,wimtools
+         ,wv
          ,xpdf | pdf-viewer
+         ,xpmutils
+         ,xz-utils
          ,zip
+         ,zstd
 Provides: mcedit
 Description: Midnight Commander - a powerful file manager
  GNU Midnight Commander is a text-mode full-screen file manager. It
diff --git a/debian/copyright b/debian/copyright
index fd7e0c3..1ec0973 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Comment:
 
 Files: *
 Copyright:
-    1991-1992,1994-2023 Free Software Foundation
+    1991-1992,1994-2024 Free Software Foundation
     1996      andrey joukov <2:5020/337.13@fidonet.org>
     2002      ARJ Software Russia
     2003      Alexander Serkov <serkov@ukrpost.net>
@@ -61,7 +61,7 @@ Copyright:
     2011       Andreas Tille <tille@debian.org>
     2002       Colin Watson <cjwatson@debian.org>
     2008-2015  Denis Briand <debian@denis-briand.fr>
-    2012-2023  Dmitry Smirnov <onlyjob@debian.org>
+    2012-2024  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>
diff --git a/debian/mc-data.install b/debian/mc-data.install
index 32b2131..9dbc2db 100644
--- a/debian/mc-data.install
+++ b/debian/mc-data.install
@@ -3,4 +3,4 @@ usr/share/man
 usr/share/mc
 debian/icons/MidnightCommander.png	usr/share/icons/hicolor/64x64/apps
 debian/icons/mc.svg			usr/share/icons/hicolor/scalable/apps
-debian/skins/modarin-*/*.ini		usr/share/mc/skins
+debian/tmp/skins-thin/*.ini		usr/share/mc/skins
diff --git a/debian/patches/ext_use_default_editor.patch b/debian/patches/ext_use_default_editor.patch
index 79de754..e7f2311 100644
--- a/debian/patches/ext_use_default_editor.patch
+++ b/debian/patches/ext_use_default_editor.patch
@@ -5,7 +5,7 @@ Description: Use default editor instead of vi
 
 --- a/misc/mc.ext.ini.in
 +++ b/misc/mc.ext.ini.in
-@@ -1113,9 +1113,9 @@
+@@ -1148,9 +1148,9 @@
  Open=%cd %p/ucpio://
  View=%view{ascii} @EXTHELPERSDIR@/archive.sh view cpio
  
diff --git a/debian/rules b/debian/rules
index fb92a25..d4978a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,13 @@ override_dh_auto_test:
 	## allow test(s) failure
 	-dh_auto_test
 
+execute_before_dh_auto_install:
+## make thin_skins:
+	mkdir -v -p debian/tmp/skins
+	cp misc/skins/modar* debian/tmp/skins/
+	debian/skins/mc_skin2thin.pl debian/tmp/skins
+	$(RM) -rf debian/tmp/skins
+
 override_dh_auto_install:
 	dh_auto_install --max-parallel=1
 
diff --git a/debian/skins/modarin-1.2-thin/modarcon16-defbg-thin.ini b/debian/skins/modarin-1.2-thin/modarcon16-defbg-thin.ini
deleted file mode 100644
index 9f9e299..0000000
--- a/debian/skins/modarin-1.2-thin/modarcon16-defbg-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarCon16-DefaultBG (user)
-    256colors = false
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color7;default
-    selected = color15;color2
-    marked = color11;;bold
-    markselect = color11;color2;bold
-    gauge = color15;color2
-    input = color15;color0
-    inputmark = color11;color2;bold
-    inputunchanged = ;color0
-    commandlinemark = color11;color2;bold
-    reverse = color0;color10
-    header = color3
-    disabled = color8;color7
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color0;color7
-    dhotnormal = color3
-    dfocus = color11;color2;bold
-    dhotfocus = color3;color2
-    dtitle = color11;;bold
-
-[error]
-    _default_ = color15;color1
-    errdfocus = color11;color2;bold
-    errdhotnormal = color13
-    errdhotfocus = color13;color2
-    errdtitle = color11;;bold
-
-[filehighlight]
-    directory = color15;;bold
-    executable = color10
-    symlink = color12
-    hardlink =
-    stalelink = color9
-    device = color13
-    special = color3
-    core = color1
-    temp = color8
-    archive = color3
-    doc = color14
-    source = color6
-    media = color5
-    graph = color13
-    database = color2
-
-[menu]
-    _default_ = color7;default
-    menusel = color11;color2;bold
-    menuhot = color3
-    menuhotsel = color3;color2
-    menuinactive = color8
-
-[popupmenu]
-    _default_ = color7;default
-    menusel = color11;color2;bold
-    menutitle = color11;;bold
-
-[buttonbar]
-    button = color7
-    hotkey = color15;color3
-
-[statusbar]
-    _default_ = color15;color2
-
-[help]
-    _default_ = color0;color7
-    helpitalic = color10;;bold
-    helpbold = color5
-    helplink = color14
-    helpslink = color11;color2;bold
-    helptitle = color11;;bold
-
-[editor]
-    _default_ = color7;default
-    editbold = color15;;bold
-    editmarked = color11;color2;bold
-    editwhitespace = color12;color4
-    editlinestate = color2;color0
-    bookmark = color0;color7
-    bookmarkfound = color0;color7
-    editrightmargin = color0;color7
-
-[viewer]
-    _default_ = color7;default
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color11;color2;bold
-
-[diffviewer]
-    changedline = color15;color4
-    changednew = color15;color2
-    changed = color15;color6
-    added = color0;color7
-    removed = color8;color0
-    error = color15;color1
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarcon16-thin.ini b/debian/skins/modarin-1.2-thin/modarcon16-thin.ini
deleted file mode 100644
index 86101f5..0000000
--- a/debian/skins/modarin-1.2-thin/modarcon16-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarCon16 (user)
-    256colors = false
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color7;color0
-    selected = color15;color2
-    marked = color11;;bold
-    markselect = color11;color2;bold
-    gauge = color15;color2
-    input = color15
-    inputmark = color11;color2;bold
-    inputunchanged =
-    commandlinemark = color11;color2;bold
-    reverse = color0;color10
-    header = color3
-    disabled = color8;color7
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color0;color7
-    dhotnormal = color3
-    dfocus = color11;color2;bold
-    dhotfocus = color3;color2
-    dtitle = color11;;bold
-
-[error]
-    _default_ = color15;color1
-    errdfocus = color11;color2;bold
-    errdhotnormal = color13
-    errdhotfocus = color13;color2
-    errdtitle = color11;;bold
-
-[filehighlight]
-    directory = color15;;bold
-    executable = color10
-    symlink = color12
-    hardlink =
-    stalelink = color9
-    device = color13
-    special = color3
-    core = color1
-    temp = color8
-    archive = color3
-    doc = color14
-    source = color6
-    media = color5
-    graph = color13
-    database = color2
-
-[menu]
-    _default_ = color0;color7
-    menusel = color11;color2;bold
-    menuhot = color3
-    menuhotsel = color3;color2
-    menuinactive = color8
-
-[popupmenu]
-    _default_ = color0;color7
-    menusel = color11;color2;bold
-    menutitle = color11;;bold
-
-[buttonbar]
-    button = color7
-    hotkey = color15;color3
-
-[statusbar]
-    _default_ = color15;color2
-
-[help]
-    _default_ = color0;color7
-    helpitalic = color10;;bold
-    helpbold = color5
-    helplink = color14
-    helpslink = color11;color2;bold
-    helptitle = color11;;bold
-
-[editor]
-    _default_ = color7;color0
-    editbold = color15;;bold
-    editmarked = color11;color2;bold
-    editwhitespace = color12;color4
-    editlinestate = color2;color0
-    bookmark = color0;color7
-    bookmarkfound = color0;color7
-    editrightmargin = color0;color7
-
-[viewer]
-    _default_ = color7;color0
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color11;color2;bold
-
-[diffviewer]
-    changedline = color15;color4
-    changednew = color15;color2
-    changed = color15;color6
-    added = color0;color7
-    removed = color8;color0
-    error = color15;color1
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarcon16root-defbg-thin.ini b/debian/skins/modarin-1.2-thin/modarcon16root-defbg-thin.ini
deleted file mode 100644
index 5d0d391..0000000
--- a/debian/skins/modarin-1.2-thin/modarcon16root-defbg-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarCon16root-DefaultBG (root)
-    256colors = false
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color7;default
-    selected = color15;color1
-    marked = color11;;bold
-    markselect = color11;color1;bold
-    gauge = color15;color1
-    input = color15;color0
-    inputmark = color11;color1;bold
-    inputunchanged = ;color0
-    commandlinemark = color11;color1;bold
-    reverse = color0;color9
-    header = color3
-    disabled = color8;color7
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color0;color7
-    dhotnormal = color3
-    dfocus = color11;color1;bold
-    dhotfocus = color5;color1;bold
-    dtitle = color11;;bold
-
-[error]
-    _default_ = color15;color1
-    errdfocus = color11;color3;bold
-    errdhotnormal = color13
-    errdhotfocus = color13;color3
-    errdtitle = color11;;bold
-
-[filehighlight]
-    directory = color15;;bold
-    executable = color10
-    symlink = color12
-    hardlink =
-    stalelink = color9
-    device = color13
-    special = color3
-    core = color1
-    temp = color8
-    archive = color3
-    doc = color14
-    source = color6
-    media = color5
-    graph = color13
-    database = color2
-
-[menu]
-    _default_ = color7;default
-    menusel = color11;color1;bold
-    menuhot = color3
-    menuhotsel = color5;color1;bold
-    menuinactive = color8
-
-[popupmenu]
-    _default_ = color7;default
-    menusel = color11;color1;bold
-    menutitle = color11;;bold
-
-[buttonbar]
-    button = color7
-    hotkey = color15;color3
-
-[statusbar]
-    _default_ = color15;color1
-
-[help]
-    _default_ = color0;color7
-    helpitalic = color10;;bold
-    helpbold = color5
-    helplink = color14
-    helpslink = color11;color1;bold
-    helptitle = color11;;bold
-
-[editor]
-    _default_ = color7;default
-    editbold = color15;;bold
-    editmarked = color11;color1;bold
-    editwhitespace = color12;color4
-    editlinestate = color1;color0
-    bookmark = color0;color7
-    bookmarkfound = color0;color7
-    editrightmargin = color0;color7
-
-[viewer]
-    _default_ = color7;default
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color11;color1;bold
-
-[diffviewer]
-    changedline = color15;color4
-    changednew = color15;color5
-    changed = color15;color3
-    added = color0;color7
-    removed = color8;color0
-    error = color15;color1
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarcon16root-thin.ini b/debian/skins/modarin-1.2-thin/modarcon16root-thin.ini
deleted file mode 100644
index bd9fae7..0000000
--- a/debian/skins/modarin-1.2-thin/modarcon16root-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarCon16root (root)
-    256colors = false
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color7;color0
-    selected = color15;color1
-    marked = color11;;bold
-    markselect = color11;color1;bold
-    gauge = color15;color1
-    input = color15
-    inputmark = color11;color1;bold
-    inputunchanged =
-    commandlinemark = color11;color1;bold
-    reverse = color0;color9
-    header = color3
-    disabled = color8;color7
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color0;color7
-    dhotnormal = color3
-    dfocus = color11;color1;bold
-    dhotfocus = color5;color1;bold
-    dtitle = color11;;bold
-
-[error]
-    _default_ = color15;color1
-    errdfocus = color11;color3;bold
-    errdhotnormal = color13
-    errdhotfocus = color13;color3
-    errdtitle = color11;;bold
-
-[filehighlight]
-    directory = color15;;bold
-    executable = color10
-    symlink = color12
-    hardlink =
-    stalelink = color9
-    device = color13
-    special = color3
-    core = color1
-    temp = color8
-    archive = color3
-    doc = color14
-    source = color6
-    media = color5
-    graph = color13
-    database = color2
-
-[menu]
-    _default_ = color0;color7
-    menusel = color11;color1;bold
-    menuhot = color3
-    menuhotsel = color5;color1;bold
-    menuinactive = color8
-
-[popupmenu]
-    _default_ = color0;color7
-    menusel = color11;color1;bold
-    menutitle = color11;;bold
-
-[buttonbar]
-    button = color7
-    hotkey = color15;color3
-
-[statusbar]
-    _default_ = color15;color1
-
-[help]
-    _default_ = color0;color7
-    helpitalic = color10;;bold
-    helpbold = color5
-    helplink = color14
-    helpslink = color11;color1;bold
-    helptitle = color11;;bold
-
-[editor]
-    _default_ = color7;color0
-    editbold = color15;;bold
-    editmarked = color11;color1;bold
-    editwhitespace = color12;color4
-    editlinestate = color1;color0
-    bookmark = color0;color7
-    bookmarkfound = color0;color7
-    editrightmargin = color0;color7
-
-[viewer]
-    _default_ = color7;color0
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color11;color1;bold
-
-[diffviewer]
-    changedline = color15;color4
-    changednew = color15;color5
-    changed = color15;color3
-    added = color0;color7
-    removed = color8;color0
-    error = color15;color1
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarin256-defbg-thin.ini b/debian/skins/modarin-1.2-thin/modarin256-defbg-thin.ini
deleted file mode 100644
index ded04ef..0000000
--- a/debian/skins/modarin-1.2-thin/modarin256-defbg-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarIn256-DefaultBG (user)
-    256colors = true
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color250;default
-    selected = color253;color23
-    marked = color228;;bold
-    markselect = color228;color23;bold
-    gauge = color250;color66
-    input = color187;color235;bold
-    inputmark = color228;color23;bold
-    inputunchanged = color144;color235;bold
-    commandlinemark = color228;color23;bold
-    reverse = color254;color66
-    header = color180;;bold
-    disabled = color246;color239
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color252;color239
-    dhotnormal = color214
-    dfocus = color228;color23;bold
-    dhotfocus = color214;color23
-    dtitle = color180;;bold
-
-[error]
-    _default_ = color230;color52
-    errdfocus = color254;color23;bold
-    errdhotnormal = color203;color52
-    errdhotfocus = color203;color23;bold
-    errdtitle = color227;;bold
-
-[filehighlight]
-    directory = color144;;bold
-    executable = color114
-    symlink = color45
-    hardlink =
-    stalelink = color203
-    device = color170
-    special = color142
-    core = color197
-    temp = color245
-    archive = color172
-    doc = color153
-    source = color109
-    media = color141
-    graph = color216
-    database = color103
-
-[menu]
-    _default_ = color250;default
-    menusel = color253;color23
-    menuhot = color214
-    menuhotsel = color214;color23
-    menuinactive = color245
-
-[popupmenu]
-    _default_ = color250;default
-    menusel = color253;color23
-    menutitle = color180;;bold
-
-[buttonbar]
-    button = color253;color236
-    hotkey = color214;color238;bold
-
-[statusbar]
-    _default_ = color253;color66
-
-[help]
-    _default_ = color252;color239
-    helpitalic = color114;;bold
-    helpbold = color180;;bold
-    helplink = color45
-    helpslink = color228;color23;bold
-    helptitle = color180;;bold
-
-[editor]
-    _default_ = color250;default
-    editbold = color228;;bold
-    editmarked = color228;color23;bold
-    editwhitespace = color56;color234
-    editlinestate = color66;color235
-    bookmark = ;color239
-    bookmarkfound = ;color239;bold
-    editrightmargin = ;color235;bold
-
-[viewer]
-    _default_ = color250;default
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color228;color23;bold
-
-[diffviewer]
-    changedline = color231;color29
-    changednew = color232;color78
-    changed = color231;color39
-    added = color232;color81
-    removed = ;color234
-    error = color231;color160
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarin256-thin.ini b/debian/skins/modarin-1.2-thin/modarin256-thin.ini
deleted file mode 100644
index 992c690..0000000
--- a/debian/skins/modarin-1.2-thin/modarin256-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarIn256 (user)
-    256colors = true
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color252;color237
-    selected = color253;color23
-    marked = color228;;bold
-    markselect = color228;color23;bold
-    gauge = color250;color66
-    input = color187;color235;bold
-    inputmark = color228;color23;bold
-    inputunchanged = color144;color235;bold
-    commandlinemark = color228;color23;bold
-    reverse = color254;color66
-    header = color180;;bold
-    disabled = color246;color239
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color252;color239
-    dhotnormal = color214
-    dfocus = color228;color23;bold
-    dhotfocus = color214;color23
-    dtitle = color180;;bold
-
-[error]
-    _default_ = color230;color52
-    errdfocus = color254;color23;bold
-    errdhotnormal = color203;color52
-    errdhotfocus = color203;color23;bold
-    errdtitle = color227;;bold
-
-[filehighlight]
-    directory = color144;;bold
-    executable = color114
-    symlink = color45
-    hardlink =
-    stalelink = color203
-    device = color170
-    special = color142
-    core = color197
-    temp = color245
-    archive = color172
-    doc = color153
-    source = color109
-    media = color141
-    graph = color216
-    database = color103
-
-[menu]
-    _default_ = color252;color239
-    menusel = color253;color23
-    menuhot = color214
-    menuhotsel = color214;color23
-    menuinactive = color246
-
-[popupmenu]
-    _default_ = color252;color239
-    menusel = color253;color23
-    menutitle = color180;;bold
-
-[buttonbar]
-    button = color253;color236
-    hotkey = color214;color238;bold
-
-[statusbar]
-    _default_ = color253;color66
-
-[help]
-    _default_ = color252;color239
-    helpitalic = color114;;bold
-    helpbold = color180;;bold
-    helplink = color45
-    helpslink = color228;color23;bold
-    helptitle = color180;;bold
-
-[editor]
-    _default_ = color252;color237
-    editbold = color228;;bold
-    editmarked = color228;color23;bold
-    editwhitespace = color56;color234
-    editlinestate = color66;color235
-    bookmark = ;color239
-    bookmarkfound = ;color239;bold
-    editrightmargin = ;color235;bold
-
-[viewer]
-    _default_ = color252;color237
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color228;color23;bold
-
-[diffviewer]
-    changedline = color231;color29
-    changednew = color232;color78
-    changed = color231;color39
-    added = color232;color81
-    removed = ;color235
-    error = color231;color160
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarin256root-defbg-thin.ini b/debian/skins/modarin-1.2-thin/modarin256root-defbg-thin.ini
deleted file mode 100644
index 17c871d..0000000
--- a/debian/skins/modarin-1.2-thin/modarin256root-defbg-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarIn256root-DefaultBG (root)
-    256colors = true
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color250;default
-    selected = color253;color88
-    marked = color228;;bold
-    markselect = color228;color88;bold
-    gauge = color250;color95
-    input = color187;color235;bold
-    inputmark = color228;color88;bold
-    inputunchanged = color144;color235;bold
-    commandlinemark = color228;color88;bold
-    reverse = color254;color95
-    header = color180;;bold
-    disabled = color246;color239
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color252;color239
-    dhotnormal = color214
-    dfocus = color228;color88;bold
-    dhotfocus = color214;color88;bold
-    dtitle = color180;;bold
-
-[error]
-    _default_ = color230;color52
-    errdfocus = color254;color95;bold
-    errdhotnormal = color203;color52
-    errdhotfocus = color203;color95;bold
-    errdtitle = color227;;bold
-
-[filehighlight]
-    directory = color144;;bold
-    executable = color114
-    symlink = color45
-    hardlink =
-    stalelink = color203
-    device = color170
-    special = color142
-    core = color197
-    temp = color245
-    archive = color172
-    doc = color153
-    source = color109
-    media = color141
-    graph = color216
-    database = color103
-
-[menu]
-    _default_ = color250;default
-    menusel = color253;color88
-    menuhot = color214
-    menuhotsel = color214;color88
-    menuinactive = color245
-
-[popupmenu]
-    _default_ = color250;default
-    menusel = color253;color88
-    menutitle = color180;;bold
-
-[buttonbar]
-    button = color253;color236
-    hotkey = color214;color238;bold
-
-[statusbar]
-    _default_ = color254;color95
-
-[help]
-    _default_ = color252;color239
-    helpitalic = color114;;bold
-    helpbold = color180;;bold
-    helplink = color45
-    helpslink = color228;color88;bold
-    helptitle = color180;;bold
-
-[editor]
-    _default_ = color250;default
-    editbold = color228;;bold
-    editmarked = color228;color88;bold
-    editwhitespace = color56;color234
-    editlinestate = color95;color235
-    bookmark = ;color239
-    bookmarkfound = ;color239;bold
-    editrightmargin = ;color235;bold
-
-[viewer]
-    _default_ = color250;default
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color228;color88;bold
-
-[diffviewer]
-    changedline = color231;color130
-    changednew = color232;color208
-    changed = color231;color96
-    added = color232;color218
-    removed = ;color234
-    error = color231;color160
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒
diff --git a/debian/skins/modarin-1.2-thin/modarin256root-thin.ini b/debian/skins/modarin-1.2-thin/modarin256root-thin.ini
deleted file mode 100644
index 082274f..0000000
--- a/debian/skins/modarin-1.2-thin/modarin256root-thin.ini
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# modarin256: a moderate-dark-independent 256-color skin for MidnightCommander.
-#
-# This skin is using colors independent from the default 16 terminal colors,
-# i.e., no matter how the 16 standard colors are configured, the appearance
-# of Midnight Commander will not be affected.
-#
-# There are 4 variants of this skin:
-#
-# modarin256
-#   - default skin, no standard colors used.
-#
-# modarin256-defbg
-#   - like modarin256, but using the default background color for core, editor,
-#     viewer, menu and popupmenu backgrounds, for use with (semi-)transparent
-#     background colors.
-#
-# modarin256root
-# modarin256root-defbg
-#   - like the other two skins, but for the root user, with red colors used
-#     instead of green colors for things like select/focus/statusbar etc.,
-#     to keep reminding the user that mc is running as root.
-#
-# Fallback skins for 16-color terminals (poor man's skins):
-#
-# modarcon16
-# modarcon16-defbg
-# modarcon16root
-# modarcon16root-defbg
-#   - like everything running in a 16-color terminal, these skins look ugly
-#     and are no subsitute for the 256-color versions. As some terminals don't
-#     support using dark gray as background color, i used a black background
-#     and adjusted the remaining colors accordingly.
-#
-# 256-color skins require mc version 4.8 or newer.
-#
-# Author: Oliver Lange <modarin@bloody.in-berlin.de>
-#
-# Version: 1.2
-#
-
-[skin]
-    description = MoDarIn256root (root)
-    256colors = true
-
-[Lines]
-    horiz = ─
-    vert = │
-    lefttop = ┌
-    righttop = ┐
-    leftbottom = └
-    rightbottom = ┘
-    topmiddle = ┬
-    bottommiddle = ┴
-    leftmiddle = ├
-    rightmiddle = ┤
-    cross = ┼
-    dhoriz = ─
-    dvert = │
-    dlefttop = ┌
-    drighttop = ┐
-    dleftbottom = └
-    drightbottom = ┘
-    dtopmiddle = ─
-    dbottommiddle = ─
-    dleftmiddle = ├
-    drightmiddle = ┤
-
-[core]
-    _default_ = color252;color237
-    selected = color253;color88
-    marked = color228;;bold
-    markselect = color228;color88;bold
-    gauge = color250;color95
-    input = color187;color235;bold
-    inputmark = color228;color88;bold
-    inputunchanged = color144;color235;bold
-    commandlinemark = color228;color88;bold
-    reverse = color254;color95
-    header = color180;;bold
-    disabled = color246;color239
-    #inputhistory =
-    #commandhistory =
-
-[dialog]
-    _default_ = color252;color239
-    dhotnormal = color214
-    dfocus = color228;color88;bold
-    dhotfocus = color214;color88;bold
-    dtitle = color180;;bold
-
-[error]
-    _default_ = color230;color52
-    errdfocus = color254;color95;bold
-    errdhotnormal = color203;color52
-    errdhotfocus = color203;color95;bold
-    errdtitle = color227;;bold
-
-[filehighlight]
-    directory = color144;;bold
-    executable = color114
-    symlink = color45
-    hardlink =
-    stalelink = color203
-    device = color170
-    special = color142
-    core = color197
-    temp = color245
-    archive = color172
-    doc = color153
-    source = color109
-    media = color141
-    graph = color216
-    database = color103
-
-[menu]
-    _default_ = color252;color239
-    menusel = color253;color88
-    menuhot = color214
-    menuhotsel = color214;color88
-    menuinactive = color246
-
-[popupmenu]
-    _default_ = color252;color239
-    menusel = color253;color88
-    menutitle = color180;;bold
-
-[buttonbar]
-    button = color253;color236
-    hotkey = color214;color238;bold
-
-[statusbar]
-    _default_ = color254;color95
-
-[help]
-    _default_ = color252;color239
-    helpitalic = color114;;bold
-    helpbold = color180;;bold
-    helplink = color45
-    helpslink = color228;color88;bold
-    helptitle = color180;;bold
-
-[editor]
-    _default_ = color252;color237
-    editbold = color228;;bold
-    editmarked = color228;color88;bold
-    editwhitespace = color56;color234
-    editlinestate = color95;color235
-    bookmark = ;color239
-    bookmarkfound = ;color239;bold
-    editrightmargin = ;color235;bold
-
-[viewer]
-    _default_ = color252;color237
-    viewbold = ;;bold
-    viewunderline = ;;underline
-    viewselected = color228;color88;bold
-
-[diffviewer]
-    changedline = color231;color130
-    changednew = color232;color208
-    changed = color231;color96
-    added = color232;color218
-    removed = ;color235
-    error = color231;color160
-
-[widget-common]
-    sort-sign-up = ↑
-    sort-sign-down = ↓
-
-[widget-panel]
-    hiddenfiles-sign-show = •
-    hiddenfiles-sign-hide = ○
-    history-prev-item-sign = «
-    history-next-item-sign = »
-    history-show-list-sign = ^
-
-[widget-scollbar]
-    first-vert-char = ↑
-    last-vert-char = ↓
-    first-horiz-char = «
-    last-horiz-char = »
-    current-char = ■
-    background-char = ▒