--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Hi,
I've uploaded a local bugfix-only release of joe, one that mainly fixes
the regressions from lenny. Please consider unblocking it from squeeze.
Two of these bugs are crashes, one of which actually loses unsaved user data
so it could be classified as RC (though it's a bit rare), and the other
makes the editor very annoying to use (you couldn't specify > 1 files on the
command line, you'd be limited to adding them manually later). One bugfix
looks invasive, the mail syntax file, but it's simply a reversion to the
file from lenny. All non-bugfix content is trivial cleanups for policy
compliance.
Sorry for coming late to the party again, but this one should be a
no-brainer. The bug fixes are mostly pretty simple and straightforward.
Nothing depends on the package so the potential for breaking anything
new is minimal.
The diff since the last revision is this:
diff -ruN joe-3.7-1/debian/changelog joe-3.7-2/debian/changelog
--- joe-3.7-1/debian/changelog 2010-11-14 17:54:07.000000000 +0100
+++ joe-3.7-2/debian/changelog 2010-11-14 17:54:17.000000000 +0100
@@ -1,3 +1,31 @@
+joe (3.7-2) unstable; urgency=high
+
+ * Fix the crash when typing too many dashes on a line, d'oh,
+ cherry-picked upstream CVS fix for uformat.c by Joseph Allen, and
+ fixed that in turn to actually assign the value of x to orgx, silly,
+ closes: #508159.
+ * Fix the various segfaults when called with more than one file, d'oh.
+ Thanks to Oyvind Aabling for a patch, but actually it seems that
+ this was a copy&waste error that crept up into the 3.7 tarball yet
+ was coded properly in CVS (main.c r1.79), so simply used that line
+ from the CVS version, closes: #514512.
+ * Fix the Ins key for jstar users by replacing the obsolete marker
+ "overtype" with "overwrite" in rc/jstarrc.in, thanks to Adam Borowski,
+ closes: #508797.
+ * Fix the matching of python<numbered> interpreters in rc/ftyperc,
+ thanks to Piotr Engelking, closes: #549277.
+ * Undo the mail formatting horror by reverting to the 3.5-2 (lenny)
+ version of syntax/mail.jsf.in. Neither the upstream commits nor the
+ NEWS file really explain the benefits of the new stuff, I only see
+ the bugs and all the excess red that's making me nauseous, too,
+ closes: #597825.
+ * Update standards version to 3.9.1.
+ + Update menu section from Apps/Editors to Applications/Editors. (3.7.3)
+ + Add Homepage field. (3.8.0)
+ * Declare 1.0 in debian/source/format explicitly.
+
+ -- Josip Rodin <joy-packages@debian.org> Sat, 13 Nov 2010 21:38:30 +0100
+
joe (3.7-1) unstable; urgency=low
* New upstream version, closes: #504122, #504439.
diff -ruN joe-3.7-1/debian/control joe-3.7-2/debian/control
--- joe-3.7-1/debian/control 2010-11-14 17:54:07.000000000 +0100
+++ joe-3.7-2/debian/control 2010-11-14 17:54:17.000000000 +0100
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Josip Rodin <joy-packages@debian.org>
Build-Depends: libncurses-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.9.1
+Homepage: http://joe-editor.sourceforge.net/
Package: joe
Architecture: any
diff -ruN joe-3.7-1/debian/menu joe-3.7-2/debian/menu
--- joe-3.7-1/debian/menu 2010-11-14 17:54:07.000000000 +0100
+++ joe-3.7-2/debian/menu 2010-11-14 17:54:17.000000000 +0100
@@ -1 +1,5 @@
-?package(joe): needs="text" section="Apps/Editors" title="Joe" command="/usr/bin/joe"
+?package(joe):\
+ needs="text"\
+ section="Applications/Editors"\
+ title="Joe"\
+ command="/usr/bin/joe"
diff -ruN joe-3.7-1/debian/source/format joe-3.7-2/debian/source/format
--- joe-3.7-1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ joe-3.7-2/debian/source/format 2010-11-14 17:54:17.000000000 +0100
@@ -0,0 +1 @@
+1.0
diff -ruN joe-3.7-1/main.c joe-3.7-2/main.c
--- joe-3.7-1/main.c 2008-10-27 04:01:11.000000000 +0100
+++ joe-3.7-2/main.c 2010-11-14 17:54:17.000000000 +0100
@@ -431,7 +431,7 @@
b->orphan = 1;
b->oldcur = pdup(b->bof, USTR "main");
pline(b->oldcur, get_file_pos(b->name));
- p_goto_bol(bw->cursor);
+ p_goto_bol(b->oldcur);
line = b->oldcur->line - (maint->h - 1) / 2;
if (line < 0)
line = 0;
diff -ruN joe-3.7-1/rc/ftyperc joe-3.7-2/rc/ftyperc
--- joe-3.7-1/rc/ftyperc 2008-10-31 02:42:29.000000000 +0100
+++ joe-3.7-2/rc/ftyperc 2010-11-14 17:54:17.000000000 +0100
@@ -482,7 +482,7 @@
Python
*
-+#!\+\[ ]\+\[a-z/]\+\[ ]python\>
++#!\+\[ ]\+\[a-z/]\+\[ ]python\+\[0-9]\>
-autoindent
-syntax python
-smarthome
diff -ruN joe-3.7-1/rc/jstarrc.in joe-3.7-2/rc/jstarrc.in
--- joe-3.7-1/rc/jstarrc.in 2008-11-02 04:20:19.000000000 +0100
+++ joe-3.7-2/rc/jstarrc.in 2010-11-14 17:54:17.000000000 +0100
@@ -879,8 +879,8 @@
insf ^K r
macros ^[ d Dump macros
macros ^[ ^D
-mode,"overtype",rtn ^V Insert/Overtype
-mode,"overtype",rtn .kI
+mode,"overwrite",rtn ^V Insert/Overtype
+mode,"overwrite",rtn .kI
lindent ^K , Indent to left
line ^Q I Goto line no.
line ^Q ^I
diff -ruN joe-3.7-1/syntax/mail.jsf.in joe-3.7-2/syntax/mail.jsf.in
--- joe-3.7-1/syntax/mail.jsf.in 2008-10-28 05:13:56.000000000 +0100
+++ joe-3.7-2/syntax/mail.jsf.in 2010-11-14 17:54:17.000000000 +0100
@@ -1,188 +1,52 @@
# JOE syntax highlight file for typical UNIX mail files
# 2004-04-25 Tomas Szepe <szepe@pinerecords.com>
-# Improved to handle quote characters commonly seen on Usenet, and
-# highlighting of the more frequently edited mail and news headers, with
-# some sanity checking of the same.
-# 2004-06-26 Jeff Hurwit <darkmoon@verizon.net>
-
--
-
=Idle
-=Head bold
-=HdTo red bg_white
-=HdFrom bold red
-=HdSbj bold magenta
-=HdDate bold
-=HdRRT black bg_white
-=HdGrp bold white bg_red
-=HdFuT bold red bg_yellow
-=HdBad bold red
-=Quot1 green bg_white
-=Quot2 bold blue bg_white
-=Sign bold magenta
-
-# Start in headers. We know we're out at the first blank line.
-
-:first Idle
- * hbol noeat
- "\n" newline
- ">|:~}#]" newline noeat
-
-# Require header
-# "\n" nohead
-
-:nohead HdBad
- * nohead
-
-:hbol Idle
- * hbad recolor=-1
- "\n" newline
- "A-Z" bufhdrs buffer
- "-" newline noeat
-
-:hbad HdBad
- * hbad
- "\n" hbol
-
-:hlbad HdBad
- * hbol
-
-:bufhdrs Idle
- * hbad recolor=-1
- "\n" hlbad noeat recolor=-2
- "-_a-zA-Z0-9" bufhdrs
- ":" headers hold
-
-:headers Idle
- * hbad recolor=-1
- " \n" hnocolor noeat strings
- "To" hsto recolor=-2
- "Cc" hsto recolor=-2
- "Bcc" hsto recolor=-2
- "From" hsfrom recolor=-2
- "Subject" hssbj recolor=-2
- "Date" hsdate recolor=-2
- "Return-Receipt-To" hsrrecp recolor=-2
- "Newsgroups" hsgroups recolor=-2
- "Followup-To" hsfolup recolor=-2
-done
-
-:hnocolor Idle
- * hnocolor
- "\n" cont_nocolor
-
-:cont_nocolor Idle
- * hbol noeat
- " \t" hnocolor recolor=-1
-
-:hsto Head
- * hto
- "\n" hbol
-
-:hto HdTo
- * hto
- "\n" cont_to
-
-:cont_to HdTo
- * hbol noeat
- " \t" hto recolor=-1
-
-:hsfrom Head
- * hfrom
- "\n" hbol
-
-:hfrom HdFrom
- * hfrom
- "\n" hbol
-
-:hssbj Head
- * hsbj
- "\n" hbol
-
-:hsbj HdSbj
- * hsbj
- "\n" cont_sbj
-
-:cont_sbj HdSbj
- * hbol noeat
- " \t" hsbj recolor=-1
-
-:hsdate Head
- * hdate
- "\n" hbol
-
-:hdate HdDate
- * hdate
- "\n" hbol
-
-:hsrrecp Head
- * hrrecp
- "\n" hbol
-
-:hrrecp HdRRT
- * hrrecp
- "\n" hbol
-
-:hsgroups Head
- * hgroups
- "\n" hbol
-
-:hgroups HdGrp
- * hgroups
- "\n" hbol
-
-:hsfolup Head
- * hfolup
- "\n" hbol
-
-:hfolup HdFuT
- * hfolup
- "\n" hbol
-
-# body of the message
+=Quot1 green
+=Quot2 cyan
+=Sign magenta
:newline Idle
* knocolor
"\n" newline
- ">|:~}#]" q1 recolor=-1
- "-" maybesign1 recolor=-1
+ " " newline
+ "\t" newline
+ ">" q1trans noeat
+ "-" maybesign1
-:maybesign1 Quot1
- * q1
- " \t" q1
- "\n" newline recolor=-1
- ">|:~}#]" q2 recolor=-1
- "-" maybesign2 recolor=-1
+:maybesign1 Idle
+ * knocolor
+ "\n" newline
+ "-" maybesign2
-:maybesign2 Quot2
- * q2
- "\t" q2
- "\n" newline recolor=-1
- " " maybesign3 recolor=-1
- ">|:~}#]" q1 recolor=-1
- "-" knocolor recolor=-3
-
-:maybesign3 Quot2
- * q2
- " \t" q2
- "\n" sign recolor=-4
- "->|:~}#]" q1 recolor=-1
+:maybesign2 Idle
+ * knocolor
+ "\n" newline
+ " " maybesign3
+
+:maybesign3 Idle
+ * knocolor
+ "\n" sign
:sign Sign
* sign
+:q1trans Quot1
+ * q1 recolor=-1
+
:q1 Quot1
* kq1
"\n" newline
- " \t" q1
- "->|:~}#]" q2 recolor=-1
+ " " q1
+ "\t" q1
+ ">" q2 recolor=-1
:q2 Quot2
* kq2
"\n" newline
- " \t" q2
- "->|:~}#]" q1 recolor=-1
+ " " q2
+ "\t" q2
+ ">" q1 recolor=-1
:knocolor Idle
* knocolor
diff -ruN joe-3.7-1/uformat.c joe-3.7-2/uformat.c
--- joe-3.7-1/uformat.c 2008-10-28 05:13:56.000000000 +0100
+++ joe-3.7-2/uformat.c 2010-11-14 17:54:17.000000000 +0100
@@ -361,9 +361,10 @@
if (!bw->o.autoindent) {
/* Don't indent second line of single-line paragraphs if autoindent is off */
int x = zlen(indents);
+ int orgx = x;
while (x && (indents[x - 1] == ' ' || indents[x - 1] == '\t'))
indents[--x] = 0;
- if (x) {
+ if (x && x != orgx) {
indents[x++] = ' ';
indents[x] = 0;
}
TIA.
--
2. That which causes joy or happiness.
--- End Message ---