[Pkg-mc-commits] r398 - in trunk/debian/patches: . debian
Yury Zaytsev
zaytsev-guest at alioth.debian.org
Fri May 7 09:21:21 UTC 2010
Author: zaytsev-guest
Date: 2010-05-07 09:21:16 +0000 (Fri, 07 May 2010)
New Revision: 398
Added:
trunk/debian/patches/debian/20_wrong_path_to_wrappers.patch
trunk/debian/patches/debian/84_use_dvicat_instead_of_dvi2tty.patch
Removed:
trunk/debian/patches/bugs/
trunk/debian/patches/debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
Modified:
trunk/debian/patches/debian/03_use_awk.patch
trunk/debian/patches/debian/04_add_gem_extension.patch
trunk/debian/patches/debian/05_disable_internal_editor.patch
trunk/debian/patches/debian/06_use_default_pdf_viewer.patch
trunk/debian/patches/debian/08_use_sensible-editor.patch
trunk/debian/patches/debian/09_uzip_broken_528239.patch
trunk/debian/patches/debian/10_use_default_images_viewer.patch
trunk/debian/patches/series
Log:
Rearrange the patches and make the format consistent.
Modified: trunk/debian/patches/debian/03_use_awk.patch
===================================================================
--- trunk/debian/patches/debian/03_use_awk.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/03_use_awk.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -1,5 +1,6 @@
-use awk before using anything else in configure
-this closes: #499723
+Description: Use awk before using anything else in ./configure
+Bug-Debian: http://bugs.debian.org/499723
+
--- a/configure 2009-08-04 20:22:13.000000000 +0200
+++ b/configure 2009-08-04 20:22:29.000000000 +0200
@@ -2544,7 +2544,7 @@
Modified: trunk/debian/patches/debian/04_add_gem_extension.patch
===================================================================
--- trunk/debian/patches/debian/04_add_gem_extension.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/04_add_gem_extension.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -1,7 +1,5 @@
-description: add gem extension
-=============================================
-diff --git a/misc/mc.ext.in b/misc/mc.ext.in
-index 493e8c5..33fbcb2 100644
+Description: Add gem extension
+
--- a/misc/mc.ext.in
+++ b/misc/mc.ext.in
@@ -107,7 +107,7 @@
Modified: trunk/debian/patches/debian/05_disable_internal_editor.patch
===================================================================
--- trunk/debian/patches/debian/05_disable_internal_editor.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/05_disable_internal_editor.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -1,7 +1,5 @@
-disable internal editor by default
-==============================================
-Index: mc-4.6.2~git20090522/src/cmd.c
-===================================================================
+Description: Disable internal editor by default
+
--- 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 @@
Modified: trunk/debian/patches/debian/06_use_default_pdf_viewer.patch
===================================================================
--- trunk/debian/patches/debian/06_use_default_pdf_viewer.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/06_use_default_pdf_viewer.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -1,8 +1,7 @@
-Comment: use mailcap entry to choose pdf viewer
-bug: #544054
+Description: Use mailcap entry to choose PDF viewer
+Bug-Debian: http://bugs.debian.org/544054
Author: Andreas Tille <tillea at rki.de>
-Index: mc-4.7.0-pre1/misc/mc.ext.in
-===================================================================
+
--- 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 @@
Modified: trunk/debian/patches/debian/08_use_sensible-editor.patch
===================================================================
--- trunk/debian/patches/debian/08_use_sensible-editor.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/08_use_sensible-editor.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -3,7 +3,6 @@
Author: Denis Briand <denis at narcan.fr>
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 @@
Modified: trunk/debian/patches/debian/09_uzip_broken_528239.patch
===================================================================
--- trunk/debian/patches/debian/09_uzip_broken_528239.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/09_uzip_broken_528239.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -3,7 +3,6 @@
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 @@
Modified: trunk/debian/patches/debian/10_use_default_images_viewer.patch
===================================================================
--- trunk/debian/patches/debian/10_use_default_images_viewer.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/10_use_default_images_viewer.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -1,8 +1,7 @@
-Comment: use mailcap entry to choose the images viewer
-bug: #544058
+Description: Use mailcap entry to choose the images viewer
+Bug-Debian: http://bugs.debian.org/544058
Author: Andreas Tille <tillea at rki.de>
-Index: mc-4.7.0-pre4/misc/mc.ext.in
-===================================================================
+
--- 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 @@
Deleted: trunk/debian/patches/debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
===================================================================
--- trunk/debian/patches/debian/1462_fix_wrong_path_to_wrapper_script_540238.patch 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/debian/1462_fix_wrong_path_to_wrapper_script_540238.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -1,20 +0,0 @@
-fix_wrong_path_to_wrapper_script
-Closes: #540238
-Author: Denis Briand <denis at narcan.fr>
-Thanks to Jindřich Makovička
-Index: mc-4.7.0-pre1/contrib/mc.csh.in
-===================================================================
---- 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
-@@ -1 +1 @@
--alias mc 'source @pkglibexecdir@/mc-wrapper.csh'
-+alias mc 'source /usr/share/mc/bin/mc-wrapper.csh'
-Index: mc-4.7.0-pre1/contrib/mc.sh.in
-===================================================================
---- 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
-@@ -1,3 +1,3 @@
- # Don't define aliases in plain Bourne shell
- [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
--alias mc='. @pkglibexecdir@/mc-wrapper.sh'
-+alias mc='. /usr/share/mc/bin/mc-wrapper.sh'
Copied: trunk/debian/patches/debian/20_wrong_path_to_wrappers.patch (from rev 395, trunk/debian/patches/debian/1462_fix_wrong_path_to_wrapper_script_540238.patch)
===================================================================
--- trunk/debian/patches/debian/20_wrong_path_to_wrappers.patch (rev 0)
+++ trunk/debian/patches/debian/20_wrong_path_to_wrappers.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -0,0 +1,18 @@
+Description: Fix wrong path to the wrapper script
+Bug-Debian: http://bugs.debian.org/540238
+Author: Denis Briand <denis at narcan.fr>
+Author: Jindřich Makovička
+
+--- 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
+@@ -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
+@@ -1,3 +1,3 @@
+ # Don't define aliases in plain Bourne shell
+ [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
+-alias mc='. @pkglibexecdir@/mc-wrapper.sh'
++alias mc='. /usr/share/mc/bin/mc-wrapper.sh'
Copied: trunk/debian/patches/debian/84_use_dvicat_instead_of_dvi2tty.patch (from rev 395, trunk/debian/patches/bugs/84_use_dvicat_instead_of_dvi2tty.patch)
===================================================================
--- trunk/debian/patches/debian/84_use_dvicat_instead_of_dvi2tty.patch (rev 0)
+++ trunk/debian/patches/debian/84_use_dvicat_instead_of_dvi2tty.patch 2010-05-07 09:21:16 UTC (rev 398)
@@ -0,0 +1,17 @@
+Description: use catdvi instead of dvi2tty and improve code.
+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 @@
+
+ # DVI
+ regex/\.([dD][vV][iI])$
+- Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
+- View=%view{ascii} dvi2tty %f
++ Open=run-mailcap %f 2>&1 &
++ View=%view{ascii} catdvi %f
+
+ # TeX
+ regex/\.([Tt][Ee][Xx])$
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2010-05-06 18:43:59 UTC (rev 397)
+++ trunk/debian/patches/series 2010-05-07 09:21:16 UTC (rev 398)
@@ -5,5 +5,5 @@
debian/08_use_sensible-editor.patch
debian/09_uzip_broken_528239.patch
debian/10_use_default_images_viewer.patch
-debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
-bugs/84_use_dvicat_instead_of_dvi2tty.patch
+debian/20_wrong_path_to_wrappers.patch
+debian/84_use_dvicat_instead_of_dvi2tty.patch
More information about the Pkg-mc-commits
mailing list