[Pkg-mc-commits] r349 - in branch/mailcap/debian: . patches patches/man
Denis Briand
narcan-guest at alioth.debian.org
Sun Jan 17 19:01:55 UTC 2010
Author: narcan-guest
Date: 2010-01-17 19:01:54 +0000 (Sun, 17 Jan 2010)
New Revision: 349
Added:
branch/mailcap/debian/patches/man/
branch/mailcap/debian/patches/man/01_fix_spelling_error.patch
Modified:
branch/mailcap/debian/README.Debian
branch/mailcap/debian/changelog
branch/mailcap/debian/mc.install
branch/mailcap/debian/mc.postrm
branch/mailcap/debian/patches/series
branch/mailcap/debian/rules
Log:
merge mailcap branch with 4.7.0.1-1 version
Modified: branch/mailcap/debian/README.Debian
===================================================================
--- branch/mailcap/debian/README.Debian 2010-01-17 17:48:06 UTC (rev 348)
+++ branch/mailcap/debian/README.Debian 2010-01-17 19:01:54 UTC (rev 349)
@@ -3,20 +3,27 @@
- In order to get rid of the commandline history to be full with cd commands
from the both boxes set this environment variable:
+
export HISTCONTROL=ignoreboth
- This is a issue of bash, not of mc. This would fix it.
+ This is a issue with bash, not mc. This would fix it.
- In newer mc versions ( >=4.6.2~pre1-1 ) the behaviour of M-o changed.
The old behaviour can now be found on the M-i key.
- To prevent the disappearing cursor over tabs using the visible_tabs feature
- in gnome-terminal set this environment variable:
- export TERM="gnome-256color"
+ in gnome-terminal request the following bug to be fixed in vte:
- Using this var the problem is fixed and the cursor doesn't vanish over tabs.
+ https://bugzilla.gnome.org/show_bug.cgi?id=473170
- - mc supports now user-defined colors. For a short documentation have a look
- here: http://www.midnight-commander.org/wiki/doc/common/skins
+ - mc now supports user-defined colors. For a short documentation have a look
+ here:
- -- Patrick Winnertz <winnie at debian.org> Tue, 05 Mar 2008 11:08:27 +0100
+ http://www.midnight-commander.org/wiki/doc/common/skins
+
+ -- Patrick Winnertz <winnie at debian.org> on Tue, 05 Mar 2008 11:08:27 +0100
+
+ Amendments by
+
+ -- Yury V. Zaytsev <yury at shurup.com> on Tue 29 Dec 2009 16:32:18 CET
+
Modified: branch/mailcap/debian/changelog
===================================================================
--- branch/mailcap/debian/changelog 2010-01-17 17:48:06 UTC (rev 348)
+++ branch/mailcap/debian/changelog 2010-01-17 19:01:54 UTC (rev 349)
@@ -1,10 +1,25 @@
-mc (3:4.7.0-2) experimental; urgency=low
+mc (3:4.7.0.1-2) experimental; urgency=low
[Denis Briand]
* Use mailcap to open all files.
-- Denis Briand <denis at narcan.fr> Sat, 26 Dec 2009 16:06:14 +0100
+mc (3:4.7.0.1-1) unstable; urgency=low
+
+ [Yury V. Zaytsev]
+ * New upstream version (bugfix release).
+ * Purged old unneeded links.
+ * Updated README.Debian.
+ * Updated the list of configuration files to be purged.
+ * Updated the list of files and permissions in rules.
+ * Updated the list of files to be installed (Closes: #563797)
+
+ [Denis Briand]
+ * Fix spelling-error-in-manpage.
+
+ -- Denis Briand <denis at narcan.fr> Fri, 15 Jan 2010 19:41:50 +0100
+
mc (3:4.7.0-1) unstable; urgency=low
[ Patrick Winnertz ]
Modified: branch/mailcap/debian/mc.install
===================================================================
--- branch/mailcap/debian/mc.install 2010-01-17 17:48:06 UTC (rev 348)
+++ branch/mailcap/debian/mc.install 2010-01-17 19:01:54 UTC (rev 349)
@@ -1,23 +1,33 @@
-usr/bin/*
+etc/mc/cedit.menu
+etc/mc/edit.indent.rc
+etc/mc/edit.spell.rc
+etc/mc/extfs/*.ini
+etc/mc/filehighlight.ini
+etc/mc/mc.charsets
+etc/mc/mc.ext
+etc/mc/mc.keymap
+etc/mc/mc.keymap.default
+etc/mc/mc.keymap.emacs
+etc/mc/mc.lib
+etc/mc/mc.menu
+etc/mc/mc.menu.*
+etc/mc/Syntax
+usr/bin/mc
+usr/bin/mcedit
+usr/bin/mcmfmt
+usr/bin/mcview
usr/lib/mc/mc/mc* usr/share/mc/bin
-etc/mc/mc.* etc/mc
-etc/mc/edit.indent.rc usr/share/mc
-etc/mc/extfs
-etc/mc/edit.spell.rc usr/share/mc
-etc/mc/cedit.menu usr/share/mc
-usr/share/mc/mc.h*
-usr/share/mc/extfs/*
-usr/share/mc/syntax/*
-etc/mc/Syntax
+usr/share/locale/*
usr/share/man/es/*
+usr/share/man/hu/*
+usr/share/man/it/*
+usr/share/man/man1/*
+usr/share/man/pl/*
usr/share/man/ru/*
-usr/share/man/pl/*
usr/share/man/sr/*
-usr/share/man/it/*
-usr/share/man/hu/*
-usr/share/man/man1/*
-usr/share/locale/*
-#usr/share/mc/mc.menu.sr
+usr/share/mc/extfs/*
+usr/share/mc/mc.h*
usr/share/mc/skins/*
+usr/share/mc/syntax/*
./debian/extra/mcedit-debian usr/bin
./debian/extra/mcview-debian usr/bin
Modified: branch/mailcap/debian/mc.postrm
===================================================================
--- branch/mailcap/debian/mc.postrm 2010-01-17 17:48:06 UTC (rev 348)
+++ branch/mailcap/debian/mc.postrm 2010-01-17 19:01:54 UTC (rev 349)
@@ -4,8 +4,27 @@
case "$1" in
purge)
- rm -f /etc/mc/mc.lib /etc/mc/mc.ext /etc/mc/mc.menu
+
+ rm -f \
+ /etc/mc/mc.charsets \
+ /etc/mc/mc.ext \
+ /etc/mc/mc.keymap \
+ /etc/mc/mc.keymap.default \
+ /etc/mc/mc.keymap.emacs \
+ /etc/mc/mc.lib \
+ /etc/mc/mc.menu \
+ /etc/mc/mc.menu.sr \
+ /etc/mc/Syntax \
+ /etc/mc/cedit.menu \
+ /etc/mc/edit.indent.rc \
+ /etc/mc/edit.spell.rc \
+ /etc/mc/filehighlight.ini \
+ /etc/mc/extfs/extfs.ini \
+ /etc/mc/extfs/sfs.ini
+
+ rmdir /etc/mc/extfs 2>/dev/null || true
rmdir /etc/mc 2>/dev/null || true
+
;;
esac
Added: branch/mailcap/debian/patches/man/01_fix_spelling_error.patch
===================================================================
--- branch/mailcap/debian/patches/man/01_fix_spelling_error.patch (rev 0)
+++ branch/mailcap/debian/patches/man/01_fix_spelling_error.patch 2010-01-17 19:01:54 UTC (rev 349)
@@ -0,0 +1,24 @@
+Description: fix spelling error
+Author: Denis Briand <denis at narcan.fr>
+Index: mc-4.7.0.1/doc/man/mc.1.in
+===================================================================
+--- mc-4.7.0.1.orig/doc/man/mc.1.in 2010-01-15 19:35:55.000000000 +0100
++++ mc-4.7.0.1/doc/man/mc.1.in 2010-01-15 19:36:56.000000000 +0100
+@@ -3322,7 +3322,7 @@
+ .\"Skins lines"
+ .br
+ .\"LINK2"
+-Compability
++Compatibility
+ .\"Skins oldcolors"
+ .br
+
+@@ -3331,7 +3331,7 @@
+
+ Section
+ .B [skin]
+-contain metainfo for skin\-file. Paramter
++contain metainfo for skin\-file. Parameter
+ .I description
+ contain short text about skin.
+
Modified: branch/mailcap/debian/patches/series
===================================================================
--- branch/mailcap/debian/patches/series 2010-01-17 17:48:06 UTC (rev 348)
+++ branch/mailcap/debian/patches/series 2010-01-17 19:01:54 UTC (rev 349)
@@ -9,3 +9,4 @@
debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
bugs/84_use_dvicat_instead_of_dvi2tty.patch
debian/11_use_mailcap_for_mc.ext.patch
+man/01_fix_spelling_error.patch
Modified: branch/mailcap/debian/rules
===================================================================
--- branch/mailcap/debian/rules 2010-01-17 17:48:06 UTC (rev 348)
+++ branch/mailcap/debian/rules 2010-01-17 19:01:54 UTC (rev 349)
@@ -4,10 +4,10 @@
include /usr/share/cdbs/1/class/autotools.mk
DEB_DH_STRIP_ARGS := --dbg-package=mc-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --with-glib2 --without-ext2undel --enable-charset --without-samba --with-screen=slang
+DEB_CONFIGURE_EXTRA_FLAGS := --with-glib2 --without-ext2undel --without-samba --with-screen=slang
AWK := awk
-#use building with n parallel processes with DEB_BUILD_OPTIONS=parallel=n
+# Use building with n parallel processes with DEB_BUILD_OPTIONS=parallel=n
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -28,6 +28,6 @@
binary-post-install/mc::
chmod 644 ./debian/mc/usr/share/mc/bin/mc*
- chmod 751 ./debian/mc/usr/share/mc/edit.spell.rc
- chmod 751 ./debian/mc/usr/share/mc/edit.indent.rc
+ chmod 755 ./debian/mc/etc/mc/edit.spell.rc
+ chmod 755 ./debian/mc/etc/mc/edit.indent.rc
rmdir ./debian/mc/usr/share/man/sr/man8
More information about the Pkg-mc-commits
mailing list