diff -pruN 9.8v-3/debian/changelog 9.8v-4/debian/changelog --- 9.8v-3/debian/changelog 2022-07-04 04:27:41.000000000 +0000 +++ 9.8v-4/debian/changelog 2022-08-02 05:15:05.000000000 +0000 @@ -1,3 +1,16 @@ +vile (9.8v-4) unstable; urgency=medium + + * Apply multi-arch hint from Debian Janitor: multiple vile-filters + packages may be installed (not particularly usefully, as the same is + not true of the vile package...). + * Add Rules-Requires-Root: no. + * Update to standards version 4.6.1. + * Fix order of #include in UXVile.ad so that the correct font is used. + * Change the default xvile font to match the uxvile sizing (9x18). + * Rollback lins_chars() change added in 9.8v (breaking unicode input). + + -- Brendan O'Dea Tue, 02 Aug 2022 15:15:05 +1000 + vile (9.8v-3) unstable; urgency=medium * Remove a pragma from perl.xs which gcc no longer recognises. diff -pruN 9.8v-3/debian/control 9.8v-4/debian/control --- 9.8v-3/debian/control 2021-12-13 06:31:19.000000000 +0000 +++ 9.8v-4/debian/control 2022-08-02 03:13:11.000000000 +0000 @@ -3,7 +3,8 @@ Section: editors Priority: optional Maintainer: Brendan O'Dea Uploaders: Paul van Tilburg -Standards-Version: 4.1.3 +Standards-Version: 4.6.1 +Rules-Requires-Root: no Build-Depends: dpkg-dev (>= 1.16.1), debhelper-compat (= 13), flex (>= 2.6.4), libncurses5-dev, libperl-dev (>= 5.8.1-3), libxaw7-dev (>= 4.3.0) Homepage: https://invisible-island.net/vile/ Vcs-Browser: https://salsa.debian.org/debian/vile @@ -26,6 +27,7 @@ Description: VI Like Emacs - vi work-ali Package: vile-filters Architecture: any Depends: vile-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same Description: VI Like Emacs - highlighting filters for vile/xvile Text highlighting filters for various languages and file formats for the vile and xvile editors. diff -pruN 9.8v-3/debian/patches/debian-changes 9.8v-4/debian/patches/debian-changes --- 9.8v-3/debian/patches/debian-changes 2022-07-04 04:27:41.000000000 +0000 +++ 9.8v-4/debian/patches/debian-changes 2022-08-02 05:15:05.000000000 +0000 @@ -3,6 +3,81 @@ delta against upstream is either kept as in some VCS, and exported as a single patch instead of more manageable atomic patches. +--- vile-9.8v.orig/insert.c ++++ vile-9.8v/insert.c +@@ -446,7 +446,7 @@ replacechar(int f, int n) + if (isbackspace(c)) { /* vi beeps here */ + s = TRUE; /* replaced with nothing */ + } else { +- t = s = lins_chars(n, c, FALSE); ++ t = s = lins_chars(n, c); + } + } + } +@@ -981,11 +981,11 @@ inschar(int c, int *backsp_limit_p) + rc = inspound(); + } else { + autoindented = -1; +- rc = lins_chars(1, c, FALSE); ++ rc = lins_chars(1, c); + } + } else { + autoindented = -1; +- rc = lins_chars(1, c, FALSE); ++ rc = lins_chars(1, c); + } + } + return rc; +@@ -1515,7 +1515,7 @@ quote_next(int f, int n) + s = lnewline(); + } while ((s == TRUE) && (--n != 0)); + } else { +- s = lins_chars(n, c, TRUE); ++ s = lins_chars(n, c); + } + } + return s; +--- vile-9.8v.orig/line.c ++++ vile-9.8v/line.c +@@ -534,7 +534,7 @@ lins_bytes(int n, int c) + * or in insert-mode. + */ + int +-lins_chars(int n, int c, int wide) ++lins_chars(int n, int c) + { + int rc = FALSE; + UCHAR target[10]; +@@ -542,7 +542,7 @@ lins_chars(int n, int c, int wide) + int nn; + int mapped; + +- if (wide && (c > 127) && b_is_utfXX(curbp)) { ++ if ((c > 127) && b_is_utfXX(curbp)) { + nbytes = vl_conv_to_utf8(target, (UINT) c, sizeof(target)); + } else if (okCTYPE2(vl_wide_enc) && !vl_mb_is_8bit(c)) { + nbytes = 1; +--- vile-9.8v.orig/macros/UXVile.ad ++++ vile-9.8v/macros/UXVile.ad +@@ -1,5 +1,5 @@ + ! $Id: UXVile.ad,v 1.2 2009/10/07 10:53:26 tom Exp $ + +-*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +- + #include "XVile" ++ ++*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +--- vile-9.8v.orig/macros/XVile.ad ++++ vile-9.8v/macros/XVile.ad +@@ -3,7 +3,7 @@ + ! "white" on "black" main window + *background: grey5 + *foreground: grey95 +-*font: 8x13 ++*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 + *cursor.background: yellow + *cursor.foreground: grey5 + --- vile-9.8v.orig/perl.xs +++ vile-9.8v/perl.xs @@ -21,7 +21,6 @@ @@ -36,3 +111,18 @@ atomic patches. #undef dofile #ifdef __GNUC__ +--- vile-9.8v.orig/proto.h ++++ vile-9.8v/proto.h +@@ -873,10 +873,10 @@ extern int lrepl_regex (REGEXVAL *expr, + + #if OPT_MULTIBYTE + extern int ldel_chars (B_COUNT n, int kflag); +-extern int lins_chars (int n, int c, int wide); ++extern int lins_chars (int n, int c); + #else + #define ldel_chars(n, kflag) ldel_bytes(n, kflag) +-#define lins_chars(n, c, wide) lins_bytes(n, c) ++#define lins_chars(n, c) lins_bytes(n, c) + #endif + + #if OPT_REGS_CMPL